geer-builder 1.2.620 → 1.2.623
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 +4 -3
- package/GProductList.vue +14 -5
- package/package.json +1 -1
package/GCheckout.vue
CHANGED
|
@@ -640,7 +640,7 @@ export default {
|
|
|
640
640
|
async getFreePackageList()
|
|
641
641
|
{
|
|
642
642
|
if(this.product_list.length !== 1) return
|
|
643
|
-
if(this.product_list.length > 0 && !this.product_list[0].product.
|
|
643
|
+
if(this.product_list.length > 0 && !this.product_list[0].product.hasOwnProperty('membership_kit')) return
|
|
644
644
|
if(this.product_list[0].product.membership_kit.hasOwnProperty('free_shipping') && this.product_list[0].product.membership_kit.free_shipping) this.package_free_shipping = true;
|
|
645
645
|
console.log('Free Shipping');
|
|
646
646
|
|
|
@@ -1210,7 +1210,8 @@ export default {
|
|
|
1210
1210
|
params.append("dimwidth", total_item_width);
|
|
1211
1211
|
params.append("dimheight", total_item_height);
|
|
1212
1212
|
}
|
|
1213
|
-
params.append("province", this.shipping_address.province.
|
|
1213
|
+
params.append("province", this.shipping_address.province.reg_code);
|
|
1214
|
+
// params.append("province", this.shipping_address.province.prov_code);
|
|
1214
1215
|
params.append("city", this.shipping_address.city.mun_code);
|
|
1215
1216
|
params.append("brgy", this.shipping_address.barangay.brgy_code);
|
|
1216
1217
|
params.append("merchant", payo_courier_settings.merchant);
|
|
@@ -1974,7 +1975,7 @@ export default {
|
|
|
1974
1975
|
{
|
|
1975
1976
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Insufficient GC" });
|
|
1976
1977
|
}
|
|
1977
|
-
else if(this.online_payment_only &&
|
|
1978
|
+
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
1979
|
{
|
|
1979
1980
|
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
1981
|
}
|
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:
|
|
@@ -227,8 +236,8 @@ export default {
|
|
|
227
236
|
},
|
|
228
237
|
async user_info()
|
|
229
238
|
{
|
|
230
|
-
await this.$_getSlotInfo();
|
|
231
|
-
await this.newGetProduct(Number(this.prod_per_page));
|
|
239
|
+
// await this.$_getSlotInfo();
|
|
240
|
+
// await this.newGetProduct(Number(this.prod_per_page));
|
|
232
241
|
}
|
|
233
242
|
},
|
|
234
243
|
methods:{
|