From a956d4ac4c27cb434ed836a6e00d1fed932163b3 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 8 Oct 2024 17:33:10 +0800
Subject: [PATCH] Laravel Vapor - Fix another 504 issue when searching for
 container

---
 app/Http/Resources/ContainerBaseResource.php                   | 2 +-
 .../components/containers/elements/PackingListComponent.vue    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/ContainerBaseResource.php b/app/Http/Resources/ContainerBaseResource.php
index ad2a699a..47ef6762 100644
--- a/app/Http/Resources/ContainerBaseResource.php
+++ b/app/Http/Resources/ContainerBaseResource.php
@@ -49,7 +49,7 @@ class ContainerBaseResource extends JsonResource
             $item['include_receive_packing_list'] = true;
             $item['include_order_in_packages'] = false;
             $item['include_transport_in_packages'] = false;
-            $item['include_container_in_packages'] = true;
+            $item['include_container_in_packages'] = false;
         }
         return $this->whenLoaded('packingLists', PackingListBaseResource::collection($sortedPackingLists));
     }
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 2f4c4b01..affbcd45 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -25,7 +25,8 @@
         </div>
         <div class="col">
             <p class="no-margin" v-if="item.transport">{{ item.transport.current_schedule.eta }}</p>
-            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages.length ? item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a' : 'n/a'}}</p>
+            <p class="no-margin text-danger" v-if="!item.transport && item.container === undefined">{{ item.packages.length ? item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a' : 'n/a'}}</p>
+            <p class="no-margin text-danger" v-if="!item.transport && item.container !== undefined">{{ item.packages.length ? item.container.transport ? item.container.transport.dropped_days+' Days': 'n/a' : 'n/a'}}</p>
             <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="rescheduleTransport">Reschedule Transport</div>
             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="rescheduleTransport">
                 <reschedule-transport-date-form-component :data="item"></reschedule-transport-date-form-component>