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.8-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-10-19 03:18:01 +08:00
parent 072fa8f052 ac6211cf5f
commit 330a0c187a
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="fs-8 all-caps muted">Original Address</div>
</div>
</div>
<div class="row">
<div class="row" v-if="item.owner.address">
<div class="col">
<div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>
</div>
resources/assets/vue/components/orders/elements/OrderComponent.vue
+15 -1
View File
@@ -39,7 +39,7 @@
</div>
</div>
<div class="row m-b-5">
<div class="col">
<div class="col" v-if="item.address">
<div class="row">
<div class="col">
<small class="fs-10 all-caps muted">Delivery Address</small>
@@ -55,6 +55,20 @@
</div>
</div>
</div>
<div class="col" v-else>
<div class="row">
<div class="col">
<small class="fs-10 all-caps muted">Delivery Address</small>
</div>
</div>
<div class="row">
<div class="col">
<small class="fs-10 all-caps text-danger">
<strong>⚠ Missing Delivery Address</strong>
</small>
</div>
</div>
</div>
</div>
</div>
</div>
resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
+5
View File
@@ -81,6 +81,11 @@
<div class="row">
<div class="col-12 col-sm-auto pr-sm-0"><b>Delivery Address:</b>&nbsp;</div>
<div class="col-12 col-sm-auto pl-sm-0" v-if="order.address">{{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one + ' ' + (order.address.street_two ? order.address.street_two : '') + ', ' + (order.address.district ? order.address.district.name : '') + ', ' + order.address.post_code + ' ' + (order.address.state ? order.address.state.name : '') + ', ' + (order.address.country ? order.address.country.name : '')"></i></div>
<div class="col-12 col-sm-auto pl-sm-0" v-else>
<small class="fs-10 all-caps text-danger">
<strong>⚠ Missing Delivery Address</strong>
</small>
</div>
</div>
</h6>
</div>