From 310f426272c58e6e984d3c11a2a00c517b3d507d Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Fri, 11 Oct 2019 11:00:16 +0530
Subject: [PATCH] Issue #1582 fixed

---
 .../src/Repositories/OrderRepository.php      | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
index 6ac25e7f4..0c1586e28 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
@@ -219,7 +219,7 @@ class OrderRepository extends Repository
     {
         $totalQtyOrdered = $totalQtyInvoiced = $totalQtyShipped = $totalQtyRefunded = $totalQtyCanceled = 0;
 
-        foreach ($order->items  as $item) {
+        foreach ($order->items()->get()  as $item) {
             $totalQtyOrdered += $item->qty_ordered;
             $totalQtyInvoiced += $item->qty_invoiced;
 
@@ -247,18 +247,14 @@ class OrderRepository extends Repository
      */
     public function isInCanceledState($order)
     {
-        $totalQtyOrdered = 0;
-        $totalQtyCanceled = 0;
+        $totalQtyOrdered = $totalQtyCanceled = 0;
 
-        foreach ($order->items as $item) {
+        foreach ($order->items()->get() as $item) {
             $totalQtyOrdered += $item->qty_ordered;
             $totalQtyCanceled += $item->qty_canceled;
         }
 
-        if ($totalQtyOrdered == $totalQtyCanceled)
-            return true;
-
-        return false;
+        return $totalQtyOrdered == $totalQtyCanceled;
     }
 
     /**
@@ -267,20 +263,15 @@ class OrderRepository extends Repository
      */
     public function isInClosedState($order)
     {
-        $totalQtyOrdered = 0;
-        $totalQtyRefunded = 0;
-        $totalQtyCanceled = 0;
+        $totalQtyOrdered = $totalQtyRefunded = $totalQtyCanceled = 0;
 
-        foreach ($order->items  as $item) {
+        foreach ($order->items()->get()  as $item) {
             $totalQtyOrdered += $item->qty_ordered;
             $totalQtyRefunded += $item->qty_refunded;
             $totalQtyCanceled += $item->qty_canceled;
         }
 
-        if ($totalQtyOrdered == $totalQtyRefunded + $totalQtyCanceled)
-            return true;
-
-        return false;
+        return $totalQtyOrdered == $totalQtyRefunded + $totalQtyCanceled;
     }
 
     /**