From a6cacb93da80e5b8facac3a9b674aa0028652a54 Mon Sep 17 00:00:00 2001 From: Poghos Date: Mon, 25 Jan 2021 18:32:26 +0400 Subject: [PATCH] Added checking for the route existence for Bundle, Downloadable, Grouped types. --- packages/Webkul/Product/src/Type/Bundle.php | 5 +++-- packages/Webkul/Product/src/Type/Downloadable.php | 5 +++-- packages/Webkul/Product/src/Type/Grouped.php | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php index 4c8709763..a179d5efe 100644 --- a/packages/Webkul/Product/src/Type/Bundle.php +++ b/packages/Webkul/Product/src/Type/Bundle.php @@ -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; } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/Type/Downloadable.php b/packages/Webkul/Product/src/Type/Downloadable.php index e8cf7741f..6dab992d3 100644 --- a/packages/Webkul/Product/src/Type/Downloadable.php +++ b/packages/Webkul/Product/src/Type/Downloadable.php @@ -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; } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php index 1f7f1c42d..b083d2112 100644 --- a/packages/Webkul/Product/src/Type/Grouped.php +++ b/packages/Webkul/Product/src/Type/Grouped.php @@ -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; } -} \ No newline at end of file +}