geer-builder 1.2.570 → 1.2.573
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 +3 -3
- package/GProductList.vue +2 -1
- package/GProductPage.vue +9 -6
- package/package.json +1 -1
package/GCheckout.vue
CHANGED
|
@@ -475,7 +475,7 @@ export default {
|
|
|
475
475
|
{
|
|
476
476
|
sessionStorage.setItem('referral_slot_code', this.user_info.sponsor);
|
|
477
477
|
}
|
|
478
|
-
else if(this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.
|
|
478
|
+
else if(this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.rc_sponsor)
|
|
479
479
|
{
|
|
480
480
|
sessionStorage.setItem('referral_slot_code', this.public_settings.registration_sponsor.default_sponsor);
|
|
481
481
|
}
|
|
@@ -1718,9 +1718,9 @@ export default {
|
|
|
1718
1718
|
{
|
|
1719
1719
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Insufficient GC" });
|
|
1720
1720
|
}
|
|
1721
|
-
else if(this.online_payment_only && this.
|
|
1721
|
+
else if(this.online_payment_only && !this.public_settings.shopper_member_payment_method.includes(this.checkout_info.payment_method.payment_method_id))
|
|
1722
1722
|
{
|
|
1723
|
-
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Shopper membership can only be purchased using online payment or dragon pay" });
|
|
1723
|
+
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Shopper membership can only be purchased using online payment or dragon pay or manual pay" });
|
|
1724
1724
|
}
|
|
1725
1725
|
else
|
|
1726
1726
|
{
|
package/GProductList.vue
CHANGED
|
@@ -25,7 +25,8 @@
|
|
|
25
25
|
<div class="product-list-detail" v-if="sort_by!='gc_price'">
|
|
26
26
|
<div class="product-list-row">
|
|
27
27
|
<!-- <div class="prod_price price" :class="field.user_discount>0 ? 'has-discount' : ''">{{main_currency}} {{$_formatNumber(field.original_price, { decimal: 2})}}{{field.user}}</div> -->
|
|
28
|
-
<div class="prod_price price has-discount" v-if="!show_original_price">{{main_currency}} {{$_formatNumber(field.original_price, { decimal: 2})}}{{field.user}}</div>
|
|
28
|
+
<!-- <div class="prod_price price has-discount" v-if="!show_original_price">{{main_currency}} {{$_formatNumber(field.original_price, { decimal: 2})}}{{field.user}}</div> -->
|
|
29
|
+
<div class="prod_price price has-discount" v-if="!show_original_price">{{main_currency}} {{field.original_price ? field.original_price + '.00' : 0}}</div>
|
|
29
30
|
<div class="prod_price discount" v-if="show_discount_price && field.user_discount>0">{{main_currency}} {{ $_formatNumber(field.selling_price - (field.selling_price * (field.user_discount / 100)), { decimal: 2 }) }}</div>
|
|
30
31
|
<div class="prod_price discount" v-else>{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2 }) }}</div>
|
|
31
32
|
</div>
|
package/GProductPage.vue
CHANGED
|
@@ -976,13 +976,16 @@ export default {
|
|
|
976
976
|
arr.push(variant_product_id_list);
|
|
977
977
|
for(let group_of_prod_id of arr)
|
|
978
978
|
{
|
|
979
|
-
|
|
980
|
-
if(grouped_by_ten.docs.length>0)
|
|
979
|
+
if(group_of_prod_id.length > 0)
|
|
981
980
|
{
|
|
982
|
-
let
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
981
|
+
let grouped_by_ten = await new DB_MERCHANT_INVENTORY().collection().where("product_id", "in", group_of_prod_id).get();
|
|
982
|
+
if(grouped_by_ten.docs.length>0)
|
|
983
|
+
{
|
|
984
|
+
let ret = grouped_by_ten.docs.map(by_invent => {
|
|
985
|
+
return by_invent.data();
|
|
986
|
+
});
|
|
987
|
+
this.merchant_variant_product_inventory_list = this.merchant_variant_product_inventory_list.concat(ret);
|
|
988
|
+
}
|
|
986
989
|
}
|
|
987
990
|
}
|
|
988
991
|
}
|