diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php index 9281b909..e0bfae6c 100644 --- a/app/Http/Controllers/Reports/MonthlyReportController.php +++ b/app/Http/Controllers/Reports/MonthlyReportController.php @@ -91,8 +91,15 @@ class MonthlyReportController $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get(); - $packages = $containers->flatMap(function ($container) { - return $container->packages; + $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){