Merge remote-tracking branch 'origin/imported-magento-magento2-31422' into 2.4-develop-pr118

Author: zakdma

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

@@ -1755,10 +1755,9 @@ public function importPostData($data)
 
         if (isset($data['comment'])) {
             $this->getQuote()->addData($data['comment']);
-            if (empty($data['comment']['customer_note_notify'])) {
-                $this->getQuote()->setCustomerNoteNotify(false);
-            } else {
-                $this->getQuote()->setCustomerNoteNotify(true);
+            if ($this->getIsValidate()) {
+                $notify = !empty($data['comment']['customer_note_notify']);
+                $this->getQuote()->setCustomerNoteNotify($notify);
             }
         }
 

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

@@ -231,6 +231,40 @@ public function testAddProductToOrderFromWishList(): void
         $this->assertCount(1, $quoteItems);
     }
 
+    /**
+     * Check that customer notification is NOT disabled after comment is updated.
+     *
+     * @return void
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_customer_without_address.php
+     */
+    public function testUpdateCustomerNote(): void
+    {
+        $customerNote = 'Example Comment';
+        $quoteId = $this->getQuoteByReservedOrderId->execute('test_order_with_customer_without_address')->getId();
+        $this->session->setQuoteId($quoteId);
+        $params = [
+            'json' => false,
+            'block' => 'totals',
+            'as_js_varname' => false,
+        ];
+        $post = $this->hydratePost([
+            'order' => [
+                'comment' => [
+                    CartInterface::KEY_CUSTOMER_NOTE => $customerNote
+                ],
+            ],
+        ]);
+        $this->dispatchWitParams($params, $post);
+
+        $quote = $this->session->getQuote();
+        $this->assertEquals($customerNote, $quote->getCustomerNote());
+        $this->assertTrue((bool)$quote->getCustomerNoteNotify());
+
+        preg_match('/id="notify_customer"(?<attributes>.*?)\/>/s', $this->getResponse()->getBody(), $matches);
+        $this->assertArrayHasKey('attributes', $matches);
+        $this->assertStringContainsString('checked="checked"', $matches['attributes']);
+    }
+
     /**
      * Check customer quotes
      *