From bb59a444cf48bd623d213f2c53e74c4d1bcc1f08 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 6 Apr 2022 11:24:24 +0800 Subject: [PATCH] update export excel form --- .../Modules/Exports/Services/ExportsDeliveryOrders.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php b/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php index 2297811f..802cd3ef 100644 --- a/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php +++ b/app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php @@ -80,11 +80,12 @@ class ExportsDeliveryOrders implements FromQuery, WithHeadings, WithHeadingRow, $senderAddress = $order->addresses()->where('type', AddressType::PICK_UP)->first(); $deliveryAddress = $order->addresses()->where('type', AddressType::DELIVERY)->first(); $package = $order->packingLists()->first()->packages()->first(); + return [ - 'Standard Delivery', - 'ST00000003', + 'Domestic Shipment', + 'ST00000020', $senderAddress->contacts()->first()->reference, - '', + $order->companyModule->name, '*', $senderAddress->street_one.', '.$senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name, '', @@ -98,7 +99,7 @@ class ExportsDeliveryOrders implements FromQuery, WithHeadings, WithHeadingRow, $deliveryAddress->postcode, $deliveryAddress->contacts()->first()->phone, $package->type === PackageType::CARTON ? 'Package' : ($package->type === PackageType::PALLET ? 'Pallet' : 'Documents'), - 'Lodge In / Walk In', + 'Pick Up', 'Sender', $order->reference, $package->quantity,