From f2833be359b30583bd757e2c687964578b1b8f9c Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 24 Sep 2024 17:43:59 +0800 Subject: [PATCH 1/2] Laravel Vapor - Solve a missing information with received parcels on order page reported by Yien, rewrite front end component retrieve data --- app/Http/Resources/OrderPackagesBaseResource.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Resources/OrderPackagesBaseResource.php b/app/Http/Resources/OrderPackagesBaseResource.php index 39bdbaa1..5f6b249d 100644 --- a/app/Http/Resources/OrderPackagesBaseResource.php +++ b/app/Http/Resources/OrderPackagesBaseResource.php @@ -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(); @@ -50,7 +50,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; } $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(); From 15f463c556baaebcb2d55cb2569a6d2ad3e574c6 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 24 Sep 2024 18:12:43 +0800 Subject: [PATCH 2/2] Laravel Vapor - Solve a missing information with received parcels on order page reported by Yien, rewrite front end component retrieve data --- app/Http/Resources/OrderPackagesBaseResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/OrderPackagesBaseResource.php b/app/Http/Resources/OrderPackagesBaseResource.php index 5f6b249d..22ca639d 100644 --- a/app/Http/Resources/OrderPackagesBaseResource.php +++ b/app/Http/Resources/OrderPackagesBaseResource.php @@ -48,7 +48,7 @@ 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'] = false; }