geer-builder 1.2.621 → 1.2.624
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 +15 -2
- package/GProductList.vue +12 -3
- package/package.json +1 -1
package/GCheckout.vue
CHANGED
|
@@ -1210,7 +1210,20 @@ export default {
|
|
|
1210
1210
|
params.append("dimwidth", total_item_width);
|
|
1211
1211
|
params.append("dimheight", total_item_height);
|
|
1212
1212
|
}
|
|
1213
|
-
|
|
1213
|
+
|
|
1214
|
+
if(this.shipping_address.province.reg_code == '13')
|
|
1215
|
+
{
|
|
1216
|
+
params.append("province", this.shipping_address.province.reg_code);
|
|
1217
|
+
console.log(this.shipping_address.province.reg_code, 'reg_code');
|
|
1218
|
+
|
|
1219
|
+
}
|
|
1220
|
+
else
|
|
1221
|
+
{
|
|
1222
|
+
params.append("province", this.shipping_address.province.prov_code);
|
|
1223
|
+
console.log(this.shipping_address.province.prov_code, 'prov_code');
|
|
1224
|
+
}
|
|
1225
|
+
|
|
1226
|
+
// params.append("province", this.shipping_address.province.prov_code);
|
|
1214
1227
|
params.append("city", this.shipping_address.city.mun_code);
|
|
1215
1228
|
params.append("brgy", this.shipping_address.barangay.brgy_code);
|
|
1216
1229
|
params.append("merchant", payo_courier_settings.merchant);
|
|
@@ -1974,7 +1987,7 @@ export default {
|
|
|
1974
1987
|
{
|
|
1975
1988
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Insufficient GC" });
|
|
1976
1989
|
}
|
|
1977
|
-
else if(this.online_payment_only &&
|
|
1990
|
+
else if(this.online_payment_only && this.public_settings.hasOwnProperty('membership_payment_method') &&!this.public_settings.membership_payment_method.includes(this.checkout_info.payment_method.payment_method_id))
|
|
1978
1991
|
{
|
|
1979
1992
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Entry pacakge can only be purchased using wallet payment, dragon pay or manual pay" });
|
|
1980
1993
|
}
|
package/GProductList.vue
CHANGED
|
@@ -13,7 +13,16 @@
|
|
|
13
13
|
<div class="discount-badge" v-if="field.merchant_percentage_discount>0">{{field.merchant_percentage_discount}}% <br/>OFF</div>
|
|
14
14
|
</template>
|
|
15
15
|
<template v-if="cashback">
|
|
16
|
-
<div class="cashback-badge" v-if="field.item_pv>0"
|
|
16
|
+
<div class="cashback-badge" v-if="field.item_pv>0">
|
|
17
|
+
<div class="cashback-label">Cashback: </div>
|
|
18
|
+
<div class="cashback-value">
|
|
19
|
+
{{$_formatNumber((field.item_pv/12), { decimal: 2})}}
|
|
20
|
+
</div>
|
|
21
|
+
</div>
|
|
22
|
+
<div v-else class="cashback-label">
|
|
23
|
+
<div class="cashback-label">Cashback: 0</div>
|
|
24
|
+
|
|
25
|
+
</div>
|
|
17
26
|
</template>
|
|
18
27
|
<template v-if="show_reseller_commission && field.referral_commission > 0 ">
|
|
19
28
|
<div class="commission-badge">
|
|
@@ -21,7 +30,7 @@
|
|
|
21
30
|
<div class="commission-value">{{$_formatNumber((field.referral_commission), { decimal: 2})}} </div>
|
|
22
31
|
</div>
|
|
23
32
|
</template>
|
|
24
|
-
<template v-if="show_reseller_commission && field.referral_commission
|
|
33
|
+
<template v-if="show_reseller_commission && field.referral_commission == 0">
|
|
25
34
|
<div class="commission-badge">
|
|
26
35
|
<div class="commission-label">rc: </div>
|
|
27
36
|
<div class="commission-value">none</div>
|
|
@@ -159,7 +168,7 @@ export default {
|
|
|
159
168
|
{
|
|
160
169
|
if(this.public_settings.referral_commission_earning) this.show_reseller_commission = true;
|
|
161
170
|
}
|
|
162
|
-
await this.newGetProduct(Number(this.prod_per_page));
|
|
171
|
+
// await this.newGetProduct(Number(this.prod_per_page));
|
|
163
172
|
this.first_load_done=true;
|
|
164
173
|
},
|
|
165
174
|
watch:
|