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

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

Browse Source
This commit is contained in:
Dillon Ngo
2024-10-08 17:33:31 +08:00
parent 4892555211 a956d4ac4c
commit 940341a2be
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/ContainerBaseResource.php
+1 -1
View File
@@ -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));
}
resources/assets/vue/components/containers/elements/PackingListComponent.vue
+2 -1
View File
@@ -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>