MAGETWO-44827: Add shipping email

Vladyslav Shcherbyna · Vladyslav Shcherbyna · commit bb1d1f56561e · 2015-11-02T18:23:36.000+02:00
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1562,7 +1562,7 @@ public function setCustomerId($customerId)
     public function getEmail()
     {
         $email = $this->getData(self::KEY_EMAIL);
-        if (!$email) {
+        if (!$email && $this->getQuote()) {
             $email = $this->getQuote()->getCustomerEmail();
             $this->setEmail($email);
         }
diff --git a/app/code/Magento/Shipping/etc/config.xml b/app/code/Magento/Shipping/etc/config.xml
@@ -12,7 +12,6 @@
                 <country_id>US</country_id>
                 <postcode>90034</postcode>
                 <region_id>12</region_id>
-                <email>forshipping@example.com</email>
             </origin>
         </shipping>
     </default>

Original file line number	Diff line number	Diff line change
`@@ -1562,7 +1562,7 @@ public function setCustomerId($customerId)`
`1562`	`1562`	`public function getEmail()`
`1563`	`1563`	`{`
`1564`	`1564`	`$email = $this->getData(self::KEY_EMAIL);`
`1565`		`- if (!$email) {`
	`1565`	`+ if (!$email && $this->getQuote()) {`
`1566`	`1566`	`$email = $this->getQuote()->getCustomerEmail();`
`1567`	`1567`	`$this->setEmail($email);`
`1568`	`1568`	`}`