Merge branch 'MAGETWO-34832-cherry-pick' of github.corp.ebay.com:magento-mpi/magento2ce into pull-request

Conflicts:
	app/code/Magento/Quote/composer.json

Author: Dell-

app/code/Magento/Quote/Model/Quote.php

@@ -2243,12 +2243,6 @@ public function reserveOrderId()
     {
         if (!$this->getReservedOrderId()) {
             $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
-        } else {
-            //checking if reserved order id was already used for some order
-            //if yes reserving new one if not using old one
-            if ($this->_getResource()->isOrderIncrementIdUsed($this->getReservedOrderId())) {
-                $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
-            }
         }
         return $this;
     }

app/code/Magento/Quote/Model/Quote/Address/ToOrder.php

@@ -75,7 +75,8 @@ public function convert(Address $object, $data = [])
             '\Magento\Sales\Api\Data\OrderInterface'
         );
         $order->setStoreId($object->getQuote()->getStoreId())
-            ->setQuoteId($object->getQuote()->getId());
+            ->setQuoteId($object->getQuote()->getId())
+            ->setIncrementId($object->getQuote()->getReservedOrderId());
 
         $this->objectCopyService->copyFieldsetToTarget('sales_convert_quote', 'to_order', $object->getQuote(), $order);
         $this->eventManager->dispatch(

app/code/Magento/Quote/Model/Resource/Quote.php

@@ -16,22 +16,22 @@
 class Quote extends AbstractDb
 {
     /**
-     * @var \Magento\Eav\Model\Config
+     * @var \Magento\SalesSequence\Model\Manager
      */
-    protected $_config;
+    protected $sequenceManager;
 
     /**
      * @param \Magento\Framework\Model\Resource\Db\Context $context
-     * @param \Magento\Eav\Model\Config $config
-     * @param string|null $resourcePrefix
+     * @param \Magento\SalesSequence\Model\Manager $sequenceManager
+     * @param null $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,
-        \Magento\Eav\Model\Config $config,
+        \Magento\SalesSequence\Model\Manager $sequenceManager,
         $resourcePrefix = null
     ) {
         parent::__construct($context, $resourcePrefix);
-        $this->_config = $config;
+        $this->sequenceManager = $sequenceManager;
     }
 
     /**
@@ -156,28 +156,8 @@ public function loadByIdWithoutStore($quote, $quoteId)
      */
     public function getReservedOrderId($quote)
     {
-        $storeId = (int)$quote->getStoreId();
-        return $this->_config->getEntityType(\Magento\Sales\Model\Order::ENTITY)->fetchNewIncrementId($storeId);
-    }
-
-    /**
-     * Check is order increment id use in sales/order table
-     *
-     * @param int $orderIncrementId
-     * @return bool
-     */
-    public function isOrderIncrementIdUsed($orderIncrementId)
-    {
-        $adapter = $this->_getReadAdapter();
-        $bind = [':increment_id' => $orderIncrementId];
-        $select = $adapter->select();
-        $select->from($this->getTable('sales_order'), 'entity_id')->where('increment_id = :increment_id');
-        $entity_id = $adapter->fetchOne($select, $bind);
-        if ($entity_id > 0) {
-            return true;
-        }
-
-        return false;
+        return $this->sequenceManager->getSequence(\Magento\Sales\Model\Order::ENTITY, (int)$quote->getStoreId())
+            ->getNextValue();
     }
 
     /**

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php

@@ -84,7 +84,7 @@ public function testConvert()
 
         $object = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
         $quote = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
-        $object->expects($this->exactly(4))->method('getQuote')->willReturn($quote);
+        $object->expects($this->exactly(5))->method('getQuote')->willReturn($quote);
         $quote->expects($this->once())->method('getId')->willReturn($quoteId);
         $quote->expects($this->once())->method('getStoreId')->willReturn($storeId);
         $this->objectCopyMock->expects($this->once())->method('getDataFromFieldset')->with(

app/code/Magento/Quote/Test/Unit/Model/Resource/QuoteTest.php

@@ -11,6 +11,7 @@
         "magento/module-payment": "0.74.0-beta4",
         "magento/module-sales": "0.74.0-beta4",
         "magento/module-shipping": "0.74.0-beta4",
+        "magento/module-sales-sequence": "0.74.0-beta4",
         "magento/module-backend": "0.74.0-beta4",
         "magento/module-directory": "0.74.0-beta4",
         "magento/module-eav": "0.74.0-beta4",

app/code/Magento/Quote/composer.json

@@ -48,7 +48,7 @@
         'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setReservedOrderId(
-    'test01'
+    '100000001'
 )->setBillingAddress(
     $billingAddress
 )->setShippingAddress(

dev/tests/integration/testsuite/Magento/Sales/Model/Resource/QuoteTest.php

@@ -2155,4 +2155,5 @@
     ['_isCacheEnabled', 'Magento\Eav\Model\Config'],
     ['_createCustomerAttribute', '\Magento\Customer\Model\Customer'],
     ['prepareCatalogProductPriceIndexTable', 'Magento\CatalogRule\Model\Observer'],
+    ['isOrderIncrementIdUsed', 'Magento\Quote\Model\Resource\Quote'],
 ];