geer-builder 1.2.617 → 1.2.620
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 +53 -25
- package/GCodeVault.vue +1 -1
- package/GEcomChat.vue +1 -1
- package/GProductPage.vue +5 -2
- package/GSlotWallet.vue +8 -4
- package/package.json +1 -1
package/GCheckout.vue
CHANGED
|
@@ -562,7 +562,7 @@ export default {
|
|
|
562
562
|
}
|
|
563
563
|
if(this.check.data)
|
|
564
564
|
{
|
|
565
|
-
console.log(this.check.data, 'check data');
|
|
565
|
+
// console.log(this.check.data, 'check data');
|
|
566
566
|
sessionStorage.removeItem('checkout_list');
|
|
567
567
|
sessionStorage.removeItem('referral_slot_code');
|
|
568
568
|
sessionStorage.removeItem('pending_checkout');
|
|
@@ -640,9 +640,8 @@ 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.
|
|
644
|
-
if(
|
|
645
|
-
this.package_free_shipping = true;
|
|
643
|
+
if(this.product_list.length > 0 && !this.product_list[0].product.membership_kit.hasOwnProperty('free_shipping')) return
|
|
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;
|
|
646
645
|
console.log('Free Shipping');
|
|
647
646
|
|
|
648
647
|
|
|
@@ -682,7 +681,7 @@ export default {
|
|
|
682
681
|
{
|
|
683
682
|
let ret = await this.$_fbCall('memberGetPaymentChannel', {amount:this.dragon_pay_amount});
|
|
684
683
|
let return_payment = ret.data;
|
|
685
|
-
console.log(return_payment, 'All Dragonpay channel');
|
|
684
|
+
// console.log(return_payment, 'All Dragonpay channel');
|
|
686
685
|
let x = 0;
|
|
687
686
|
let filtered_payment = [];
|
|
688
687
|
for (const element of return_payment)
|
|
@@ -886,7 +885,7 @@ export default {
|
|
|
886
885
|
let merchant_index = this.groupedProducts.map(function(e) { return e.merchant_slot_code; }).indexOf(val.order.merchant_slot_code);
|
|
887
886
|
this.groupedProducts[merchant_index].courier_chosen = val.courier;
|
|
888
887
|
// this.groupedProducts[merchant_index].shipping_fee = 100;
|
|
889
|
-
console.log(val.courier)
|
|
888
|
+
// console.log(val.courier)
|
|
890
889
|
this.computations();
|
|
891
890
|
this.getShippingFee();
|
|
892
891
|
},
|
|
@@ -1142,14 +1141,14 @@ export default {
|
|
|
1142
1141
|
total_item_height = Number(total_item_height.toFixed(2));
|
|
1143
1142
|
total_item_price = Number(total_item_price.toFixed(2));
|
|
1144
1143
|
|
|
1145
|
-
console.log(pouch_small_width, 'small width');
|
|
1146
|
-
console.log(pouch_small_height, 'small height');
|
|
1147
|
-
console.log(pouch_small_weight, 'small weight');
|
|
1144
|
+
// console.log(pouch_small_width, 'small width');
|
|
1145
|
+
// console.log(pouch_small_height, 'small height');
|
|
1146
|
+
// console.log(pouch_small_weight, 'small weight');
|
|
1148
1147
|
|
|
1149
|
-
console.log(total_item_width, 'total width');
|
|
1150
|
-
console.log(total_item_height, 'total height');
|
|
1151
|
-
console.log(total_item_weight, 'total weight');
|
|
1152
|
-
console.log(total_item_price, 'total price');
|
|
1148
|
+
// console.log(total_item_width, 'total width');
|
|
1149
|
+
// console.log(total_item_height, 'total height');
|
|
1150
|
+
// console.log(total_item_weight, 'total weight');
|
|
1151
|
+
// console.log(total_item_price, 'total price');
|
|
1153
1152
|
|
|
1154
1153
|
let size = "";
|
|
1155
1154
|
if(total_item_width<= pouch_small_width && total_item_height <=pouch_small_height && Math.ceil(total_item_weight)<=pouch_small_weight)
|
|
@@ -1168,16 +1167,40 @@ export default {
|
|
|
1168
1167
|
{
|
|
1169
1168
|
size = 'own packaging'
|
|
1170
1169
|
}
|
|
1171
|
-
console.log(size)
|
|
1170
|
+
// console.log(size)
|
|
1172
1171
|
if(!this.shipping_address.barangay.hasOwnProperty('brgy_code') || !this.shipping_address.region.hasOwnProperty('reg_code') || !this.shipping_address.province.hasOwnProperty('prov_code') || !this.shipping_address.city.hasOwnProperty('mun_code'))
|
|
1173
1172
|
{
|
|
1174
1173
|
this.changePaymentMethod({},0);
|
|
1175
1174
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Shipping Address is outdated please update or add new shipping address to use COD." });
|
|
1176
1175
|
return;
|
|
1177
1176
|
}
|
|
1177
|
+
|
|
1178
|
+
let is_fixed_poo = false;
|
|
1179
|
+
let fixed_poo_region_code = null;
|
|
1180
|
+
if(this.public_settings.hasOwnProperty("enable_fixed_poo_payo"))
|
|
1181
|
+
{
|
|
1182
|
+
if(this.public_settings.enable_fixed_poo_payo == true && this.public_settings.hasOwnProperty("fixed_poo_region_code"))
|
|
1183
|
+
{
|
|
1184
|
+
is_fixed_poo = true;
|
|
1185
|
+
fixed_poo_region_code = this.public_settings.fixed_poo_region_code;
|
|
1186
|
+
}
|
|
1187
|
+
}
|
|
1188
|
+
|
|
1189
|
+
|
|
1190
|
+
|
|
1191
|
+
|
|
1178
1192
|
let params = new URLSearchParams();
|
|
1179
1193
|
params.append("api_token", payo_courier_settings.api_token);
|
|
1180
|
-
|
|
1194
|
+
|
|
1195
|
+
if(is_fixed_poo == true && fixed_poo_region_code != null)
|
|
1196
|
+
{
|
|
1197
|
+
params.append("point_of_origin", fixed_poo_region_code);
|
|
1198
|
+
}
|
|
1199
|
+
else
|
|
1200
|
+
{
|
|
1201
|
+
params.append("point_of_origin", orders.merchant_details.pickup_address.province.reg_code);
|
|
1202
|
+
}
|
|
1203
|
+
|
|
1181
1204
|
params.append("amount", total_item_price);
|
|
1182
1205
|
params.append("size", size);
|
|
1183
1206
|
params.append("payment_method", "COD");
|
|
@@ -1221,6 +1244,11 @@ export default {
|
|
|
1221
1244
|
shipping_fee = 0;
|
|
1222
1245
|
orders.shipping_fee = 0;
|
|
1223
1246
|
}
|
|
1247
|
+
if(this.package_free_shipping)
|
|
1248
|
+
{
|
|
1249
|
+
shipping_fee = 0;
|
|
1250
|
+
orders.shipping_fee = 0;
|
|
1251
|
+
}
|
|
1224
1252
|
merchandise_subtotal += orders.order_total;
|
|
1225
1253
|
orders.order_total += orders.shipping_fee;
|
|
1226
1254
|
shipping_total += orders.shipping_fee;
|
|
@@ -1456,7 +1484,7 @@ export default {
|
|
|
1456
1484
|
// this.checkout_info.sub_total = merchandise_subtotal;
|
|
1457
1485
|
// this.checkout_info.shipping_total = shipping_total;
|
|
1458
1486
|
// console.log(Number(shipping_fee))
|
|
1459
|
-
console.log(packaging)
|
|
1487
|
+
// console.log(packaging)
|
|
1460
1488
|
}
|
|
1461
1489
|
else if(orders.courier_chosen == "Manual Shipping")
|
|
1462
1490
|
{
|
|
@@ -1510,10 +1538,10 @@ export default {
|
|
|
1510
1538
|
total_item_height = Number(total_item_height.toFixed(2));
|
|
1511
1539
|
total_item_price = Number(total_item_price.toFixed(2));
|
|
1512
1540
|
|
|
1513
|
-
console.log(total_item_width, 'total_item_width');
|
|
1514
|
-
console.log(total_item_length, 'total_item_length');
|
|
1515
|
-
console.log(total_item_height, 'total_item_height');
|
|
1516
|
-
console.log(total_item_price, 'total_item_price');
|
|
1541
|
+
// console.log(total_item_width, 'total_item_width');
|
|
1542
|
+
// console.log(total_item_length, 'total_item_length');
|
|
1543
|
+
// console.log(total_item_height, 'total_item_height');
|
|
1544
|
+
// console.log(total_item_price, 'total_item_price');
|
|
1517
1545
|
|
|
1518
1546
|
if(destination_index>=0)
|
|
1519
1547
|
{
|
|
@@ -1537,21 +1565,21 @@ export default {
|
|
|
1537
1565
|
{
|
|
1538
1566
|
shipping_fee = this.$_formatNumber(small_pouch.shipping_fee, { decimal: 2});
|
|
1539
1567
|
shipping_fee = Number(shipping_fee);
|
|
1540
|
-
console.log(shipping_fee, 'shipping_fee');
|
|
1568
|
+
// console.log(shipping_fee, 'shipping_fee');
|
|
1541
1569
|
packaging = "Small Pouch"
|
|
1542
1570
|
}
|
|
1543
1571
|
else if(total_item_width <= medium_pouch.width && total_item_length <= medium_pouch.length && total_item_height <= medium_pouch.height && total_item_weight <= medium_pouch.max_kg)
|
|
1544
1572
|
{
|
|
1545
1573
|
shipping_fee = this.$_formatNumber(medium_pouch.shipping_fee, { decimal: 2});
|
|
1546
1574
|
shipping_fee = Number(shipping_fee);
|
|
1547
|
-
console.log(shipping_fee, 'shipping_fee');
|
|
1575
|
+
// console.log(shipping_fee, 'shipping_fee');
|
|
1548
1576
|
packaging = "Medium Pouch"
|
|
1549
1577
|
}
|
|
1550
1578
|
else if(total_item_width <= large_pouch.width && total_item_length <= large_pouch.length && total_item_height <= large_pouch.height && total_item_weight <= large_pouch.max_kg)
|
|
1551
1579
|
{
|
|
1552
1580
|
shipping_fee = this.$_formatNumber(large_pouch.shipping_fee, { decimal: 2});
|
|
1553
1581
|
shipping_fee = Number(shipping_fee);
|
|
1554
|
-
console.log(shipping_fee, 'shipping_fee');
|
|
1582
|
+
// console.log(shipping_fee, 'shipping_fee');
|
|
1555
1583
|
packaging = "Large Pouch"
|
|
1556
1584
|
}
|
|
1557
1585
|
else
|
|
@@ -1619,7 +1647,7 @@ export default {
|
|
|
1619
1647
|
// this.checkout_info.sub_total = merchandise_subtotal;
|
|
1620
1648
|
// this.checkout_info.shipping_total = shipping_total;
|
|
1621
1649
|
// console.log(Number(shipping_fee))
|
|
1622
|
-
console.log(packaging)
|
|
1650
|
+
// console.log(packaging)
|
|
1623
1651
|
}
|
|
1624
1652
|
else if(orders.courier_chosen == "Branch Pickup")
|
|
1625
1653
|
{
|
|
@@ -2011,7 +2039,7 @@ export default {
|
|
|
2011
2039
|
{
|
|
2012
2040
|
this.dragon_pay_choice = this.public_settings.dragonpay_details ? this.public_settings.dragonpay_details.mode : 1;
|
|
2013
2041
|
}
|
|
2014
|
-
console.log(this.dragon_pay_choice, 'dragon_pay_choice');
|
|
2042
|
+
// console.log(this.dragon_pay_choice, 'dragon_pay_choice');
|
|
2015
2043
|
if(!this.dragon_pay_choice)
|
|
2016
2044
|
{
|
|
2017
2045
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Dragon payment Method" });
|
package/GCodeVault.vue
CHANGED
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
<div class="row text-center overflow-hidden">
|
|
66
66
|
<div class="col-md-12 q-ma-sm">
|
|
67
67
|
<q-btn @click="is_open_add_slot_dialog = true" class="create-btn" color="primary" outline>
|
|
68
|
-
|
|
68
|
+
Activate Slot
|
|
69
69
|
</q-btn>
|
|
70
70
|
</div>
|
|
71
71
|
<div class="col-md-12 q-ma-sm">
|
package/GEcomChat.vue
CHANGED
|
@@ -264,7 +264,7 @@
|
|
|
264
264
|
<div class="row text-center overflow-hidden">
|
|
265
265
|
<div class="col-md-12 q-ma-sm">
|
|
266
266
|
<q-btn @click="is_open_add_slot_dialog = true" class="create-btn" color="primary" outline>
|
|
267
|
-
|
|
267
|
+
Activate Slot
|
|
268
268
|
</q-btn>
|
|
269
269
|
</div>
|
|
270
270
|
<div class="col-md-12 q-ma-sm">
|
package/GProductPage.vue
CHANGED
|
@@ -1063,8 +1063,11 @@ export default {
|
|
|
1063
1063
|
if(this.variant_product_details.docs.length>0)
|
|
1064
1064
|
{
|
|
1065
1065
|
this.variant_product_details = this.variant_product_details.docs[0].data();
|
|
1066
|
-
|
|
1067
|
-
|
|
1066
|
+
if(this.current_slot_info)
|
|
1067
|
+
{
|
|
1068
|
+
let discount = new ProductClass().getProductDiscount( this.membership_discount,this.rank_discount, this.current_slot_info, this.stockist_discount, this.variant_product_details);
|
|
1069
|
+
this.variant_product_details.user_discount = discount;
|
|
1070
|
+
}
|
|
1068
1071
|
}
|
|
1069
1072
|
else
|
|
1070
1073
|
{
|
package/GSlotWallet.vue
CHANGED
|
@@ -38,9 +38,12 @@
|
|
|
38
38
|
<div class="value">{{user_info.hasOwnProperty('slot_owned') ? user_info.slot_owned : 0}}/{{ slot_limit }}</div>
|
|
39
39
|
</div>
|
|
40
40
|
<div v-if="current_slot_info.points.reactivation_fee || is_reactivation_fee_avail == true" class="q-pt-sm q-pb-md section-holder">
|
|
41
|
-
<div
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
<div v-if="!hide_reactivation">
|
|
42
|
+
<div class="label" v-if="is_company_success">Higher Income Status</div>
|
|
43
|
+
<div class="label" v-else>Reactivation Fee</div>
|
|
44
|
+
<div class="value">{{$_formatNumber(current_slot_info.points.hasOwnProperty("reactivation_fee") ? current_slot_info.points.reactivation_fee : 0 , { decimal: 2 }) }}</div>
|
|
45
|
+
</div>
|
|
46
|
+
|
|
44
47
|
</div>
|
|
45
48
|
</div>
|
|
46
49
|
<div class="wallet-grid" :style="is_company_ultrapro? 'display:block': temp_wallet ? 'grid-template-columns: 1fr 1fr 1fr' : 'grid-template-columns:1fr 1fr' && current_slot_info.points.hasOwnProperty('gc')">
|
|
@@ -229,7 +232,8 @@ export default
|
|
|
229
232
|
is_company_qdy:Boolean,
|
|
230
233
|
is_company_ultrapro:Boolean,
|
|
231
234
|
show_points_history:Boolean,
|
|
232
|
-
show_binary_history:Boolean
|
|
235
|
+
show_binary_history:Boolean,
|
|
236
|
+
hide_reactivation:Boolean
|
|
233
237
|
},
|
|
234
238
|
data: () =>
|
|
235
239
|
({
|