MAGETWO-44827: Add shipping email

Vladyslav Shcherbyna · Vladyslav Shcherbyna · commit 8eeb901fb33f · 2015-11-02T20:08:13.000+02:00
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -46,8 +46,6 @@ 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,11 +33,6 @@
                 <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>

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ 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`		`-`
`51`	`49`	`/**`
`52`	`50`	`* Order entity type`
`53`	`51`	`*`