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

Author: glanujnehra

app/code/Magento/Quote/Model/CustomerManagement.php

@@ -158,7 +158,8 @@ public function validateAddresses(QuoteEntity $quote)
             $addresses[] = $this->customerAddressRepository->getById(
                 $quote->getShippingAddress()->getCustomerAddressId()
             );
-        } else {
+        }
+        if (empty($addresses) && $quote->getCustomerIsGuest()) {
             $billingAddress = $quote->getBillingAddress();
             $customerAddress = $this->customerAddressFactory->create();
             $customerAddress->setFirstname($billingAddress->getFirstname());
@@ -171,7 +172,6 @@ public function validateAddresses(QuoteEntity $quote)
             $customerAddress->setCustomAttributes($billingAddress->getCustomAttributes());
             $addresses[] = $customerAddress;
         }
-
         foreach ($addresses as $address) {
             $validator = $this->validatorFactory->createValidator('customer_address', 'save');
             $addressModel = $this->addressFactory->create();

app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php

@@ -114,7 +114,7 @@ protected function setUp(): void
         );
         $this->quoteMock = $this->getMockBuilder(Quote::class)
             ->addMethods(['getPasswordHash'])
-            ->onlyMethods(['getId', 'getCustomer', 'getBillingAddress', 'getShippingAddress', 'setCustomer'])
+            ->onlyMethods(['getId', 'getCustomer', 'getBillingAddress', 'getShippingAddress', 'setCustomer', 'getCustomerIsGuest'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->quoteAddressMock = $this->createMock(Address::class);
@@ -267,6 +267,7 @@ public function testValidateAddresses()
     public function testValidateAddressesNotSavedInAddressBook()
     {
         $this->expectException(ValidatorException::class);
+        $this->quoteMock->method('getCustomerIsGuest')->willReturn(true);
         $this->quoteAddressMock->method('getStreet')->willReturn(['test']);
         $this->quoteAddressMock->method('getCustomAttributes')->willReturn(['test']);
         $this->customerAddressFactoryMock->method('create')