Merge pull request #372 from magento-folks/develop

[Folks] Bug-fix (P0)
magento · Jun 23, 2015 · 0fecd76 · 0fecd76
2 parents b6654ab + c9c44ae
commit 0fecd76
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
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);

diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php
@@ -103,7 +103,7 @@ public function testSetAddress()
         $addressData = [
             'firstname' => 'John',
             'lastname' => 'Smith',
-            'email' => '[email protected]',
+            'email' => '',
             'company' => 'eBay Inc',
             'street' => ['Typical Street', 'Tiny House 18'],
             'city' => 'Big City',
@@ -134,6 +134,7 @@ public function testSetAddress()
             $this->assertContains($streetLine, $quote->getBillingAddress()->getStreet());
         }
         unset($addressData['street']);
+        unset($addressData['email']);
         $this->assertEquals('billing', $savedData['address_type']);
         //check the rest of fields
         foreach ($addressData as $key => $value) {
@@ -226,7 +227,6 @@ public function testSetMyAddress()
         $addressData = [
             'firstname' => 'John',
             'lastname' => 'Smith',
-            'email' => '[email protected]',
             'company' => 'eBay Inc',
             'street' => ['Typical Street', 'Tiny House 18'],
             'city' => 'Big City',

diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php
@@ -112,7 +112,7 @@ public function testSetAddress()
         $addressData = [
             'firstname' => 'John',
             'lastname' => 'Smith',
-            'email' => '[email protected]',
+            'email' => '',
             'company' => 'eBay Inc',
             'street' => ['Typical Street', 'Tiny House 18'],
             'city' => 'Big City',
@@ -143,6 +143,7 @@ public function testSetAddress()
             $this->assertContains($streetLine, $quote->getBillingAddress()->getStreet());
         }
         unset($addressData['street']);
+        unset($addressData['email']);
         $this->assertEquals('billing', $savedData['address_type']);
         //check the rest of fields
         foreach ($addressData as $key => $value) {

diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestShippingAddressManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestShippingAddressManagementTest.php
@@ -153,7 +153,7 @@ public function testSetAddress()
         $addressData = [
             'firstname' => 'John',
             'lastname' => 'Smith',
-            'email' => '[email protected]',
+            'email' => '',
             'company' => 'eBay Inc',
             'street' => ['Typical Street', 'Tiny House 18'],
             'city' => 'Big City',
@@ -183,6 +183,7 @@ public function testSetAddress()
         //custom checks for street, region and address_type
         $this->assertEquals($addressData['street'], $quote->getShippingAddress()->getStreet());
         unset($addressData['street']);
+        unset($addressData['email']);
 
         $this->assertEquals('shipping', $savedData['address_type']);
         //check the rest of fields

diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/ShippingAddressManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/ShippingAddressManagementTest.php
@@ -128,7 +128,7 @@ public function testSetAddress()
         $addressData = [
             'firstname' => 'John',
             'lastname' => 'Smith',
-            'email' => '[email protected]',
+            'email' => '',
             'company' => 'eBay Inc',
             'street' => ['Typical Street', 'Tiny House 18'],
             'city' => 'Big City',
@@ -158,6 +158,7 @@ public function testSetAddress()
         //custom checks for street, region and address_type
         $this->assertEquals($addressData['street'], $quote->getShippingAddress()->getStreet());
         unset($addressData['street']);
+        unset($addressData['email']);
 
         $this->assertEquals('shipping', $savedData['address_type']);
         //check the rest of fields
@@ -306,7 +307,6 @@ public function testSetMyAddress()
         $addressData = [
             'firstname' => 'John',
             'lastname' => 'Smith',
-            'email' => '[email protected]',
             'company' => 'eBay Inc',
             'street' => ['Typical Street', 'Tiny House 18'],
             'city' => 'Big City',