geer-builder 1.2.769 → 1.2.770
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.
package/GCheckout.vue
CHANGED
|
@@ -417,7 +417,7 @@ import EcommerceMaintenance from './dialogs/EcommerceMaintenance';
|
|
|
417
417
|
export default {
|
|
418
418
|
components: { EcommerceMaintenance,SelectShippingOptions, AddNewAddressForm ,ProcessCheckoutConfirmDialog, GLoader, axios ,ChooseCourierDialog, SelectVoucherDialog},
|
|
419
419
|
mixins: [GlobalMixins],
|
|
420
|
-
props:{ checkout_list: Array, show_discount_badge: Boolean },
|
|
420
|
+
props:{ checkout_list: Array, show_discount_badge: Boolean, is_heartzone: Boolean },
|
|
421
421
|
data: () =>
|
|
422
422
|
({
|
|
423
423
|
is_branch_pickup:false,
|
|
@@ -2260,7 +2260,13 @@ export default {
|
|
|
2260
2260
|
this.checkout_info.gcash_fee = 0;
|
|
2261
2261
|
}
|
|
2262
2262
|
|
|
2263
|
-
|
|
2263
|
+
if(this.is_heartzone === true && this.current_slot_info)
|
|
2264
|
+
{
|
|
2265
|
+
if(this.current_slot_info && this.current_slot_info.membership_id === 'merchant')
|
|
2266
|
+
{
|
|
2267
|
+
this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Merchant slot is not allowed to make purchases on ecommerce` });
|
|
2268
|
+
}
|
|
2269
|
+
}
|
|
2264
2270
|
|
|
2265
2271
|
this.checkout_info.payment_method = this.payment_method;
|
|
2266
2272
|
try
|
|
@@ -144,7 +144,7 @@ import {formatDate}from '../../utilities/DateUtils';
|
|
|
144
144
|
field : row => row.type.toUpperCase().replace("_", " "),
|
|
145
145
|
align : 'left',
|
|
146
146
|
required: true,
|
|
147
|
-
format: val => `${val == 'BINARY THREE_POINTS_RIGHT' ? 'SALES FORCE RIGHT' : (val == 'BINARY THREE_POINTS_LEFT' ? 'SALES FORCE LEFT' : (val == 'VORTEX TOKEN' ? 'CASH REWARD TOKEN' : val)) }`,
|
|
147
|
+
format: val => `${val == 'BINARY THREE_POINTS_RIGHT' ? 'SALES FORCE RIGHT' : (val == 'BINARY THREE_POINTS_LEFT' ? 'SALES FORCE LEFT' : (val == 'VORTEX TOKEN' ? 'CASH REWARD TOKEN' : (val == 'BINARY THREE_PV' ? 'SALES FORCE PV' : val) )) }`,
|
|
148
148
|
sortable: true,
|
|
149
149
|
},
|
|
150
150
|
{
|