Merge remote-tracking branch 'origin/MAGETWO-37070' into MAGETWO-32004

dkvashninbay · dkvashninbay · commit 1d54cc8d44df · 2015-05-16T19:25:20.000+03:00
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -349,6 +349,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
             $this->customerManagement->populateCustomerInfo($quote);
         }
         $addresses = [];
+        $quote->reserveOrderId();
         if ($quote->isVirtual()) {
             $this->dataObjectHelper->mergeDataObjects(
                 '\Magento\Sales\Api\Data\OrderInterface',
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -651,7 +651,8 @@ protected function getQuote(
                 'getId',
                 'getCustomer',
                 'getAllItems',
-                'getPayment'
+                'getPayment',
+                'reserveOrderId'
             ],
             [],
             '',

Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])`
`349`	`349`	`$this->customerManagement->populateCustomerInfo($quote);`
`350`	`350`	`}`
`351`	`351`	`$addresses = [];`
	`352`	`+ $quote->reserveOrderId();`
`352`	`353`	`if ($quote->isVirtual()) {`
`353`	`354`	`$this->dataObjectHelper->mergeDataObjects(`
`354`	`355`	`'\Magento\Sales\Api\Data\OrderInterface',`