geer-builder 1.2.588 → 1.2.589
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -83,9 +83,9 @@
|
|
|
83
83
|
<div style="padding-left:10px;margin-right:10px;border-left: 1px solid rgb(194, 189, 189);" v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}: {{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
|
|
84
84
|
<div style="padding-left:10px;border-left: 1px solid rgb(194, 189, 189);">Order Total ({{list.orders.total_quantity}} Item): {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div> -->
|
|
85
85
|
</div>
|
|
86
|
-
<div class="order-total"
|
|
87
|
-
<div>Courier: {{list.shipping_details.courier}}</div>
|
|
88
|
-
<div style="margin-left:auto;">Tracking Number: {{list.shipping_details.tracking_number}}</div>
|
|
86
|
+
<div class="order-total" style="border:none;padding-top:0px;">
|
|
87
|
+
<div v-if="list.shipping_details">Courier: {{list.shipping_details.courier}}</div>
|
|
88
|
+
<div v-if="list.shipping_details" style="margin-left:auto;">Tracking Number: {{list.shipping_details.tracking_number}}</div>
|
|
89
89
|
</div>
|
|
90
90
|
<div v-if="!list['invoice_number']" style="background:white;text-align:right;padding:0px 20px 10px 0px;">
|
|
91
91
|
<q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
|
|
@@ -150,10 +150,10 @@
|
|
|
150
150
|
<div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
|
|
151
151
|
<div>Order Total ({{list.orders.total_quantity}} Item):</div>
|
|
152
152
|
<div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
|
|
153
|
-
<div>Courier:</div>
|
|
154
|
-
<div class="order-items">{{list.shipping_details.courier}}</div>
|
|
155
|
-
<div>Tracking Number:</div>
|
|
156
|
-
<div class="order-items">{{list.shipping_details.tracking_number}}</div>
|
|
153
|
+
<div v-if="list.shipping_details">Courier:</div>
|
|
154
|
+
<div v-if="list.shipping_details" class="order-items">{{list.shipping_details.courier}}</div>
|
|
155
|
+
<div v-if="list.shipping_details">Tracking Number:</div>
|
|
156
|
+
<div v-if="list.shipping_details" class="order-items">{{list.shipping_details.tracking_number}}</div>
|
|
157
157
|
</div>
|
|
158
158
|
<div v-if="!list['invoice_number']" style="background:white;text-align:right;padding:10px;">
|
|
159
159
|
<q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
|