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

fix pending delivery export

Browse Source
This commit is contained in:
omair saleh
2022-09-19 11:38:01 +08:00
parent 42525a4d32
commit ba192563ba
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
+3 -3
View File
@@ -43,7 +43,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
public function query()
{
return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
$query->where('containers.status', ApprovalStatus::COMPLETED);
$query->where('containers.status', ApprovalStatus::COMPLETED)->where('created_at', Carbon::now()->subMonths(3));
});
}
@@ -71,8 +71,8 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
$ContainerTransport->drop_date,
$marking,
$order->reference,
$deliveryTransport ? (Carbon::parse($deliveryTransport->schedules()->first()->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') : 'Pending Arrangement',
$deliveryTransport ? $deliveryTransport->schedules()->first()->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
$deliveryTransport ? !($deliveryTransport->schedules()->first()) ? 'n/a' : (Carbon::parse($deliveryTransport->schedules()->first()->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') : 'Pending Arrangement',
$deliveryTransport ? !($deliveryTransport->schedules()->first()) ? 'n/a' : $deliveryTransport->schedules()->first()->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
$packingList->packages()->sum('quantity'),
$address->state->name,
$address->postcode,