From 2e03ce370dd0e1fc8d6e0f54d3d05977f26b5686 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 13:42:26 +0800 Subject: [PATCH] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 2d2ac386..57a95c5b 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -41,7 +41,9 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->get(); + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ + return $query->whereYear('drop_date', 2022); + })->get(); foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages;