merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahul shukla 2021-01-27 14:07:35 +05:30
parent 05597e3225 741be0e502
commit 5620817db2
7 changed files with 776 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -32,7 +32,7 @@
"intervention/image": "^2.4",
"intervention/imagecache": "^2.3",
"kalnoy/nestedset": "5.0.1",
"khaled.alshamaa/ar-php": "^5.5",
"khaled.alshamaa/ar-php": "^5.5.2",
"konekt/concord": "^1.2",
"laravel/framework": "^7.0",
"laravel/scout": "^8.0",

894
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

5
packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
View File

@ -156,10 +156,7 @@ class InvoiceController extends Controller
*/
private function adjustArabicAndPersianContent($html)
{
/* temporary require */
require_once base_path('vendor/khaled.alshamaa/ar-php/src/arabic.php');
$arabic = new \ArPHP\I18N\arabic();
$arabic = new \ArPHP\I18N\Arabic();
$p = $arabic->arIdentify($html);

5
packages/Webkul/Product/src/Type/Bundle.php
View File

@ -132,8 +132,9 @@ class Bundle extends AbstractType
public function update(array $data, $id, $attribute = "id")
{
$product = parent::update($data, $id, $attribute);
$route = request()->route() ? request()->route()->getName() : '';
if (request()->route()->getName() != 'admin.catalog.products.massupdate') {
if ($route != 'admin.catalog.products.massupdate') {
$this->productBundleOptionRepository->saveBundleOptons($data, $product);
}
@ -765,4 +766,4 @@ class Bundle extends AbstractType
return true;
}
}
}

7
packages/Webkul/Product/src/Type/Configurable.php
View File

@ -95,8 +95,9 @@ class Configurable extends AbstractType
public function update(array $data, $id, $attribute = "id")
{
$product = parent::update($data, $id, $attribute);
if (request()->route()->getName() != 'admin.catalog.products.massupdate') {
$route = request()->route() ? request()->route()->getName() : '';
if ($route != 'admin.catalog.products.massupdate') {
$previousVariantIds = $product->variants->pluck('id');
if (isset($data['variants'])) {
@ -660,4 +661,4 @@ class Configurable extends AbstractType
return $total;
}
}
}

5
packages/Webkul/Product/src/Type/Downloadable.php
View File

@ -122,8 +122,9 @@ class Downloadable extends AbstractType
public function update(array $data, $id, $attribute = "id")
{
$product = parent::update($data, $id, $attribute);
$route = request()->route() ? request()->route()->getName() : '';
if (request()->route()->getName() != 'admin.catalog.products.massupdate') {
if ($route != 'admin.catalog.products.massupdate') {
$this->productDownloadableLinkRepository->saveLinks($data, $product);
$this->productDownloadableSampleRepository->saveSamples($data, $product);
@ -291,4 +292,4 @@ class Downloadable extends AbstractType
return $result;
}
}
}

5
packages/Webkul/Product/src/Type/Grouped.php
View File

@ -96,8 +96,9 @@ class Grouped extends AbstractType
public function update(array $data, $id, $attribute = "id")
{
$product = parent::update($data, $id, $attribute);
$route = request()->route() ? request()->route()->getName() : '';
if (request()->route()->getName() != 'admin.catalog.products.massupdate') {
if ($route != 'admin.catalog.products.massupdate') {
$this->productGroupedProductRepository->saveGroupedProducts($data, $product);
}
@ -235,4 +236,4 @@ class Grouped extends AbstractType
return $products;
}
}
}