cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix export arrival list

Browse Source
This commit is contained in:
omair saleh
2022-05-10 14:59:43 +08:00
parent e8eb02430b
commit 453683ca76
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
+5 -4
View File
@@ -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;
}