geer-builder 1.2.618 → 1.2.621
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 +28 -24
- package/GProductList.vue +2 -2
- 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.hasOwnProperty('membership_kit')) 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,7 +1167,7 @@ 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);
|
|
@@ -1245,6 +1244,11 @@ export default {
|
|
|
1245
1244
|
shipping_fee = 0;
|
|
1246
1245
|
orders.shipping_fee = 0;
|
|
1247
1246
|
}
|
|
1247
|
+
if(this.package_free_shipping)
|
|
1248
|
+
{
|
|
1249
|
+
shipping_fee = 0;
|
|
1250
|
+
orders.shipping_fee = 0;
|
|
1251
|
+
}
|
|
1248
1252
|
merchandise_subtotal += orders.order_total;
|
|
1249
1253
|
orders.order_total += orders.shipping_fee;
|
|
1250
1254
|
shipping_total += orders.shipping_fee;
|
|
@@ -1480,7 +1484,7 @@ export default {
|
|
|
1480
1484
|
// this.checkout_info.sub_total = merchandise_subtotal;
|
|
1481
1485
|
// this.checkout_info.shipping_total = shipping_total;
|
|
1482
1486
|
// console.log(Number(shipping_fee))
|
|
1483
|
-
console.log(packaging)
|
|
1487
|
+
// console.log(packaging)
|
|
1484
1488
|
}
|
|
1485
1489
|
else if(orders.courier_chosen == "Manual Shipping")
|
|
1486
1490
|
{
|
|
@@ -1534,10 +1538,10 @@ export default {
|
|
|
1534
1538
|
total_item_height = Number(total_item_height.toFixed(2));
|
|
1535
1539
|
total_item_price = Number(total_item_price.toFixed(2));
|
|
1536
1540
|
|
|
1537
|
-
console.log(total_item_width, 'total_item_width');
|
|
1538
|
-
console.log(total_item_length, 'total_item_length');
|
|
1539
|
-
console.log(total_item_height, 'total_item_height');
|
|
1540
|
-
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');
|
|
1541
1545
|
|
|
1542
1546
|
if(destination_index>=0)
|
|
1543
1547
|
{
|
|
@@ -1561,21 +1565,21 @@ export default {
|
|
|
1561
1565
|
{
|
|
1562
1566
|
shipping_fee = this.$_formatNumber(small_pouch.shipping_fee, { decimal: 2});
|
|
1563
1567
|
shipping_fee = Number(shipping_fee);
|
|
1564
|
-
console.log(shipping_fee, 'shipping_fee');
|
|
1568
|
+
// console.log(shipping_fee, 'shipping_fee');
|
|
1565
1569
|
packaging = "Small Pouch"
|
|
1566
1570
|
}
|
|
1567
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)
|
|
1568
1572
|
{
|
|
1569
1573
|
shipping_fee = this.$_formatNumber(medium_pouch.shipping_fee, { decimal: 2});
|
|
1570
1574
|
shipping_fee = Number(shipping_fee);
|
|
1571
|
-
console.log(shipping_fee, 'shipping_fee');
|
|
1575
|
+
// console.log(shipping_fee, 'shipping_fee');
|
|
1572
1576
|
packaging = "Medium Pouch"
|
|
1573
1577
|
}
|
|
1574
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)
|
|
1575
1579
|
{
|
|
1576
1580
|
shipping_fee = this.$_formatNumber(large_pouch.shipping_fee, { decimal: 2});
|
|
1577
1581
|
shipping_fee = Number(shipping_fee);
|
|
1578
|
-
console.log(shipping_fee, 'shipping_fee');
|
|
1582
|
+
// console.log(shipping_fee, 'shipping_fee');
|
|
1579
1583
|
packaging = "Large Pouch"
|
|
1580
1584
|
}
|
|
1581
1585
|
else
|
|
@@ -1643,7 +1647,7 @@ export default {
|
|
|
1643
1647
|
// this.checkout_info.sub_total = merchandise_subtotal;
|
|
1644
1648
|
// this.checkout_info.shipping_total = shipping_total;
|
|
1645
1649
|
// console.log(Number(shipping_fee))
|
|
1646
|
-
console.log(packaging)
|
|
1650
|
+
// console.log(packaging)
|
|
1647
1651
|
}
|
|
1648
1652
|
else if(orders.courier_chosen == "Branch Pickup")
|
|
1649
1653
|
{
|
|
@@ -2035,7 +2039,7 @@ export default {
|
|
|
2035
2039
|
{
|
|
2036
2040
|
this.dragon_pay_choice = this.public_settings.dragonpay_details ? this.public_settings.dragonpay_details.mode : 1;
|
|
2037
2041
|
}
|
|
2038
|
-
console.log(this.dragon_pay_choice, 'dragon_pay_choice');
|
|
2042
|
+
// console.log(this.dragon_pay_choice, 'dragon_pay_choice');
|
|
2039
2043
|
if(!this.dragon_pay_choice)
|
|
2040
2044
|
{
|
|
2041
2045
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Dragon payment Method" });
|
package/GProductList.vue
CHANGED
|
@@ -227,8 +227,8 @@ export default {
|
|
|
227
227
|
},
|
|
228
228
|
async user_info()
|
|
229
229
|
{
|
|
230
|
-
await this.$_getSlotInfo();
|
|
231
|
-
await this.newGetProduct(Number(this.prod_per_page));
|
|
230
|
+
// await this.$_getSlotInfo();
|
|
231
|
+
// await this.newGetProduct(Number(this.prod_per_page));
|
|
232
232
|
}
|
|
233
233
|
},
|
|
234
234
|
methods:{
|