geer-builder 1.2.932 → 1.2.934

package/GCheckout.vue

@@ -446,6 +446,7 @@ export default {
         is_branch_pickup:false,
         is_merchant_free_shipping_conflict:false,
         is_elms_conflict:false,
+        is_renewal_solo_conflict:false,
         is_elms_included:false,
         is_ecom_disable:false,
         is_select_voucher_open:false,
@@ -1391,6 +1392,7 @@ export default {
                 let is_merchant_free_shipping = false;
                 this.is_merchant_free_shipping_conflict = false;
                 this.is_elms_conflict = false;
+                this.is_renewal_solo_conflict = false;
                 let free_shipping_ctr = 0;
                 let shipping_total = 0;
                 let voucher_total = 0;
@@ -1487,8 +1489,24 @@ export default {
                             }
                         });
                     }
-                    
-                    
+
+                    // Renewal product solo check (only if slot_expiration is enabled)
+                    if(this.public_settings.slot_expiration && this.public_settings.slot_expiration.enable && orders.hasOwnProperty("products"))
+                    {
+                        let has_renewal = false;
+                        let total_unique_products = 0;
+                        orders.products.forEach(pro => {
+                            total_unique_products++;
+                            if(pro.product && pro.product.membership_kit && (pro.product.membership_kit.use_for_renew === true || pro.product.membership_kit.use_for_renew === 'Yes'))
+                            {
+                                has_renewal = true;
+                            }
+                        });
+                        if(has_renewal && total_unique_products > 1)
+                        {
+                            this.is_renewal_solo_conflict = true;
+                        }
+                    }
 
                     if(orders.hasOwnProperty('courier_chosen'))
                     {
@@ -2404,6 +2422,10 @@ export default {
                 {
                     this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Cannot combine elms wallet purchase with other products please clear your cart.` });
                 }
+                else if(this.is_renewal_solo_conflict == true)
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Renewal products must be purchased separately. Please clear your cart and keep only the renewal product.` });
+                }
                 else if(this.is_merchant_free_shipping_conflict == true)
                 {
                     this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Cannot combine products with shipping fee to a product with free shipping fee please clear your cart.` });

package/GLogin.vue

@@ -317,7 +317,7 @@ export default
                                 }
                                 else
                                 {
-                                    this.$q.dialog({ title: `Invalid Login`, message: err });
+                                    this.$q.dialog({ title: `Invalid Login`, message: String(err) });
                                 }
     
                                 

package/mixins/global_mixins.js

@@ -128,7 +128,7 @@ export default
                 data = await new DB_SETTINGS().get(key);
             }
 
-            return data.value;
+            return data?.value;
         },
         $_formatNumber(number, options)
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geer-builder",
-  "version": "1.2.932",
+  "version": "1.2.934",
   "description": "",
   "main": "index.js",
   "scripts": {