Merge pull request #783 from abhishek-webkul/gli-1472

Updated: Do not create multiple guest acounts with the same email, use previous one if available

Author: rohit053

controllers/front/AuthController.php

@@ -389,7 +389,7 @@ protected function processSubmitAccount()
         if (Validate::isEmail($email = Tools::getValue('email')) && !empty($email)) {
             if (Customer::customerExists($email)) {
                 $this->errors[] = Tools::displayError('An account using this email address has already been registered.', false);
-            } elseif (Customer::customerExists($email, false, false)) {
+            } elseif (Tools::getValue('is_new_customer', 1) && Customer::customerExists($email, false, false)) {
                 $this->errors[] = Tools::displayError('You are already registered as a guest with this email address.').'&nbsp;<button type="submit" class="btn btn-link alert-link btn-transform" name="submitTransformAccount">'.Tools::displayError('Click here').'</button>'.Tools::displayError('').' to generate a password for your account.';
             }
         }
@@ -591,8 +591,16 @@ protected function processSubmitAccount()
             }
 
             if (!count($this->errors)) {
-                if (Customer::customerExists(Tools::getValue('email'))) {
-                    $this->errors[] = Tools::displayError('An account using this email address has already been registered. Please enter a valid password or request a new one. ', false);
+                if (!Tools::getValue('is_new_customer', 1)) {
+                    if ($idCustomer = Customer::customerExists(Tools::getValue('email'), true, false)) {
+                        if ($idAddress = Customer::getCustomerIdAddress($idCustomer)) {
+                            $address = new Address($idAddress);
+                        }
+                    }
+                } else {
+                    if (Customer::customerExists(Tools::getValue('email'))) {
+                        $this->errors[] = Tools::displayError('An account using this email address has already been registered. Please enter a valid password or request a new one. ', false);
+                    }
                 }
 
                 $this->processCustomerNewsletter($customer);
@@ -606,11 +614,17 @@ protected function processSubmitAccount()
                     $customer->active = 1;
                     // New Guest customer
                     if (Tools::isSubmit('is_new_customer')) {
-                        $customer->is_guest = !Tools::getValue('is_new_customer', 1);
+                        if ($idCustomer) {
+                            // update guest customer details
+                            $customer = new Customer($idCustomer);
+                            $customer->firstname = Tools::getValue('firstname');
+                            $customer->lastname = Tools::getValue('lastname');
+                        }
+                        $customer->is_guest = 1;
                     } else {
                         $customer->is_guest = 0;
                     }
-                    if (!$customer->add()) {
+                    if (!$customer->save()) {
                         $this->errors[] = Tools::displayError('An error occurred while creating your account.');
                     } else {
                         foreach ($addresses_types as $addresses_type) {
@@ -627,7 +641,7 @@ protected function processSubmitAccount()
                             if ($addresses_type == 'address_invoice') {
                                 $_POST = $post_back;
                             }
-                            if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->add()) {
+                            if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->save()) {
                                 $this->errors[] = Tools::displayError('An error occurred while creating your address.');
                             }
                         }