geer-builder 1.2.792 → 1.2.794

package/GCodeVault.vue

@@ -36,7 +36,7 @@
                                 <div class="label">Pin</div>
                                 <div class="value">{{ code.pin }}</div>
                                 <div class="label">Status</div>
-                                <div class="value" :style="`color: ${ code.used ? 'red' : 'green' }`">{{ code.used ? 'Used by ' + code.used_by : 'Not Yet Used' }}</div>
+                                <div class="value" :style="`color: ${ code.used ? 'red' : checkExpiration(code.created_date) ? 'red' : 'green' }`">{{ checkExpiration(code.created_date) ? 'Expired' : (code.used ? 'Used by ' + code.used_by : 'Not Yet Used') }}</div>
                                 <div class="label">Sale ID</div>
                                 <div class="value text-red">{{ code.sale_id}}</div>
                             </div>
@@ -106,7 +106,7 @@ import GlobalMixins from './mixins/global_mixins';
 import AddSlotDialog    from './dialogs/AddSlotDialog';
 import UpgradeSlotDialog    from './dialogs/UpgradeSlotDialog';
 import AddSubslotDialog    from './dialogs/AddSubslotDialog';
-
+import moment               from 'moment';
 
 export default
 {
@@ -144,6 +144,30 @@ export default
     },
     methods:
     {
+        checkExpiration(created_date)
+        {
+            let is_expired = false;
+            try
+            {            
+                if(this.settings && this.settings.hasOwnProperty('membership_code_expiration_days') && this.settings.membership_code_expiration_days > 0)
+                {
+
+                    let expiration_days = this.settings.membership_code_expiration_days;
+                    let days_diff = moment().diff(moment( new Date(created_date.toDate()) ), 'days') 
+
+                    if(days_diff >= expiration_days)
+                    {
+                        is_expired = true;
+                    }
+                }
+            }
+            catch(error)
+            {
+
+            }
+
+            return is_expired;
+        },
         async loadCodes()
         {
             await this.$bind('code_list', this.db_code.collection().where('recipient', '==', this.user_info.uid));
@@ -163,37 +187,46 @@ export default
         {
             this.code = code;
 
-            if(code.used == true)
-            {
-                this.$q.loading.show();
-                console.log('asd');
-
-                let slot_info = await this.db_slot.get(code.used_by);
-                let user_info = await this.db_user.get(slot_info.owner);
-
-                this.$q.loading.hide();
-                this.$_showProfile(user_info);
+            let is_expired = checkExpiration(code.created_date);
 
+            if(is_expired == true)
+            {
+                
             }
             else
             {
-                if(code.hasOwnProperty('product') && code.product.type === 'Subslot Kit')
+                if(code.used == true)
                 {
-                    this.is_open_add_subslot_dialog = true;
+                    this.$q.loading.show();
+                    console.log('asd');
+    
+                    let slot_info = await this.db_slot.get(code.used_by);
+                    let user_info = await this.db_user.get(slot_info.owner);
+    
+                    this.$q.loading.hide();
+                    this.$_showProfile(user_info);
+    
                 }
                 else
                 {
-                    if(code.kit_for_upgrade === "Don't use for Upgrade")
-                    {
-                        this.is_open_add_slot_dialog = true;
-                    }
-                    else if(code.kit_for_upgrade === "Only For Upgrade")
+                    if(code.hasOwnProperty('product') && code.product.type === 'Subslot Kit')
                     {
-                        this.is_open_upgrade_slot_dialog = true;
+                        this.is_open_add_subslot_dialog = true;
                     }
                     else
                     {
-                        this.is_select_action_dialog_open = true;
+                        if(code.kit_for_upgrade === "Don't use for Upgrade")
+                        {
+                            this.is_open_add_slot_dialog = true;
+                        }
+                        else if(code.kit_for_upgrade === "Only For Upgrade")
+                        {
+                            this.is_open_upgrade_slot_dialog = true;
+                        }
+                        else
+                        {
+                            this.is_select_action_dialog_open = true;
+                        }
                     }
                 }
             }

package/package.json

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