diff --git a/vendor/magento/module-sales/Model/AdminOrder/Create.php b/vendor/magento/module-sales/Model/AdminOrder/Create.php index 4b1868e6852d9..a791e2f94a412 100644 --- a/vendor/magento/module-sales/Model/AdminOrder/Create.php +++ b/vendor/magento/module-sales/Model/AdminOrder/Create.php @@ -2044,10 +2044,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(); @@ -2074,16 +2072,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(); } }