Merge remote-tracking branch 'origin/MAGETWO-71870' into MPI-PR-Regression2

Author: iivashchenko

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

@@ -1586,6 +1586,9 @@ public function applyCoupon($code)
     public function setAccountData($accountData)
     {
         $customer = $this->getQuote()->getCustomer();
+        if (empty($accountData['email'])) {
+            $accountData['email'] = $customer->getEmail();
+        }
         $form = $this->_createCustomerForm($customer);
 
         // emulate request

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

@@ -430,14 +430,19 @@ public function testCreateOrderNewCustomer()
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @dataProvider createOrderNewCustomerWithFailedFirstPlaceOrderActionDataProvider
+     * @param string $customerEmailFirstAttempt
+     * @param string $customerEmailSecondAttempt
      */
-    public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction()
-    {
+    public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction(
+        $customerEmailFirstAttempt,
+        $customerEmailSecondAttempt
+    ) {
         $productIdFromFixture = 1;
         $shippingMethod = 'freeshipping_freeshipping';
         $paymentMethod = 'checkmo';
         $shippingAddressAsBilling = 1;
-        $customerEmail = '[email protected]';
+        $customerEmail = $customerEmailFirstAttempt;
         $orderData = [
             'currency' => 'USD',
             'account' => ['group_id' => '1', 'email' => $customerEmail],
@@ -469,10 +474,44 @@ public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction()
             Bootstrap::getObjectManager()->removeSharedInstance(OrderManagementInterface::class);
         }
 
+        $customerEmail = $customerEmailSecondAttempt ? :$this->_model->getQuote()->getCustomer()->getEmail();
+        $orderData['account']['email'] = $customerEmailSecondAttempt;
+
+        $this->_preparePreconditionsForCreateOrder(
+            $productIdFromFixture,
+            $customerEmail,
+            $shippingMethod,
+            $shippingAddressAsBilling,
+            $paymentData,
+            $orderData,
+            $paymentMethod
+        );
+
         $order = $this->_model->createOrder();
         $this->_verifyCreatedOrder($order, $shippingMethod);
     }
 
+    /**
+     * 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.
+     * @return array
+     */
+    public function createOrderNewCustomerWithFailedFirstPlaceOrderActionDataProvider()
+    {
+        return [
+            1 => ['[email protected]', '[email protected]'],
+            2 => ['', ''],
+            3 => ['', '[email protected]'],
+            4 => ['[email protected]', ''],
+            5 => ['[email protected]', '[email protected]'],
+        ];
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Customer/_files/customer.php