diff --git a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php index 773add65..e8c3f159 100644 --- a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php +++ b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php @@ -64,6 +64,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings, $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList; $transport = $originalPackingList->containers()->first()->transports()->first(); $deliveryTransport = $originalPackingList->transports()->first(); + $schedule = $deliveryTransport ? $deliveryTransport->schedules()->first() : null; return [ $container->reference, @@ -71,8 +72,8 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings, $ContainerTransport->drop_date, $marking, $order->reference, - $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' : ''), + $schedule ? (Carbon::parse($schedule->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') : 'Pending Arrangement', + $schedule ? $schedule->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''), $packingList->packages()->sum('quantity'), $address->state->name, $address->postcode,