geer-builder 1.2.912 → 1.2.913

package/GCheckout.vue

@@ -2426,14 +2426,6 @@ 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;
@@ -2540,40 +2532,6 @@ 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/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/package.json

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