diff --git a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php index d7a33554..b7caa566 100644 --- a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php +++ b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php @@ -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,