#37028: [Sales] Missing relation data when reorder

- fix Edit Order.

Author: DanK894

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -2005,8 +2005,10 @@ public function createOrder()
         $this->_prepareQuoteItems();
 
         $orderData = [];
-        if ($this->getSession()->getReordered()) {
-            $oldOrder = $this->orderRepositoryInterface->get($this->getSession()->getReordered());
+        if ($this->getSession()->getReordered() || $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();
@@ -2021,11 +2023,16 @@ public function createOrder()
             $quote->setReservedOrderId($orderData['increment_id']);
         }
         $order = $this->quoteManagement->submit($quote, $orderData);
-        if ($this->getSession()->getReordered()) {
-            $oldOrder = $this->orderRepositoryInterface->get($this->getSession()->getReordered());
+        if ($this->getSession()->getReordered() || $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());
+            }
             $order->save();
         }