Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3311' into Tier4-Kings-PR-10-28-2024

Author: glo23503

app/code/Magento/Customer/Model/Address/Validator/Customer.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -44,10 +44,7 @@ public function validate(AbstractAddress $address): array
                 ->getCustomerId();
 
             if ($originalAddressCustomerId !== 0 && $originalAddressCustomerId !== $addressCustomerId) {
-                $errors[] = __(
-                    'Provided customer ID "%customer_id" isn\'t related to current customer address.',
-                    ['customer_id' => $addressCustomerId]
-                );
+                $errors[] = __('A customer with the same email address already exists in an associated website.');
             }
         }
 

app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CustomerTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -82,12 +82,7 @@ public function testValidateNewCustomerWithExistingCustomerAddress(): void
         $originalAddressMock->expects($this->once())->method('getCustomerId')->willReturn(2);
 
         $this->assertEquals(
-            [
-                __(
-                    'Provided customer ID "%customer_id" isn\'t related to current customer address.',
-                    ['customer_id' => null]
-                )
-            ],
+            [__('A customer with the same email address already exists in an associated website.')],
             $this->model->validate($addressMock)
         );
     }
@@ -160,12 +155,7 @@ public function testValidateExistingCustomerAddressWithNotRelevantCustomer(): vo
         $originalAddressMock->expects($this->once())->method('getCustomerId')->willReturn(1);
 
         $this->assertEquals(
-            [
-                __(
-                    'Provided customer ID "%customer_id" isn\'t related to current customer address.',
-                    ['customer_id' => 2]
-                )
-            ],
+            [__('A customer with the same email address already exists in an associated website.')],
             $this->model->validate($addressMock)
         );
     }

app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -46,12 +46,15 @@ public function validate(Quote $quote): array
         $billingAddress = $quote->getBillingAddress();
         $billingAddress->setStoreId($quote->getStoreId());
         $validationResult = $billingAddress->validate();
-        if ($validationResult !== true) {
-            $validationErrors = [__($this->generalMessage)];
-        }
         if (is_array($validationResult)) {
             $validationErrors = array_merge($validationErrors, $validationResult);
         }
+        if ($quote->getCustomerId() === null && $quote->getCustomerId() !== $quote->getOrigData('customer_id')) {
+            return [$this->validationResultFactory->create(['errors' => $validationErrors])];
+        }
+        if ($validationResult !== true) {
+            $validationErrors = array_merge([__($this->generalMessage)], $validationErrors);
+        }
 
         return [$this->validationResultFactory->create(['errors' => $validationErrors])];
     }

app/code/Magento/Quote/Test/Unit/Model/ValidationRules/BillingAddressValidationRuleTest.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Test\Unit\Model\ValidationRules;
+
+use Magento\Quote\Model\Quote\Address;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\Validation\ValidationResultFactory;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\ValidationRules\BillingAddressValidationRule;
+use PHPUnit\Framework\TestCase;
+
+class BillingAddressValidationRuleTest extends TestCase
+{
+    /**
+     * @var BillingAddressValidationRule
+     */
+    private $model;
+
+    /**
+     * @var ValidationResultFactory|MockObject
+     */
+    private $validationResultFactoryMock;
+
+    protected function setUp(): void
+    {
+        $this->validationResultFactoryMock = $this->getMockBuilder(ValidationResultFactory::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['create'])
+            ->getMock();
+        $this->model = new BillingAddressValidationRule($this->validationResultFactoryMock);
+    }
+
+    public function testValidate()
+    {
+        $storeId = 1;
+        $error = new \Magento\Framework\Phrase(
+            'A customer with the same email address already exists in an associated website.'
+        );
+        $validationResult = [$error];
+        $validationResultObj = new \Magento\Framework\Validation\ValidationResult($validationResult);
+        $this->validationResultFactoryMock->expects($this->once())->method('create')->with(
+            ['errors' => $validationResult]
+        )->willReturn($validationResultObj);
+        $addressMock = $this->getMockBuilder(Address::class)->disableOriginalConstructor()->getMock();
+        $addressMock->expects($this->once())->method('validate')->willReturn($validationResult);
+        $quoteMock = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($addressMock);
+        $quoteMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
+        $quoteMock->expects($this->any())->method('__call')->with('getCustomerId')
+            ->willReturn(null);
+        $quoteMock->expects($this->once())->method('getOrigData')->willReturn(['customer_id' => 2]);
+        $result = $this->model->validate($quoteMock);
+        $this->assertIsArray($result);
+        $this->assertEquals(
+            'A customer with the same email address already exists in an associated website.',
+            $result[0]->getErrors()[0]->getText()
+        );
+    }
+}