Fixed magento reorder orderid issue

magentoabu · magentoabu · commit f09c6357a7e6 · 2024-11-25T12:32:27.000+05:30
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -2056,10 +2056,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();
@@ -2086,16 +2084,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();
         }
     }
@@ -2352,3 +2346,4 @@ private function removeCartTransferredItemsAndUpdateQty(int|null|Item $cartItem,
         }
     }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -2056,10 +2056,8 @@ public function createOrder()`
`2056`	`2056`	`private function beforeSubmit(Quote $quote)`
`2057`	`2057`	`{`
`2058`	`2058`	`$orderData = [];`
`2059`		`- if ($this->getSession()->getReordered() \|\| $this->getSession()->getOrder()->getId()) {`
	`2059`	`+ if ($this->getSession()->getOrder()->getId()) {`
`2060`	`2060`	`$oldOrder = $this->getSession()->getOrder();`
`2061`		`- $oldOrder = $oldOrder->getId() ?`
`2062`		`- $oldOrder : $this->orderRepositoryInterface->get($this->getSession()->getReordered());`
`2063`	`2061`	`$originalId = $oldOrder->getOriginalIncrementId();`
`2064`	`2062`	`if (!$originalId) {`
`2065`	`2063`	`$originalId = $oldOrder->getIncrementId();`
`@@ -2086,16 +2084,12 @@ private function beforeSubmit(Quote $quote)`
`2086`	`2084`	`*/`
`2087`	`2085`	`private function afterSubmit(Order $order)`
`2088`	`2086`	`{`
`2089`		`- if ($this->getSession()->getReordered() \|\| $this->getSession()->getOrder()->getId()) {`
	`2087`	`+ if ($this->getSession()->getOrder()->getId()) {`
`2090`	`2088`	`$oldOrder = $this->getSession()->getOrder();`
`2091`		`- $oldOrder = $oldOrder->getId() ?`
`2092`		`- $oldOrder : $this->orderRepositoryInterface->get($this->getSession()->getReordered());`
`2093`	`2089`	`$oldOrder->setRelationChildId($order->getId());`
`2094`	`2090`	`$oldOrder->setRelationChildRealId($order->getIncrementId());`
`2095`	`2091`	`$oldOrder->save();`
`2096`		`- if ($this->getSession()->getOrder()->getId()) {`
`2097`		`- $this->orderManagement->cancel($oldOrder->getEntityId());`
`2098`		`- }`
	`2092`	`+ $this->orderManagement->cancel($oldOrder->getEntityId());`
`2099`	`2093`	`$order->save();`
`2100`	`2094`	`}`
`2101`	`2095`	`}`
`@@ -2352,3 +2346,4 @@ private function removeCartTransferredItemsAndUpdateQty(int\|null\|Item $cartItem,`
`2352`	`2346`	`}`
`2353`	`2347`	`}`
`2354`	`2348`	`}`
	`2349`	`+`