From 22fe76c83c51a65ff9735f9d9cf7ae5fb18aec66 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Tue, 22 Oct 2019 18:57:06 +0530
Subject: [PATCH] Issue #1680 fixed

---
 packages/Webkul/Sales/src/Repositories/InvoiceRepository.php  | 4 ++--
 .../Webkul/Sales/src/Repositories/OrderItemRepository.php     | 2 +-
 packages/Webkul/Sales/src/Repositories/OrderRepository.php    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index 9ef731cc2..0cbaa08da 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -163,7 +163,7 @@ class InvoiceRepository extends Repository
                                 'additional' => $childOrderItem->additional
                             ]);
                         
-                        if (! $childOrderItem->product->getTypeInstance()->isStockable() && $childOrderItem->product->getTypeInstance()->showQuantityBox()) {
+                        if ($childOrderItem->product && ! $childOrderItem->getTypeInstance()->isStockable() && $childOrderItem->getTypeInstance()->showQuantityBox()) {
                             $this->invoiceItemRepository->updateProductInventory([
                                     'invoice' => $invoice,
                                     'product' => $childOrderItem->product,
@@ -174,7 +174,7 @@ class InvoiceRepository extends Repository
 
                         $this->orderItemRepository->collectTotals($childOrderItem);
                     }
-                } elseif (! $orderItem->product->getTypeInstance()->isStockable() && $orderItem->product->getTypeInstance()->showQuantityBox()) {
+                } elseif ($orderItem->product && ! $orderItem->getTypeInstance()->isStockable() && $orderItem->getTypeInstance()->showQuantityBox()) {
                     $this->invoiceItemRepository->updateProductInventory([
                             'invoice' => $invoice,
                             'product' => $orderItem->product,
diff --git a/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php b/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
index 5e53caddf..39c8bf890 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
@@ -108,7 +108,7 @@ class OrderItemRepository extends Repository
     {
         $orderItems = [];
 
-        if ($orderItem->product->getTypeInstance()->isComposite()) {
+        if ($orderItem->getTypeInstance()->isComposite()) {
             foreach ($orderItem->children as $child) {
                 $orderItems[] = $child;
             }
diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
index 69c323cf5..45f184f24 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
@@ -145,7 +145,7 @@ class OrderRepository extends Repository
 
             $orderItems = [];
 
-            if ($item->product->getTypeInstance()->isComposite()) {
+            if ($item->getTypeInstance()->isComposite()) {
                 foreach ($item->children as $child) {
                     $orderItems[] = $child;
                 }