Merge branch 'MAGETWO-71050' into MPI-PR

Author: YevSent

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

@@ -1679,8 +1679,7 @@ public function importPostData($data)
      */
     protected function _customerIsInStore($store)
     {
-        $customerId = (int)$this->getSession()->getCustomerId();
-        $customer = $this->customerRepository->getById($customerId);
+        $customer = $this->getQuote()->getCustomer();
 
         return $customer->getWebsiteId() == $store->getWebsiteId()
             || $this->accountManagement->isCustomerInStore($customer->getWebsiteId(), $store->getId());
@@ -1739,6 +1738,7 @@ public function _prepareCustomer()
         /** @var $store \Magento\Store\Model\Store */
         $store = $this->getSession()->getStore();
         $customer = $this->getQuote()->getCustomer();
+
         if ($customer->getId() && !$this->_customerIsInStore($store)) {
             /** Create a new customer record if it is not available in the specified store */
             /** Unset customer ID to ensure that new customer will be created */

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model\AdminOrder;
 
+use Magento\Sales\Api\OrderManagementInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Sales\Model\Order;
 use Magento\Framework\Registry;
@@ -423,6 +424,55 @@ public function testCreateOrderNewCustomer()
         $this->_verifyCreatedOrder($order, $shippingMethod);
     }
 
+    /**
+     * Tests order creation with new customer after failed first place order action.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction()
+    {
+        $productIdFromFixture = 1;
+        $shippingMethod = 'freeshipping_freeshipping';
+        $paymentMethod = 'checkmo';
+        $shippingAddressAsBilling = 1;
+        $customerEmail = '[email protected]';
+        $orderData = [
+            'currency' => 'USD',
+            'account' => ['group_id' => '1', 'email' => $customerEmail],
+            'billing_address' => array_merge($this->_getValidAddressData(), ['save_in_address_book' => '1']),
+            'shipping_method' => $shippingMethod,
+            'comment' => ['customer_note' => ''],
+            'send_confirmation' => false,
+        ];
+        $paymentData = ['method' => $paymentMethod];
+
+        $this->_preparePreconditionsForCreateOrder(
+            $productIdFromFixture,
+            $customerEmail,
+            $shippingMethod,
+            $shippingAddressAsBilling,
+            $paymentData,
+            $orderData,
+            $paymentMethod
+        );
+
+        // Emulates failing place order action
+        $orderManagement = $this->getMockForAbstractClass(OrderManagementInterface::class);
+        $orderManagement->method('place')
+            ->willThrowException(new \Exception('Can\'t place order'));
+        Bootstrap::getObjectManager()->addSharedInstance($orderManagement, OrderManagementInterface::class);
+        try {
+            $this->_model->createOrder();
+        } catch (\Exception $e) {
+            Bootstrap::getObjectManager()->removeSharedInstance(OrderManagementInterface::class);
+        }
+
+        $order = $this->_model->createOrder();
+        $this->_verifyCreatedOrder($order, $shippingMethod);
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Customer/_files/customer.php