geer-builder 1.2.841 → 1.2.843

package/GLogin.vue

@@ -105,7 +105,8 @@ export default
         mbot:Boolean,
         show_pass_button:Boolean,
         new_create_account_form:Boolean,
-        is_heartzone:Boolean
+        is_heartzone:Boolean,
+        is_adspro:Boolean
 
     },
     components: { GRegistration,GForgotPassword },
@@ -187,7 +188,17 @@ export default
         },
         openRegistration()
         {
-            this.is_registration_dialog= true;
+            if(this.is_adspro)
+            {
+                const baseUrl = `${window.location.protocol}//${window.location.host}`; 
+                const invitePath = '#/invite/REFCOMPANYHEAD'; 
+                const fullUrl = `${baseUrl}/${invitePath}`;
+                window.location.href = fullUrl; 
+            }
+            else
+            {
+                this.is_registration_dialog= true;
+            }
         },
         toggleShowPass()
         {
@@ -195,92 +206,102 @@ export default
         },
         async submitLogin()
         {
-            
             /* start login */
             const AccountClass = new FAccountClass();
             let disable_login = false;
             let merchant_only = false;
-            try
+            if(this.form_data.email)
             {
-                if(!this.is_submitting)
+                try
                 {
-                    this.is_submitting = true;
-                    
-                    let slot_info = await this.db_slot.get(this.form_data.email.toUpperCase());
-
-                    if(slot_info)
-                    {
-                        this.form_data.email = slot_info.owner_info.email;
-                    }
-
-                    if(this.public_settings.hasOwnProperty("login_update_auth") && this.public_settings.login_update_auth == true)
+                    if(!this.is_submitting)
                     {
-                        let update = await this.$_fbCall('memberUpdateAuth', this.form_data);
-                    }
-
-                    let disable_verified = false;
-                    if(this.public_settings.hasOwnProperty("disable_login_verified") && this.public_settings.disable_login_verified == true)
-                    {
-                        disable_verified = true;
-                    }
-
-                    if(this.public_settings.hasOwnProperty("merchant_login_only") && this.public_settings.merchant_login_only == true)
-                    {
-                        merchant_only = true;
-                    }
-
-                    if(this.public_settings.hasOwnProperty("functions") && this.public_settings.functions.login == false)
-                    {
-                        disable_login = true;
-                    }
-
-                    if(disable_login)
-                    {
-                        this.$q.dialog(
+                        this.is_submitting = true;
+                        
+                        let slot_info = await this.db_slot.get(this.form_data.email.toUpperCase());
+    
+                        if(slot_info)
                         {
-                            title: 'Ann Error Has Occured',
-                            message: 'Login is currently disabled.'
-                        });   
-                    }
-                    else
-                    {
-                        await AccountClass.signIn(this.form_data.email, this.form_data.password, disable_verified, merchant_only).then((res) =>
+                            this.form_data.email = slot_info.owner_info.email;
+                        }
+    
+                        if(this.public_settings.hasOwnProperty("login_update_auth") && this.public_settings.login_update_auth == true)
                         {
-                            if(res.hasOwnProperty('verified') && !res.verified && disable_verified == false)
-                            {
-                                this.is_resend_dialog = true;
-                            }
-                            else
-                            {
-                                this.$emit('success', this.form_data);
-                            }
-                            // let login = this.$_fbCall('loginAuditTrail', this.form_data);
-                        
-                        }).catch((err) =>
+                            let update = await this.$_fbCall('memberUpdateAuth', this.form_data);
+                        }
+    
+                        let disable_verified = false;
+                        if(this.public_settings.hasOwnProperty("disable_login_verified") && this.public_settings.disable_login_verified == true)
+                        {
+                            disable_verified = true;
+                        }
+    
+                        if(this.public_settings.hasOwnProperty("merchant_login_only") && this.public_settings.merchant_login_only == true)
+                        {
+                            merchant_only = true;
+                        }
+    
+                        if(this.public_settings.hasOwnProperty("functions") && this.public_settings.functions.login == false)
                         {
-                            if(err == "auth/user-disabled")
+                            disable_login = true;
+                        }
+    
+                        if(disable_login)
+                        {
+                            this.$q.dialog(
                             {
-                                this.$q.dialog({ title: `Invalid Login`, message: "This account is already deactivated." });
-                            }
-                            else
+                                title: 'Ann Error Has Occured',
+                                message: 'Login is currently disabled.'
+                            });   
+                        }
+                        else
+                        {
+                            await AccountClass.signIn(this.form_data.email, this.form_data.password, disable_verified, merchant_only).then((res) =>
                             {
-                                this.$q.dialog({ title: `Invalid Login`, message: err });
-                            }
-
+                                if(res.hasOwnProperty('verified') && !res.verified && disable_verified == false)
+                                {
+                                    this.is_resend_dialog = true;
+                                }
+                                else
+                                {
+                                    this.$emit('success', this.form_data);
+                                }
+                                // let login = this.$_fbCall('loginAuditTrail', this.form_data);
                             
-                        });   
+                            }).catch((err) =>
+                            {
+                                if(err == "auth/user-disabled")
+                                {
+                                    this.$q.dialog({ title: `Invalid Login`, message: "This account is already deactivated." });
+                                }
+                                else
+                                {
+                                    this.$q.dialog({ title: `Invalid Login`, message: err });
+                                }
+    
+                                
+                            });   
+                        }
+                        this.is_submitting = false;
                     }
+                }
+                catch (error)
+                {
                     this.is_submitting = false;
+                    
+                    this.$q.dialog(
+                    {
+                        title: 'Ann Error Has Occured',
+                        message: error.message
+                    });
                 }
             }
-            catch (error)
+            else
             {
-                this.is_submitting = false;
-                
                 this.$q.dialog(
                 {
-                    title: 'Ann Error Has Occured',
-                    message: error.message
+                    title: 'An Error Has Occured',
+                    message: "Please put an email"
                 });
             }
         },

package/package.json

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