Merge pull request PrestaShop#36454 from Hlavtox/better-protect-guest…

…-conversion
mattgoud · Jul 5, 2024 · d113ebe · d113ebe
2 parents 9f14e06 + 7e3de73
commit d113ebe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/classes/Customer.php b/classes/Customer.php
@@ -1210,6 +1210,11 @@ public function transformToCustomer($idLang, $password = null)
             return false;
         }
 
+        // If a customer with the same email already exists, wrong call
+        if (Customer::customerExists($this->email)) {
+            return false;
+        }
+
         $this->is_guest = false;
 
         /*

diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
@@ -113,6 +113,13 @@ public function postProcess()
                     [],
                     'Shop.Notifications.Error'
                 );
+            // Check if a different customer with the same email was not already created in a different window or through backoffice
+            } elseif (Customer::customerExists($customer->email)) {
+                $this->errors[] = $this->trans(
+                    'You can\'t transform your account into a customer account, because a registered customer with the same email already exists.',
+                    [],
+                    'Shop.Notifications.Error'
+                );
             // Attempt to convert the customer
             } elseif ($customer->transformToCustomer($this->context->language->id, $password)) {
                 $this->success[] = $this->trans(

diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
@@ -181,12 +181,22 @@ public function postProcess()
                 return;
             }
 
+            // Prevent error
+            // A) either on page refresh
+            // B) if we already transformed him in other window or through backoffice
             if ($this->customer->is_guest == 0) {
                 $this->errors[] = $this->trans(
                     'A customer account has already been created from this guest account. Please sign in.',
                     [],
                     'Shop.Notifications.Error'
                 );
+            // Check if a different customer with the same email was not already created in a different window or through backoffice
+            } elseif (Customer::customerExists($this->customer->email)) {
+                $this->errors[] = $this->trans(
+                    'You can\'t transform your account into a customer account, because a registered customer with the same email already exists.',
+                    [],
+                    'Shop.Notifications.Error'
+                );
             // Attempt to convert the customer
             } elseif ($this->customer->transformToCustomer($this->context->language->id, $password)) {
                 $this->success[] = $this->trans(