Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 5cc5f11

Browse files
committed
MAGETWO-83271: 10195: Order relation child is not set during edit operation(backport from 2.3 to 2.2) #11988
- Merge Pull Request magento/magento2#11988 from RomaKis/magento2:10195-2.2 - Merged commits: 1. 7c753ac
2 parents 13a933a + 7c753ac commit 5cc5f11

File tree

2 files changed

+5
-0
lines changed
  • app/code/Magento/Sales/Model/AdminOrder
  • dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder

2 files changed

+5
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,6 +1914,7 @@ public function createOrder()
19141914
$oldOrder = $this->getSession()->getOrder();
19151915
$oldOrder->setRelationChildId($order->getId());
19161916
$oldOrder->setRelationChildRealId($order->getIncrementId());
1917+
$oldOrder->save();
19171918
$this->orderManagement->cancel($oldOrder->getEntityId());
19181919
$order->save();
19191920
}

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
104104

105105
$this->assertEquals(1, $newOrderItems->count());
106106

107+
$order->loadByIncrementId('100000001');
108+
$this->assertEquals($newOrder->getRealOrderId(), $order->getRelationChildRealId());
109+
$this->assertEquals($newOrder->getId(), $order->getRelationChildId());
110+
107111
$newOrderItem = $newOrderItems->getFirstItem();
108112

109113
$this->assertEquals(

0 commit comments

Comments
 (0)