Merge branch 'MAGETWO-71821' into MPI-PR-2.1.10

Author: YevSent

app/code/Magento/Paypal/Model/Express/Checkout.php

@@ -12,8 +12,6 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Framework\DataObject;
 use Magento\Paypal\Model\Cart as PaypalCart;
-use Magento\Framework\App\ObjectManager;
-use Magento\Sales\Api\OrderRepositoryInterface;
 
 /**
  * Wrapper that performs Paypal Express and Checkout communication
@@ -270,13 +268,6 @@ class Checkout
      */
     protected $totalsCollector;
 
-    /**
-     * Order repository interface.
-     *
-     * @var OrderRepositoryInterface
-     */
-    private $orderRepository;
-
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Customer\Model\Url $customerUrl
@@ -805,8 +796,7 @@ public function place($token, $shippingMethodCode = null)
 
         $this->ignoreAddressValidation();
         $this->_quote->collectTotals();
-        $orderId = $this->quoteManagement->placeOrder($this->_quote->getId());
-        $order = $this->getOrderRepository()->get($orderId);
+        $order = $this->quoteManagement->submit($this->_quote);
 
         if (!$order) {
             return;
@@ -1174,21 +1164,4 @@ protected function prepareGuestQuote()
             ->setCustomerGroupId(\Magento\Customer\Model\Group::NOT_LOGGED_IN_ID);
         return $this;
     }
-
-    /**
-     * Returns order repository instance.
-     *
-     * @return OrderRepositoryInterface
-     *
-     * @deprecated
-     */
-    private function getOrderRepository()
-    {
-        if ($this->orderRepository === null) {
-            $this->orderRepository = ObjectManager::getInstance()
-                ->get(OrderRepositoryInterface::class);
-        }
-
-        return $this->orderRepository;
-    }
 }