geer-builder 1.2.910 → 1.2.911
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 +5 -4
- package/package.json +1 -1
package/GCheckout.vue
CHANGED
|
@@ -604,7 +604,7 @@ export default {
|
|
|
604
604
|
|
|
605
605
|
if(this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.active)
|
|
606
606
|
{
|
|
607
|
-
if(this.user_info.slot_owned > 0 )
|
|
607
|
+
if(this.user_info.slot_owned > 0 && this.user_info.active_slot)
|
|
608
608
|
{
|
|
609
609
|
let slot = await new DB_SLOT().getSponsor(this.user_info.active_slot);
|
|
610
610
|
if(slot.length>0)
|
|
@@ -1427,11 +1427,12 @@ export default {
|
|
|
1427
1427
|
}
|
|
1428
1428
|
else
|
|
1429
1429
|
{
|
|
1430
|
-
|
|
1430
|
+
let has_free_shipping = pro.product.merchant_free_shipping_applied === true || pro.product.product_fee_shipping_applied === true;
|
|
1431
|
+
if(free_shipping_ctr >= 1 && is_merchant_free_shipping !== true && has_free_shipping)
|
|
1431
1432
|
{
|
|
1432
1433
|
this.is_merchant_free_shipping_conflict = true;
|
|
1433
1434
|
}
|
|
1434
|
-
else if(free_shipping_ctr >= 1 && is_merchant_free_shipping === true &&
|
|
1435
|
+
else if(free_shipping_ctr >= 1 && is_merchant_free_shipping === true && !has_free_shipping)
|
|
1435
1436
|
{
|
|
1436
1437
|
this.is_merchant_free_shipping_conflict = true;
|
|
1437
1438
|
}
|
|
@@ -1447,7 +1448,7 @@ export default {
|
|
|
1447
1448
|
}
|
|
1448
1449
|
|
|
1449
1450
|
free_shipping_ctr++;
|
|
1450
|
-
if(pro.product.merchant_free_shipping_applied === true)
|
|
1451
|
+
if(pro.product.merchant_free_shipping_applied === true || pro.product.product_fee_shipping_applied === true)
|
|
1451
1452
|
{
|
|
1452
1453
|
is_merchant_free_shipping = true;
|
|
1453
1454
|
}
|