geer-builder 1.2.926 → 1.2.928

package/GRegistration.vue

@@ -272,7 +272,8 @@ export default
             {
                 delete this.form_data.international_country;
             }
-            if(this.val == false)
+            let has_terms = this.terms_and_conditions && typeof this.terms_and_conditions.terms_and_conditions === 'string' && this.terms_and_conditions.terms_and_conditions;
+            if(!this.val && has_terms)
             {
                 this.is_term_and_condition_open = true;
             }

package/mixins/global_mixins.js

@@ -7,8 +7,6 @@ import DB_SETTINGS              from '../models/DB_SETTINGS';
 import { formatDate }           from '../utilities/DateUtils';
 import FAccountClass            from '../classes/FAccountClass';
 
-const _settings_store = {};
-const _pending_requests = {};
 
 export default
 {
@@ -119,38 +117,18 @@ export default
         },
         async $_getData(key, country = null)
         {
-            let store_key = country ? `${key}_${country}` : key;
-
-            if (_settings_store.hasOwnProperty(store_key))
+            let data;
+            if (key == "membership_list" && country != null)
             {
-                return _settings_store[store_key];
+                let res = await new DB_SETTINGS().get(key);
+                data = await this.filterMembershipByCountry(res, country);
             }
-
-            if (_pending_requests[store_key])
+            else
             {
-                return _pending_requests[store_key];
+                data = await new DB_SETTINGS().get(key);
             }
 
-            _pending_requests[store_key] = (async () =>
-            {
-                let data;
-                if (key == "membership_list" && country != null)
-                {
-                    let res = await new DB_SETTINGS().get(key);
-                    data = await this.filterMembershipByCountry(res, country);
-                }
-                else
-                {
-                    data = await new DB_SETTINGS().get(key);
-                }
-
-                let value = data.value;
-                _settings_store[store_key] = value;
-                delete _pending_requests[store_key];
-                return value;
-            })();
-
-            return _pending_requests[store_key];
+            return data.value;
         },
         $_formatNumber(number, options)
         {

package/package.json

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