geer-builder 1.2.911 → 1.2.913

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/GProfile.vue

@@ -52,6 +52,10 @@
                     <div class="lab" v-if="is_company_success">Type of Enrollment</div>
                     <div class="lab" v-else>Membership</div>
                 </div>
+                <div class="group" v-if="expiration_date_display">
+                    <div class="val">{{ expiration_date_display }}</div>
+                    <div class="lab">Activated Till</div>
+                </div>
             </div>
  
             <div class="actions" :style="create_slot ? `grid-template-columns: 1fr 1fr 1fr;` : ``" v-if="prop_user_info.uid !== user_info.uid">
@@ -161,7 +165,18 @@ export default
             this.$q.loading.hide();
         }
     },
-    computed: { }
+    computed: {
+        expiration_date_display()
+        {
+            if (this.slot_info && this.slot_info.length > 0 && this.slot_info[0].expiration_date)
+            {
+                let ed = this.slot_info[0].expiration_date;
+                let date = new Date(ed.seconds ? ed.seconds * 1000 : ed);
+                return this.$_formatDate(date);
+            }
+            return null;
+        }
+    }
 }
 </script>
 

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.911",
+  "version": "1.2.913",
   "description": "",
   "main": "index.js",
   "scripts": {