Merge remote-tracking branch 'origin/MC-38917' into 2.4-develop-pr46

Author: serhii-balko

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php

@@ -20,6 +20,12 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create implements
     public function execute()
     {
         $this->_initSession();
+
+        // Clear existing order in session when creating a new order for a customer
+        if ($this->getRequest()->getParam('customer_id')) {
+            $this->_getSession()->setOrderId(null);
+        }
+
         $this->_getOrderCreateModel()->initRuleData();
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/IndexTest.php

@@ -52,9 +52,17 @@ protected function setUp(): void
     public function testExecute(): void
     {
         $customerId = 1;
+        $editingOrderId = 10;
+
         $this->getRequest()->setMethod(Http::METHOD_GET);
         $this->getRequest()->setParam('customer_id', $customerId);
+        $this->quoteSession->setOrderId($editingOrderId);
+        $this->assertEquals($editingOrderId, $this->quoteSession->getOrderId());
         $this->dispatch('backend/sales/order_create/index');
+
+        // Check that existing order in session was cleared
+        $this->assertEquals(null, $this->quoteSession->getOrderId());
+
         $store = $this->storeManager->getStore();
         $this->assertEquals($customerId, $this->quoteSession->getCustomerId());
         $ruleData = $this->registry->registry('rule_data');