Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3178' into Tier4-Kings-PR-08-23-2024

Author: devarul

app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php

@@ -6,7 +6,7 @@
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Sales\Model\Order;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order\Email\Sender\OrderCommentSender;
 
 /**
@@ -45,7 +45,7 @@ public function execute()
                     throw new \Magento\Framework\Exception\LocalizedException(__($error));
                 }
 
-                $orderStatus = $this->getOrderStatus($order->getDataByKey('status'), $data['status']);
+                $orderStatus = $this->getOrderStatus($order, $data['status']);
                 $order->setStatus($orderStatus);
                 $notify = $data['is_customer_notified'] ?? false;
                 $visible = $data['is_visible_on_front'] ?? false;
@@ -85,13 +85,21 @@ public function execute()
     /**
      * Get order status to set
      *
-     * @param string $orderStatus
+     * @param OrderInterface $order
      * @param string $historyStatus
      * @return string
      */
-    private function getOrderStatus(string $orderStatus, string $historyStatus): string
+    private function getOrderStatus(OrderInterface $order, string $historyStatus): string
     {
-        return ($orderStatus === Order::STATE_PROCESSING || $orderStatus === Order::STATUS_FRAUD) ? $historyStatus
-            : $orderStatus;
+        $config = $order->getConfig();
+        if ($config === null) {
+            return $historyStatus;
+        }
+        $statuses = $config->getStateStatuses($order->getState());
+
+        if (!isset($statuses[$historyStatus])) {
+            return $order->getDataByKey('status');
+        }
+        return $historyStatus;
     }
 }

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php

@@ -127,18 +127,20 @@ protected function setUp(): void
      * @param string $orderStatus
      * @param bool $userHasResource
      * @param bool $expectedNotify
+     * @param string $expectedOrderStatus
      *
      * @dataProvider executeWillNotifyCustomerDataProvider
      */
     public function testExecuteWillNotifyCustomer(
         array $historyData,
         string $orderStatus,
         bool $userHasResource,
-        bool $expectedNotify
+        bool $expectedNotify,
+        string $expectedOrderStatus
     ) {
         $orderId = 30;
         $this->requestMock->expects($this->once())->method('getParam')->with('order_id')->willReturn($orderId);
-        $this->orderMock->expects($this->atLeastOnce())->method('getDataByKey')
+        $this->orderMock->expects($this->any())->method('getDataByKey')
             ->with('status')->willReturn($orderStatus);
         $this->orderRepositoryMock->expects($this->once())
             ->method('get')
@@ -152,6 +154,12 @@ public function testExecuteWillNotifyCustomer(
         $this->objectManagerMock->expects($this->once())->method('create')->willReturn(
             $this->createMock(OrderCommentSender::class)
         );
+
+        // Verify the getOrderStatus method call
+        $this->orderMock->expects($this->once())->method('setStatus')->with($expectedOrderStatus);
+        $this->orderMock->expects($this->once())->method('save');
+        $this->statusHistoryCommentMock->expects($this->once())->method('save');
+
         $this->addCommentController->execute();
     }
 
@@ -167,57 +175,63 @@ public function executeWillNotifyCustomerDataProvider()
                     'is_customer_notified' => true,
                     'status' => 'processing'
                 ],
-                'orderStatus' =>'processing',
+                'orderStatus' => 'processing',
                 'userHasResource' => true,
-                'expectedNotify' => true
+                'expectedNotify' => true,
+                'expectedOrderStatus' => 'processing'
             ],
             'User Has Access - Notify False' => [
                 'postData' => [
                     'comment' => 'Great Product!',
                     'is_customer_notified' => false,
                     'status' => 'processing'
                 ],
-                'orderStatus' =>'processing',
+                'orderStatus' => 'processing',
                 'userHasResource' => true,
-                'expectedNotify' => false
+                'expectedNotify' => false,
+                'expectedOrderStatus' => 'processing'
             ],
             'User Has Access - Notify Unset' => [
                 'postData' => [
                     'comment' => 'Great Product!',
                     'status' => 'processing'
                 ],
-                'orderStatus' =>'fraud',
+                'orderStatus' => 'fraud',
                 'userHasResource' => true,
-                'expectedNotify' => false
+                'expectedNotify' => false,
+                'expectedOrderStatus' => 'processing'
             ],
             'User No Access - Notify True' => [
                 'postData' => [
                     'comment' => 'Great Product!',
                     'is_customer_notified' => true,
                     'status' => 'fraud'
                 ],
-                'orderStatus' =>'processing',
+                'orderStatus' => 'processing',
                 'userHasResource' => false,
-                'expectedNotify' => false
+                'expectedNotify' => false,
+                'expectedOrderStatus' => 'fraud'
             ],
             'User No Access - Notify False' => [
                 'postData' => [
                     'comment' => 'Great Product!',
                     'is_customer_notified' => false,
                     'status' => 'processing'
                 ],
-                'orderStatus' =>'complete',
+                'orderStatus' => 'complete',
                 'userHasResource' => false,
-                'expectedNotify' => false
+                'expectedNotify' => false,
+                'expectedOrderStatus' => 'processing'
             ],
             'User No Access - Notify Unset' => [
                 'postData' => [
                     'comment' => 'Great Product!',
                     'status' => 'processing'
                 ],
-                'orderStatus' =>'complete',
+                'orderStatus' => 'complete',
                 'userHasResource' => false,
-                'expectedNotify' => false
+                'expectedNotify' => false,
+                'expectedOrderStatus' => 'processing'
             ],
         ];
     }