diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 66934840..67f75fc9 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -40,16 +40,17 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->get(); - $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]); + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('transport', function ($query){ + return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); + })->get(); foreach($packingLists as $packingList){ - $packages = !$packingList->packingLists()->exists() || $exceptionUsers ? $packingList->packages : $packingList->packingLists->first()->packages; + $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; foreach ($packages as $package) { $returnArray->push($package); } } - + return $returnArray; }