Skip to content

Commit 0dcd8cb

Browse files
authored
ENGCOM-6568: magento/magento2#: Remove unused “Default Email Domain” option and related to it code #26000
2 parents 0c5d35f + cff7bef commit 0dcd8cb

File tree

5 files changed

+0
-13
lines changed

5 files changed

+0
-13
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
@@ -16,7 +16,6 @@
1616
<confirm>0</confirm>
1717
<default_group>1</default_group>
1818
<tax_calculation_address_type>billing</tax_calculation_address_type>
19-
<email_domain>example.com</email_domain>
2019
<email_identity>general</email_identity>
2120
<email_template>customer_create_account_email_template</email_template>
2221
<email_no_password_template>customer_create_account_email_no_password_template</email_no_password_template>

app/code/Magento/Customer/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ Strong,Strong
432432
"Default Value for Disable Automatic Group Changes Based on VAT ID","Default Value for Disable Automatic Group Changes Based on VAT ID"
433433
"Show VAT Number on Storefront","Show VAT Number on Storefront"
434434
"To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes.","To show VAT number on Storefront, set Show VAT Number on Storefront option to Yes."
435-
"Default Email Domain","Default Email Domain"
436435
"Default Welcome Email","Default Welcome Email"
437436
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
438437
"Default Welcome Email Without Password","Default Welcome Email Without Password"

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
*/
2929
class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\Model\Cart\CartInterface
3030
{
31-
/**
32-
* Xml default email domain path
33-
*/
34-
const XML_PATH_DEFAULT_EMAIL_DOMAIN = 'customer/create_account/email_domain';
35-
3631
/**
3732
* Quote session object
3833
*

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,9 +1000,6 @@
10001000
<item name="sales_email/shipment/copy_to" xsi:type="string">1</item>
10011001
<item name="sales_email/shipment_comment/copy_to" xsi:type="string">1</item>
10021002
</argument>
1003-
<argument name="environment" xsi:type="array">
1004-
<item name="customer/create_account/email_domain" xsi:type="string">1</item>
1005-
</argument>
10061003
</arguments>
10071004
</type>
10081005
<preference

0 commit comments

Comments
 (0)