ACP2E-3296: Checkout order email confirmation is sent to emails entered in First/Last name

glanujnehra · glanujnehra · commit d1f8a4dedc66 · 2024-11-05T15:43:13.000+05:30
diff --git a/app/code/Magento/Quote/Model/CustomerManagement.php b/app/code/Magento/Quote/Model/CustomerManagement.php
@@ -163,6 +163,7 @@ public function validateAddresses(QuoteEntity $quote)
             $customerAddress->setPostcode($billingAddress->getPostcode());
             $customerAddress->setTelephone($billingAddress->getTelephone());
             $customerAddress->setCountryId($billingAddress->getCountryId());
+            $customerAddress->setCustomAttributes($billingAddress->getCustomAttributes());
             $addresses[] = $customerAddress;
         }
         if ($quote->getShippingAddress()->getCustomerAddressId()) {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php
@@ -268,6 +268,7 @@ public function testValidateAddressesNotSavedInAddressBook()
     {
         $this->expectException(ValidatorException::class);
         $this->quoteAddressMock->method('getStreet')->willReturn(['test']);
+        $this->quoteAddressMock->method('getCustomAttributes')->willReturn(['test']);
         $this->customerAddressFactoryMock->method('create')
             ->willReturn($this->customerAddressMock);
         $addressMock = $this->getMockBuilder(Address::class)

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ public function validateAddresses(QuoteEntity $quote)`
`163`	`163`	`$customerAddress->setPostcode($billingAddress->getPostcode());`
`164`	`164`	`$customerAddress->setTelephone($billingAddress->getTelephone());`
`165`	`165`	`$customerAddress->setCountryId($billingAddress->getCountryId());`
	`166`	`+ $customerAddress->setCustomAttributes($billingAddress->getCustomAttributes());`
`166`	`167`	`$addresses[] = $customerAddress;`
`167`	`168`	`}`
`168`	`169`	`if ($quote->getShippingAddress()->getCustomerAddressId()) {`
Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,7 @@ public function testValidateAddressesNotSavedInAddressBook()`
`268`	`268`	`{`
`269`	`269`	`$this->expectException(ValidatorException::class);`
`270`	`270`	`$this->quoteAddressMock->method('getStreet')->willReturn(['test']);`
	`271`	`+ $this->quoteAddressMock->method('getCustomAttributes')->willReturn(['test']);`
`271`	`272`	`$this->customerAddressFactoryMock->method('create')`
`272`	`273`	`->willReturn($this->customerAddressMock);`
`273`	`274`	`$addressMock = $this->getMockBuilder(Address::class)`