geer-builder 1.2.930 → 1.2.932

package/GCheckout.vue

@@ -393,6 +393,22 @@
         <q-dialog v-model="is_ecom_disable" max-width="1000px">
             <ecommerce-maintenance></ecommerce-maintenance>
         </q-dialog>
+        <q-dialog persistent v-model="is_renewal_dialog_open">
+            <q-card style="width: 420px; text-align: center;" class="q-pa-lg">
+                <div style="font-size: 50px;">&#128260;</div>
+                <div class="text-h5 q-mt-md" style="font-weight: 600;">Renewal Product Detected</div>
+                <div class="q-mt-sm text-body1">
+                    <b>{{ renewal_names }}</b> is a renewal product.
+                </div>
+                <div class="q-mt-sm text-body2 text-grey-7">
+                    This product will <b>{{ renewal_action }}</b> your privilege card once the order is processed.
+                </div>
+                <div class="q-mt-lg" style="display: flex; gap: 10px;">
+                    <q-btn outline color="grey" label="Cancel" class="full-width" @click="is_renewal_dialog_open = false" />
+                    <q-btn color="primary" label="Continue" class="full-width" @click="confirmRenewalCheckout()" />
+                </div>
+            </q-card>
+        </q-dialog>
     </div>
     <div v-else >
         <div class="loader">
@@ -494,6 +510,9 @@ export default {
         online_payment_only:false,
         package_free_shipping:false,
         merchant_free_shipping:false,
+        is_renewal_dialog_open: false,
+        renewal_action: '',
+        renewal_names: '',
         payment_channel_group: [
             {
                 id: 'otc',
@@ -2437,73 +2456,40 @@ export default {
                     {
                         this.checkout_info.reseller_slot_code = sessionStorage.reseller_slot_code;
                     }
-                    if(this.checkout_info.payment_method.payment_method_id == "wallet")
-                    {
-                        this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                        this.is_dialog_confirm_open = true;
-                    }
-                    else if(this.checkout_info.payment_method.payment_method_id == "gc_points")
-                    {
-                        this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                        this.is_dialog_confirm_open = true;
-                    }
-                    else if (this.checkout_info.payment_method.payment_method_id == "manual_pay")
-                    {
-                        if(!this.manual_pay_choice)
-                        {
-                            this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Payment Method" });
-                        }
-                        else
-                        {
-                            this.checkout_info.payment_method.manual_pay_choice = this.manual_pay_choice;
-                            this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                            this.is_dialog_confirm_open = true;
-                        }
-                        
-                    }
-                    else if (this.checkout_info.payment_method.payment_method_id == "online_payment")
-                    {
-                        if(!this.online_payment_choice)
-                        {
-                            this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Payment Method" });
-                        }
-                        else
-                        {
-                            this.checkout_info.payment_method.online_payment_choice = this.online_payment_choice;
-                            this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                            this.is_dialog_confirm_open = true;
-                        }
-                    }
-                    else if (this.checkout_info.payment_method.payment_method_id == "cod")
-                    {
-                        // this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                        // console.log(this.sale_id.data);
-                        // alert("Invoice Number : "+this.sale_id.data.invoice_no)
-                        this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                        this.is_dialog_confirm_open = true;
-                    }
-                    else if (this.checkout_info.payment_method.payment_method_id == "dragon_pay")
+
+                    // Check for renewal products only if slot_expiration is enabled (0 extra reads)
+                    let slot_expiration_enabled = this.public_settings.slot_expiration && this.public_settings.slot_expiration.enable;
+                    if (slot_expiration_enabled)
                     {
-                        if(this.public_settings.hasOwnProperty('dragonpay_details') && !this.public_settings.dragonpay_details.show_active_payment)
+                        let renewal_names = [];
+                        for (let p of this.product_list)
                         {
-                            this.dragon_pay_choice = this.public_settings.dragonpay_details ? this.public_settings.dragonpay_details.mode : 1;
-                        }
-                        // console.log(this.dragon_pay_choice, 'dragon_pay_choice');
-                        if(!this.dragon_pay_choice)
-                        {
-                            this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Dragon payment Method" });
+                            if (p.product && p.product.membership_kit
+                                && (p.product.membership_kit.use_for_renew === true || p.product.membership_kit.use_for_renew === 'Yes'))
+                            {
+                                renewal_names.push(p.product.product_name);
+                            }
                         }
-                        else
+
+                        if (renewal_names.length > 0 && (this.user_info.slot_owned > 0 || this.user_info.active_slot))
                         {
-                            this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                            this.is_dialog_confirm_open = true;
+                            let is_expired = false;
+                            if (this.current_slot_info)
+                            {
+                                let exp_result = this.$_checkSlotExpirationLocal(this.current_slot_info, this.public_settings);
+                                is_expired = exp_result.expiration_enabled && exp_result.is_expired;
+                            }
+
+                            let action = is_expired ? 'reactivate' : 'extend';
+                            this.renewal_action = action;
+                            this.renewal_names = renewal_names.join(', ');
+                            this.$q.loading.hide();
+                            this.is_renewal_dialog_open = true;
+                            return;
                         }
                     }
-                    else if (this.checkout_info.payment_method.payment_method_id == "cod_manual")
-                    {
-                        this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
-                        this.is_dialog_confirm_open = true;
-                    }
+
+                    await this.executeProceedCheckout();
                 }
                 // console.log(this.checkout_details);
                 this.$q.loading.hide();
@@ -2535,6 +2521,78 @@ export default {
                 this.$q.dialog({ html: true, title: `Something's not quite right`, message: error.message });
             }
         },
+        async confirmRenewalCheckout()
+        {
+            this.is_renewal_dialog_open = false;
+            this.$q.loading.show();
+            await this.executeProceedCheckout();
+            this.$q.loading.hide();
+        },
+        async executeProceedCheckout()
+        {
+            if(this.checkout_info.payment_method.payment_method_id == "wallet")
+            {
+                this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                this.is_dialog_confirm_open = true;
+            }
+            else if(this.checkout_info.payment_method.payment_method_id == "gc_points")
+            {
+                this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                this.is_dialog_confirm_open = true;
+            }
+            else if (this.checkout_info.payment_method.payment_method_id == "manual_pay")
+            {
+                if(!this.manual_pay_choice)
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Payment Method" });
+                }
+                else
+                {
+                    this.checkout_info.payment_method.manual_pay_choice = this.manual_pay_choice;
+                    this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                    this.is_dialog_confirm_open = true;
+                }
+            }
+            else if (this.checkout_info.payment_method.payment_method_id == "online_payment")
+            {
+                if(!this.online_payment_choice)
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Payment Method" });
+                }
+                else
+                {
+                    this.checkout_info.payment_method.online_payment_choice = this.online_payment_choice;
+                    this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                    this.is_dialog_confirm_open = true;
+                }
+            }
+            else if (this.checkout_info.payment_method.payment_method_id == "cod")
+            {
+                this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                this.is_dialog_confirm_open = true;
+            }
+            else if (this.checkout_info.payment_method.payment_method_id == "dragon_pay")
+            {
+                if(this.public_settings.hasOwnProperty('dragonpay_details') && !this.public_settings.dragonpay_details.show_active_payment)
+                {
+                    this.dragon_pay_choice = this.public_settings.dragonpay_details ? this.public_settings.dragonpay_details.mode : 1;
+                }
+                if(!this.dragon_pay_choice)
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Dragon payment Method" });
+                }
+                else
+                {
+                    this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                    this.is_dialog_confirm_open = true;
+                }
+            }
+            else if (this.checkout_info.payment_method.payment_method_id == "cod_manual")
+            {
+                this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                this.is_dialog_confirm_open = true;
+            }
+        },
         showActivePayment()
         {
             if(this.product_list.length>0)

package/GProcessSale.vue

@@ -776,9 +776,10 @@ export default
                             this.sale_id = sale.data;
                             this.$q.loading.hide();
 
-                            // Check for renewal products
+                            // Check for renewal products (only if slot_expiration is enabled)
                             let renewal_names = [];
-                            if (saved_product_list.length > 0 && saved_email)
+                            let slot_expiration_enabled = this.public_settings.slot_expiration && this.public_settings.slot_expiration.enable;
+                            if (slot_expiration_enabled && saved_product_list.length > 0 && saved_email)
                             {
                                 let customer_docs = await new DB_USER().collection().where('email', '==', saved_email).get();
                                 if (customer_docs.docs.length > 0)
@@ -801,7 +802,7 @@ export default
                             {
                                 this.$q.dialog({
                                     title: 'Renewal Product Detected',
-                                    message: `${renewal_names.join(', ')} is a renewal product. No membership code will be generated — this product will renew the customer's privilege card upon claiming.`,
+                                    message: `${renewal_names.join(', ')} is a renewal product. No membership code will be generated — this product will renew the customer's privilege card once the order is processed.`,
                                     persistent: true
                                 }).onDismiss(() => {
                                     this.is_dialog_confirm_open = true;

package/package.json

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