geer-builder 1.2.871 → 1.2.872
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.
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
<div v-if="list.shipping_details">Courier: {{list.shipping_details.courier}}</div>
|
|
88
88
|
<div v-if="list.shipping_details" style="margin-left:auto;">Tracking Number: {{list.shipping_details.tracking_number}}</div>
|
|
89
89
|
</div>
|
|
90
|
-
<div v-if="!list['invoice_number']" style="background:white;text-align:right;padding:0px 20px 10px 0px;">
|
|
90
|
+
<div v-if="!list['invoice_number'] && list.orders.courier_chosen != 'Philexpress'" 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>
|
|
92
92
|
<q-btn dense color="primary" no-caps @click="editShippingDetails(i)" label="Edit Shipping Details"></q-btn>
|
|
93
93
|
</div>
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
<div v-if="list.shipping_details">Tracking Number:</div>
|
|
159
159
|
<div v-if="list.shipping_details" class="order-items">{{list.shipping_details.tracking_number}}</div>
|
|
160
160
|
</div>
|
|
161
|
-
<div v-if="!list['invoice_number']" style="background:white;text-align:right;padding:10px;">
|
|
161
|
+
<div v-if="!list['invoice_number'] && list.orders.courier_chosen != 'Philexpress'" style="background:white;text-align:right;padding:10px;">
|
|
162
162
|
<q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
|
|
163
163
|
<q-btn dense color="primary" no-caps @click="editShippingDetails(i)" label="Edit Details"></q-btn>
|
|
164
164
|
</div>
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
<!-- <div>Order Total ({{product_list[i].quantity}} Item): {{main_currency}} {{order_total}}</div> -->
|
|
91
91
|
<!-- <div>Status: {{list.status == "to_picked" ? "Ready for Pickup" : ""}}</div> -->
|
|
92
92
|
</div>
|
|
93
|
-
<div v-if="list.status=='to_picked'" style="background:white;text-align:right;padding:0px 20px 10px 0px;"><q-btn dense color="primary" @click="orderComplete(i)" no-caps label="Order Complete"></q-btn></div>
|
|
93
|
+
<div v-if="list.status=='to_picked' && list.orders.courier_chosen != 'Philexpress'" style="background:white;text-align:right;padding:0px 20px 10px 0px;"><q-btn dense color="primary" @click="orderComplete(i)" no-caps label="Order Complete"></q-btn></div>
|
|
94
94
|
</div>
|
|
95
95
|
</div>
|
|
96
96
|
<q-dialog v-model="is_dialog_tracking_number_open">
|
|
@@ -161,7 +161,7 @@
|
|
|
161
161
|
<div class="statuss">{{list.status == "to_picked" ? "Ready for Pickup" : ""}}</div>
|
|
162
162
|
</div>
|
|
163
163
|
</div>
|
|
164
|
-
<div v-if="list.status=='processing'" style="background:white;text-align:right;padding: 10px 10px;"><q-btn dense color="primary" @click="orderComplete(i)" no-caps label="Approve"></q-btn></div>
|
|
164
|
+
<div v-if="list.status=='processing' && list.orders.courier_chosen != 'Philexpress'" style="background:white;text-align:right;padding: 10px 10px;"><q-btn dense color="primary" @click="orderComplete(i)" no-caps label="Approve"></q-btn></div>
|
|
165
165
|
</div>
|
|
166
166
|
</div>
|
|
167
167
|
<q-dialog v-model="is_dialog_tracking_number_open">
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
<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>
|
|
83
83
|
<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> -->
|
|
84
84
|
</div>
|
|
85
|
-
<div v-if="!list['invoice_number']" style="background:white;text-align:right;padding:0px 20px 10px 0px;"><q-btn dense color="primary" no-caps @click="shipNow(i)" label="Ship Now"></q-btn></div>
|
|
85
|
+
<div v-if="!list['invoice_number'] && list.orders.courier_chosen != 'Philexpress'" style="background:white;text-align:right;padding:0px 20px 10px 0px;"><q-btn dense color="primary" no-caps @click="shipNow(i)" label="Ship Now"></q-btn></div>
|
|
86
86
|
</div>
|
|
87
87
|
</div>
|
|
88
88
|
<q-dialog v-model="is_dialog_tracking_number_open">
|
|
@@ -139,7 +139,7 @@
|
|
|
139
139
|
<div>Order Total:</div>
|
|
140
140
|
<div class="total">({{list.orders.total_quantity}} Item): {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
|
|
141
141
|
</div>
|
|
142
|
-
<div v-if="!list['invoice_number']" style="background:white;text-align:right;padding:10px;"><q-btn dense color="primary" no-caps @click="shipNow(i)" label="Ship Now"></q-btn></div>
|
|
142
|
+
<div v-if="!list['invoice_number'] && list.orders.courier_chosen != 'Philexpress'" style="background:white;text-align:right;padding:10px;"><q-btn dense color="primary" no-caps @click="shipNow(i)" label="Ship Now"></q-btn></div>
|
|
143
143
|
</div>
|
|
144
144
|
</div>
|
|
145
145
|
<q-dialog v-model="is_dialog_tracking_number_open">
|