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

Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-09-24 18:13:17 +08:00
parent b01dd5cae4 15f463c556
commit 73d97f296a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/OrderPackagesBaseResource.php
+4 -4
View File
@@ -40,7 +40,7 @@ class OrderPackagesBaseResource extends JsonResource
$item['include_packages'] = true;
$item['include_receive_packing_list'] = true;
$item['include_order_in_packages'] = true;
$item['include_transport_in_packages'] = true;
$item['include_transport_in_packages'] = false;
}
$destination_warehouse_packages = $this->destinationWarehousePackages()->get();
@@ -48,9 +48,9 @@ class OrderPackagesBaseResource extends JsonResource
$item['include_shipping_transaction'] = false;
$item['include_suspended_invoice'] = false;
$item['include_packages'] = true;
$item['include_receive_packing_list'] = true;
$item['include_receive_packing_list'] = false;
$item['include_order_in_packages'] = true;
$item['include_transport_in_packages'] = true;
$item['include_transport_in_packages'] = false;
}
$delivered_packages = $this->deliveredPackages()->get();
@@ -60,7 +60,7 @@ class OrderPackagesBaseResource extends JsonResource
$item['include_packages'] = true;
$item['include_receive_packing_list'] = true;
$item['include_order_in_packages'] = true;
$item['include_transport_in_packages'] = true;
$item['include_transport_in_packages'] = false;
}
$received_packages = $this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get();