geer-builder 1.2.910 → 1.2.912

package/GCheckout.vue

@@ -604,7 +604,7 @@ export default {
 
             if(this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.active)
             {
-                if(this.user_info.slot_owned > 0 )
+                if(this.user_info.slot_owned > 0 && this.user_info.active_slot)
                 {
                     let slot = await new DB_SLOT().getSponsor(this.user_info.active_slot);
                     if(slot.length>0)
@@ -1427,11 +1427,12 @@ export default {
                             }
                             else
                             {
-                                if(free_shipping_ctr >= 1 && is_merchant_free_shipping !== true && pro.product.merchant_free_shipping_applied === true)
+                                let has_free_shipping = pro.product.merchant_free_shipping_applied === true || pro.product.product_fee_shipping_applied === true;
+                                if(free_shipping_ctr >= 1 && is_merchant_free_shipping !== true && has_free_shipping)
                                 {
                                     this.is_merchant_free_shipping_conflict = true;
                                 }
-                                else if(free_shipping_ctr >= 1 && is_merchant_free_shipping === true && pro.product.merchant_free_shipping_applied !== true)
+                                else if(free_shipping_ctr >= 1 && is_merchant_free_shipping === true && !has_free_shipping)
                                 {
                                     this.is_merchant_free_shipping_conflict = true;
                                 }
@@ -1447,7 +1448,7 @@ export default {
                             }
 
                             free_shipping_ctr++;
-                            if(pro.product.merchant_free_shipping_applied === true)
+                            if(pro.product.merchant_free_shipping_applied === true || pro.product.product_fee_shipping_applied === true)
                             {
                                 is_merchant_free_shipping = true;
                             }
@@ -2425,6 +2426,14 @@ export default {
                 }
                 else
                 {
+                    // Check for renewal products before proceeding
+                    let proceed = await this.checkRenewalPrompt();
+                    if (!proceed)
+                    {
+                        this.$q.loading.hide();
+                        return;
+                    }
+
                     if(sessionStorage.referral_slot_code && this.payment_method.payment_method_id != "gc_points")
                     {
                         this.checkout_info.referral_slot_code = sessionStorage.referral_slot_code;
@@ -2531,6 +2540,40 @@ export default {
                 this.$q.dialog({ html: true, title: `Something's not quite right`, message: error.message });
             }
         },
+        async checkRenewalPrompt()
+        {
+            // Check if any product in checkout is a renewal product and user has a slot
+            if (!this.user_info || !this.user_info.active_slot) return true; // no slot, proceed normally
+
+            let renewal_products = [];
+            if (this.checkout_info && this.checkout_info.product_list)
+            {
+                for (let p of this.checkout_info.product_list)
+                {
+                    if (p.product && p.product.membership_kit && p.product.membership_kit.use_for_renew === true)
+                    {
+                        renewal_products.push(p);
+                    }
+                }
+            }
+
+            if (renewal_products.length === 0) return true; // no renewal products, proceed
+
+            let product_names = renewal_products.map(p => `"${p.product.product_name}" (x${p.quantity})`).join(', ');
+
+            return new Promise((resolve) => {
+                this.$q.dialog({
+                    title: 'Renewal Confirmation',
+                    message: `${product_names} will be used for renewal of your privilege card because you already have an activated slot. Proceed?`,
+                    cancel: true,
+                    persistent: true
+                }).onOk(() => {
+                    resolve(true);
+                }).onCancel(() => {
+                    resolve(false);
+                });
+            });
+        },
         showActivePayment()
         {
             if(this.product_list.length>0)

package/GNoSlotDashboardPackage.vue

@@ -10,7 +10,7 @@
                     <div class="prod_name product-list-name" :style="'max-width:'+width+';'">{{field.product_name}}</div>
                     <!-- <div class="prod_description">{{field.description}}</div> -->
                     <div class="prod_price price">{{main_currency}} {{$_formatNumber(field.selling_price, { decimal: 2})}}</div>
-                    <div><q-btn class="full-width" label="Buy Now" color="primary" @click="showMore(field)"></q-btn></div>
+                    <div><q-btn class="full-width" :label="button_label" color="primary" @click="showMore(field)"></q-btn></div>
                     <!-- <div style="text-decoration:underline;color:blue;cursor:pointer;" @click="showMore(field)">Show More</div> -->
                 </div>
             </div>
@@ -42,6 +42,7 @@ export default {
         image_size:String,
         country_code: String,
         heading: { type: String, default: 'Be a Member to make the World better' },
+        button_label: { type: String, default: 'Buy Now' },
     },
     data: () =>
     ({

package/components/ProcessSaleConfirmDialog.vue

@@ -107,6 +107,41 @@ export default {
         },
 
         async submit()
+        {
+            // Check for renewal products before processing
+            let renewal_products = [];
+            if (this.sale && this.sale.product_list)
+            {
+                for (let p of this.sale.product_list)
+                {
+                    if (p.product && p.product.membership_kit && p.product.membership_kit.use_for_renew === true
+                        && this.user && (this.user.slot_owned > 0 || this.user.active_slot))
+                    {
+                        renewal_products.push(p);
+                    }
+                }
+            }
+
+            if (renewal_products.length > 0)
+            {
+                let product_names = renewal_products.map(p => `"${p.product.product_name}" (x${p.quantity})`).join(', ');
+                let customer_name = this.sale.customer.full_name || this.sale.customer.email;
+
+                this.$q.dialog({
+                    title: 'Renewal Confirmation',
+                    message: `${product_names} will be used for renewal of ${customer_name}'s privilege card because they already have an activated slot. Proceed?`,
+                    cancel: true,
+                    persistent: true
+                }).onOk(async () => {
+                    await this.processCompleteSale();
+                });
+            }
+            else
+            {
+                await this.processCompleteSale();
+            }
+        },
+        async processCompleteSale()
         {
             this.$q.loading.show();
 

package/mixins/global_mixins.js

@@ -26,6 +26,45 @@ export default
             let call_method = FUNCTIONS.httpsCallable('apiCall');
             return await call_method(data);
         },
+        $_checkSlotExpirationLocal(slot_info, public_settings)
+        {
+            if (!public_settings || !public_settings.slot_expiration || !public_settings.slot_expiration.enable)
+            {
+                return { expiration_enabled: false };
+            }
+            if (!slot_info || !slot_info.created_date)
+            {
+                return { expiration_enabled: true, has_slot: false };
+            }
+
+            let expiration_date;
+            if (slot_info.expiration_date)
+            {
+                let ed = slot_info.expiration_date;
+                expiration_date = new Date(ed.seconds ? ed.seconds * 1000 : ed);
+            }
+            else
+            {
+                // Fallback for old slots without expiration_date (only created_date needed)
+                let expiration_days = public_settings.slot_expiration.initial_expiration_days;
+                let cd = slot_info.created_date;
+                expiration_date = new Date(cd.seconds ? cd.seconds * 1000 : cd);
+                expiration_date.setDate(expiration_date.getDate() + expiration_days);
+            }
+
+            let now = new Date();
+            let is_expired = now >= expiration_date;
+            let days_remaining = Math.ceil((expiration_date - now) / (1000 * 60 * 60 * 24));
+
+            return {
+                expiration_enabled: true,
+                has_slot: true,
+                is_expired,
+                days_remaining: is_expired ? 0 : days_remaining,
+                expiration_date,
+                membership_id: slot_info.membership_id
+            };
+        },
         async filterMembershipByCountry(data, country)
         {
             let return_data = {};

package/package.json

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