From e4c96ad3a5ba1d8188a900337ec9f64ad41f1764 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Wed, 15 Apr 2020 13:08:11 +0530 Subject: [PATCH 1/2] #2875 --- .../Webkul/Velocity/src/Helpers/Helper.php | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php index 728e0b5ee..38a677d49 100644 --- a/packages/Webkul/Velocity/src/Helpers/Helper.php +++ b/packages/Webkul/Velocity/src/Helpers/Helper.php @@ -110,12 +110,21 @@ class Helper extends Review foreach ($orderItems as $key => $orderItem) { $products[] = $orderItem->product; - $this->orderBrandsRepository->create([ - 'order_item_id' => $orderItem->id, - 'order_id' => $orderItem->order_id, - 'product_id' => $orderItem->product_id, - 'brand' => $products[$key]->brand, - ]); + try { + $this->orderBrandsRepository->create([ + 'order_item_id' => $orderItem->id, + 'order_id' => $orderItem->order_id, + 'product_id' => $orderItem->product_id, + 'brand' => $products[$key]->brand, + ]); + } catch(\Exception $exception) { + $this->orderBrandsRepository->create([ + 'brand' => null, + 'order_item_id' => $orderItem->id, + 'order_id' => $orderItem->order_id, + 'product_id' => $orderItem->product_id, + ]); + } } } From 53a12465f0e630c5b334f019de857ca4e4ee2087 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Wed, 15 Apr 2020 18:34:22 +0530 Subject: [PATCH 2/2] 2875 update --- packages/Webkul/Velocity/src/Helpers/Helper.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php index 38a677d49..dae46f92e 100644 --- a/packages/Webkul/Velocity/src/Helpers/Helper.php +++ b/packages/Webkul/Velocity/src/Helpers/Helper.php @@ -117,14 +117,7 @@ class Helper extends Review 'product_id' => $orderItem->product_id, 'brand' => $products[$key]->brand, ]); - } catch(\Exception $exception) { - $this->orderBrandsRepository->create([ - 'brand' => null, - 'order_item_id' => $orderItem->id, - 'order_id' => $orderItem->order_id, - 'product_id' => $orderItem->product_id, - ]); - } + } catch(\Exception $exception) {} } }