diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 47f74734b60f..3623e72341a2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -147,7 +147,7 @@ protected function _addAdditionalFormElementData(AbstractElement $element)
{
switch ($element->getId()) {
case 'email':
- $element->setRequired(0);
+ $element->setRequired(1);
$element->setClass('validate-email admin__control-text');
break;
}
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index f34f8a681085..07716ff8274c 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -2012,26 +2012,13 @@ protected function _validate()
}
/**
- * Retrieve or generate new customer email.
+ * Retrieve new customer email.
*
* @return string
*/
protected function _getNewCustomerEmail()
{
- $email = $this->getData('account/email');
- if (empty($email)) {
- $host = $this->_scopeConfig->getValue(
- self::XML_PATH_DEFAULT_EMAIL_DOMAIN,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- );
- $account = time();
- $email = $account . '@' . $host;
- $account = $this->getData('account');
- $account['email'] = $email;
- $this->setData('account', $account);
- }
-
- return $email;
+ return $this->getData('account/email');
}
/**
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index 1b4d9372cb50..8bdfc678e456 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -35,8 +35,9 @@
-
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index e938bee27eb4..49f0e9e362ce 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -18,7 +18,6 @@
-
@@ -46,7 +45,7 @@
-
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
index a4d9f99799e8..f041ac97e5ca 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
@@ -25,6 +25,8 @@
+
+
@@ -35,6 +37,7 @@
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
index df3efc481a48..0b03f089227b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
@@ -12,5 +12,6 @@
+
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
index f1000476d50f..d3348cf2a8e9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
@@ -28,6 +28,7 @@
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
new file mode 100644
index 000000000000..0f1c1d70652b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index c54c80bb6f6c..b1a8d8e68522 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -519,20 +519,14 @@ public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction(
* Email before and after failed first place order action.
*
* @case #1 Is the same.
- * @case #2 Is empty.
- * @case #3 Filled after failed first place order action.
- * @case #4 Empty after failed first place order action.
- * @case #5 Changed after failed first place order action.
+ * @case #2 Changed after failed first place order action.
* @return array
*/
public function createOrderNewCustomerWithFailedFirstPlaceOrderActionDataProvider()
{
return [
1 => ['customer@email.com', 'customer@email.com'],
- 2 => ['', ''],
- 3 => ['', 'customer@email.com'],
- 4 => ['customer@email.com', ''],
- 5 => ['customer@email.com', 'changed_customer@email.com'],
+ 2 => ['customer@email.com', 'changed_customer@email.com'],
];
}