Skip to content

Commit b45d7ac

Browse files
committed
magento/magento2#: Remove unused “Default Email Domain” option and related to it code
1 parent 1ad65a3 commit b45d7ac

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

app/code/Magento/Customer/etc/adminhtml/system.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@
8686
<comment>To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes.</comment>
8787
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
8888
</field>
89-
<field id="email_domain" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
90-
<label>Default Email Domain</label>
91-
</field>
9289
<field id="email_template" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
9390
<label>Default Welcome Email</label>
9491
<comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>

app/code/Magento/Customer/etc/config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<confirm>0</confirm>
1616
<default_group>1</default_group>
1717
<tax_calculation_address_type>billing</tax_calculation_address_type>
18-
<email_domain>example.com</email_domain>
1918
<email_identity>general</email_identity>
2019
<email_template>customer_create_account_email_template</email_template>
2120
<email_no_password_template>customer_create_account_email_no_password_template</email_no_password_template>

app/code/Magento/Sales/Model/AdminOrder/Create.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\Model\Cart\CartInterface
3030
{
3131
/**
32-
* Xml default email domain path
32+
* Path to "CUSTOMERS > Customer Configuration > Create New Account Options > Default Email Domain" setting
33+
*
34+
* @deprecated since version 2.2.6
35+
* @see \Magento\Sales\Model\AdminOrder\Create. Constant usage has been removed from _getNewCustomerEmail() method.
3336
*/
3437
const XML_PATH_DEFAULT_EMAIL_DOMAIN = 'customer/create_account/email_domain';
3538

app/code/Magento/Sales/etc/di.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,9 +1008,6 @@
10081008
<item name="sales_email/shipment/copy_to" xsi:type="string">1</item>
10091009
<item name="sales_email/shipment_comment/copy_to" xsi:type="string">1</item>
10101010
</argument>
1011-
<argument name="environment" xsi:type="array">
1012-
<item name="customer/create_account/email_domain" xsi:type="string">1</item>
1013-
</argument>
10141011
</arguments>
10151012
</type>
10161013
<preference

0 commit comments

Comments
 (0)