MAGETWO-38824: email cannot be retrieved from address on one page checkout

Serhiy Shkolyarenko · Serhiy Shkolyarenko · commit 2991f130b8f6 · 2015-06-17T13:44:18.000+03:00
fix
diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
@@ -87,6 +87,8 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
                 $shippingAddress = $quote->getShippingAddress()->importCustomerAddressData($addressData);
                 $shippingAddress->setSaveInAddressBook($saveInAddressBook);
             }
+        } elseif ($quote->getCustomerId()) {
+            $address->setEmail($quote->getCustomerEmail());
         }
         $address->setSaveInAddressBook($saveInAddressBook);
         $quote->setBillingAddress($address);
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -89,6 +89,8 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         if ($customerAddressId) {
             $addressData = $this->addressRepository->getById($customerAddressId);
             $address = $quote->getShippingAddress()->importCustomerAddressData($addressData);
+        } elseif ($quote->getCustomerId()) {
+            $address->setEmail($quote->getCustomerEmail());
         }
         $address->setSameAsBilling($sameAsBilling);
         $address->setSaveInAddressBook($saveInAddressBook);

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres`
`87`	`87`	`$shippingAddress = $quote->getShippingAddress()->importCustomerAddressData($addressData);`
`88`	`88`	`$shippingAddress->setSaveInAddressBook($saveInAddressBook);`
`89`	`89`	`}`
	`90`	`+ } elseif ($quote->getCustomerId()) {`
	`91`	`+ $address->setEmail($quote->getCustomerEmail());`
`90`	`92`	`}`
`91`	`93`	`$address->setSaveInAddressBook($saveInAddressBook);`
`92`	`94`	`$quote->setBillingAddress($address);`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres`
`89`	`89`	`if ($customerAddressId) {`
`90`	`90`	`$addressData = $this->addressRepository->getById($customerAddressId);`
`91`	`91`	`$address = $quote->getShippingAddress()->importCustomerAddressData($addressData);`
	`92`	`+ } elseif ($quote->getCustomerId()) {`
	`93`	`+ $address->setEmail($quote->getCustomerEmail());`
`92`	`94`	`}`
`93`	`95`	`$address->setSameAsBilling($sameAsBilling);`
`94`	`96`	`$address->setSaveInAddressBook($saveInAddressBook);`