From 3e4f627cbe953b3ccc8c3b8ece48df488f46ed48 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:37:05 +0800
Subject: [PATCH] fix monthly report

---
 .../Controllers/Reports/MonthlyReportController.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 4c17261b..9281b909 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -38,10 +38,15 @@ class MonthlyReportController
             return $container->orders;
         })->unique();
 
-        $packages = $containers->flatMap(function ($container) {
-            return $container->packages()->where('packingList', function($query){
-                return $query->type === PackingListType::SHIPPING_PACKING_LIST_REPLICA;
-            });
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });
+
+        $packages = $packingLists->map(function ($packingList) {
+            $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
         });
 
         $totalCbm = $packages->sum(function($package){