diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index fc9e499941f1f..1c11f7a9f6ca3 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -2091,10 +2091,8 @@ public function createOrder() private function beforeSubmit(Quote $quote) { $orderData = []; - if ($this->getSession()->getReordered() || $this->getSession()->getOrder()->getId()) { + if ($this->getSession()->getOrder()->getId()) { $oldOrder = $this->getSession()->getOrder(); - $oldOrder = $oldOrder->getId() ? - $oldOrder : $this->orderRepositoryInterface->get($this->getSession()->getReordered()); $originalId = $oldOrder->getOriginalIncrementId(); if (!$originalId) { $originalId = $oldOrder->getIncrementId(); @@ -2121,16 +2119,12 @@ private function beforeSubmit(Quote $quote) */ private function afterSubmit(Order $order) { - if ($this->getSession()->getReordered() || $this->getSession()->getOrder()->getId()) { + if ($this->getSession()->getOrder()->getId()) { $oldOrder = $this->getSession()->getOrder(); - $oldOrder = $oldOrder->getId() ? - $oldOrder : $this->orderRepositoryInterface->get($this->getSession()->getReordered()); $oldOrder->setRelationChildId($order->getId()); $oldOrder->setRelationChildRealId($order->getIncrementId()); $oldOrder->save(); - if ($this->getSession()->getOrder()->getId()) { - $this->orderManagement->cancel($oldOrder->getEntityId()); - } + $this->orderManagement->cancel($oldOrder->getEntityId()); $order->save(); } } diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php index f9be410768266..9e7ecb1a07bed 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php @@ -164,7 +164,6 @@ protected function setUp(): void $this->orderMock = $this->getMockBuilder(Order::class) ->disableOriginalConstructor() - ->addMethods(['setReordered', 'getReordered']) ->onlyMethods( [ 'getEntityId', @@ -505,8 +504,6 @@ public function testInitFromOrder() $this->orderMock->method('getItemsCollection') ->willReturn($itemCollectionMock); - $this->orderMock->method('getReordered') - ->willReturn(false); $this->orderMock->method('getShippingAddress') ->willReturn($address); $this->orderMock->method('getBillingAddress') diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php index 4aa3ba8cf929a..0a84ed112f009 100755 --- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php @@ -98,7 +98,6 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions() $order->loadByIncrementId('100000001'); /** @var $orderCreate \Magento\Sales\Model\AdminOrder\Create */ - $order->setReordered(true); $orderCreate = $this->model->initFromOrder($order); $quoteItems = $orderCreate->getQuote()->getItemsCollection();