Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Magento reorder order id issue #39399

Open
wants to merge 11 commits into
base: 2.4-develop
Choose a base branch
from
Open

Fixed Magento reorder order id issue #39399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f09c635
Fixed magento reorder orderid issue
magentoabu Nov 25, 2024
e4d1bb5
Merge branch '2.4-develop' into 39089-Magento-reorder-order-number
engcom-Hotel Jan 16, 2025
cd4db1b
fixed copyrights
magentoabu Jan 30, 2025
30af036
phpcs warning fixed
magentoabu Jan 30, 2025
d1eb9e2
Merge branch '2.4-develop' into 39089-Magento-reorder-order-number
engcom-Hotel Jan 31, 2025
5088ab2
year fixed
magentoabu Jan 31, 2025
f162774
Merge branch '39089-Magento-reorder-order-number' of https://github.c…
magentoabu Jan 31, 2025
483edb8
Merge branch '2.4-develop' into 39089-Magento-reorder-order-number
engcom-Hotel Feb 4, 2025
a943dac
reorderid issue unit test
Mar 11, 2025
0d6ec3f
Merge branch '2.4-develop' into 39089-Magento-reorder-order-number
engcom-Hotel Mar 18, 2025
dec9950
Merge branch '2.4-develop' into 39089-Magento-reorder-order-number
engcom-Charlie Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions app/code/Magento/Sales/Model/AdminOrder/Create.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
}
}
Expand Down
3 changes: 0 additions & 3 deletions app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ protected function setUp(): void

$this->orderMock = $this->getMockBuilder(Order::class)
->disableOriginalConstructor()
->addMethods(['setReordered', 'getReordered'])
->onlyMethods(
[
'getEntityId',
Expand Down Expand Up @@ -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')
Expand Down