From 40c56922761d396fcc26786bbc76ec06cb855ecb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:40:38 +0800
Subject: [PATCH] fix order status count

---
 app/Http/Resources/OrderResource.php | 2 +-
 app/Models/Order.php                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 78b1b0a1..d2c72930 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -43,7 +43,7 @@ class OrderResource extends JsonResource
                     'delivered_packages' => PackingListResource::collection(
                         $this->deliveredPackages()->get()
                     ),
-                    'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->get()),
+                    'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get()),
                 ];
             }),
             'remarks' => RemarkResource::collection($this->remarks),
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 763e064e..5aabfd44 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -107,7 +107,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
                     return $schedule->dispatched()
                         ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                 }
-            );
+            )->whereHas('packages');
     }
 
     public function inTransitPackages()
@@ -122,7 +122,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
             ->whereDoesntHave('containers', function($container) {
                 return $container->where('containers.status', ApprovalStatus::COMPLETED);
             }
-        );
+        )->whereHas('packages');
     }
 
     public function destinationWarehousePackages()
@@ -137,7 +137,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
                 function($schedule) {
                     return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                 }
-            );
+            )->whereHas('packages');
     }
 
     public function deliveredPackages()