MAGETWO-44827: Add shipping email

Vladyslav Shcherbyna · Vladyslav Shcherbyna · commit 113eab16de01 · 2015-11-02T16:41:52.000+02:00
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -46,6 +46,8 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
 
     const XML_PATH_STORE_COUNTRY_ID = 'shipping/origin/country_id';
 
+    const XML_PATH_STORE_EMAIL = 'shipping/origin/email';
+
     /**
      * Order entity type
      *
diff --git a/app/code/Magento/Shipping/etc/adminhtml/system.xml b/app/code/Magento/Shipping/etc/adminhtml/system.xml
@@ -33,6 +33,11 @@
                 <field id="street_line2" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Street Address Line 2</label>
                 </field>
+                <field id="email" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Email</label>
+                    <validate>validate-email</validate>
+                    <backend_model>Magento\Config\Model\Config\Backend\Email\Address</backend_model>
+                </field>
             </group>
             <group id="shipping_policy" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Shipping Policy Parameters</label>
diff --git a/app/code/Magento/Shipping/etc/config.xml b/app/code/Magento/Shipping/etc/config.xml
@@ -12,6 +12,7 @@
                 <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
`@@ -46,6 +46,8 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa`
`46`	`46`
`47`	`47`	`const XML_PATH_STORE_COUNTRY_ID = 'shipping/origin/country_id';`
`48`	`48`
	`49`	`+ const XML_PATH_STORE_EMAIL = 'shipping/origin/email';`
	`50`	`+`
`49`	`51`	`/**`
`50`	`52`	`* Order entity type`
`51`	`53`	`*`