From ea34c74f6dbddb7cb0336611152bd72cb7aed4a4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 11 Jan 2022 19:46:18 +0800 Subject: [PATCH] fix monthly report --- .../Controllers/Reports/MonthlyReportController.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php index 02779e7a..20c90e70 100644 --- a/app/Http/Controllers/Reports/MonthlyReportController.php +++ b/app/Http/Controllers/Reports/MonthlyReportController.php @@ -144,8 +144,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 = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first(); + return $replica ? $replica : $packingList; + })->flatMap(function ($packingList) { + return $packingList->packages; }); $packages = $packages->filter(function($package) use ($id) {