From f09c6357a7e6f5fad42f478d9d8381b3c7217db5 Mon Sep 17 00:00:00 2001 From: Mohamed Abbas Date: Mon, 25 Nov 2024 12:32:27 +0530 Subject: [PATCH 1/6] Fixed magento reorder orderid issue --- app/code/Magento/Sales/Model/AdminOrder/Create.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index f1b69d9a14450..feb82a7fddaf8 100644 --- 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, } } } + From cd4db1b8b7f1383c80057c9646aeb40f2979e7ac Mon Sep 17 00:00:00 2001 From: Mohamed Abbas Date: Thu, 30 Jan 2025 16:36:12 +0530 Subject: [PATCH 2/6] fixed copyrights --- app/code/Magento/Sales/Model/AdminOrder/Create.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index 54e8e58db5f26..dc5293cb5e170 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -1,6 +1,6 @@ Date: Thu, 30 Jan 2025 18:09:18 +0530 Subject: [PATCH 3/6] phpcs warning fixed --- app/code/Magento/Sales/Model/AdminOrder/Create.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index dc5293cb5e170..5b6cde1bebf08 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -2420,4 +2420,3 @@ private function getPaymentMethodSpecifications(): array return array_values($specifications); } } - From 5088ab223872e1b1a8409e57303ee1a5e56ea0cb Mon Sep 17 00:00:00 2001 From: Mohamed Abbas Date: Fri, 31 Jan 2025 16:46:03 +0530 Subject: [PATCH 4/6] year fixed --- app/code/Magento/Sales/Model/AdminOrder/Create.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index 5b6cde1bebf08..45d2d1a52380e 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -1,6 +1,6 @@ Date: Tue, 11 Mar 2025 17:55:23 +0530 Subject: [PATCH 5/6] reorderid issue unit test --- .../Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php index 3de1eac1fac5f..b832e1d52c67c 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php @@ -151,7 +151,6 @@ protected function setUp(): void $this->orderMock = $this->getMockBuilder(Order::class) ->disableOriginalConstructor() - ->addMethods(['setReordered', 'getReordered']) ->onlyMethods( [ 'getEntityId', @@ -448,8 +447,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') From c62847050c1d1a396f98a35984334e46f05776c0 Mon Sep 17 00:00:00 2001 From: engcom-Charlie Date: Mon, 24 Mar 2025 18:54:12 +0530 Subject: [PATCH 6/6] Fixed integration test failure --- .../testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php index 4aa3ba8cf929a..0a84ed112f009 100755 --- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php @@ -98,7 +98,6 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions() $order->loadByIncrementId('100000001'); /** @var $orderCreate \Magento\Sales\Model\AdminOrder\Create */ - $order->setReordered(true); $orderCreate = $this->model->initFromOrder($order); $quoteItems = $orderCreate->getQuote()->getItemsCollection();