AC-3178::Order remains in status 'processing' after shipping, if items is get partially refunded

Author: glo82145

app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php

@@ -43,7 +43,7 @@ public function check(Order $order)
             ) {
                 $order->setState(Order::STATE_COMPLETE)
                     ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
-            }  elseif ($order->getIsVirtual() && $order->getStatus() === Order::STATE_CLOSED) {
+            } elseif ($order->getIsVirtual() && $order->getStatus() === Order::STATE_CLOSED) {
                 $order->setState(Order::STATE_CLOSED);
             }
         }

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php

@@ -45,8 +45,7 @@ protected function setUp(): void
                     'getIsVirtual',
                     'getIsNotVirtual',
                     'getStatus',
-                    'getAllItems',
-                    'isPartiallyRefundedOrderShipped'
+                    'getAllItems'
                 ]
             )
             ->disableOriginalConstructor()
@@ -69,6 +68,7 @@ protected function setUp(): void
      * @param bool $isCanceled
      * @param bool $canUnhold
      * @param bool $isNotVirtual
+     * @param bool $isPartiallyRefundedOrderShipped
      * @dataProvider stateCheckDataProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -107,18 +107,14 @@ public function testCheck(
             ->willReturn($isInProcess);
         $this->orderMock->method('getIsNotVirtual')
             ->willReturn($isNotVirtual);
+        $this->orderMock->method('getAllItems')
+            ->willReturn([]);
         if (!$isNotVirtual) {
             $this->orderMock->method('getIsVirtual')
                 ->willReturn(!$isNotVirtual);
             $this->orderMock->method('getStatus')
                 ->willReturn($expectedState);
         }
-
-        $this->orderMock->method('getAllItems')
-            ->willReturn([]);
-        $this->orderMock->method('isPartiallyRefundedOrderShipped')
-            ->willReturn($isPartiallyRefundedOrderShipped);
-
         $this->state->check($this->orderMock);
         $this->assertEquals($expectedState, $this->orderMock->getState());
     }
@@ -200,7 +196,7 @@ public function stateCheckDataProvider()
                 'is_canceled' => false,
                 'can_unhold' => false,
                 'is_not_virtual' => true,
-                'isPartiallyRefundedOrderShipped' => true
+                'isPartiallyRefundedOrderShipped' => false
             ],
             'complete - canCreditmemo,!canShip -> complete' => [
                 'can_credit_memo' => true,
@@ -272,34 +268,6 @@ public function stateCheckDataProvider()
                 'is_not_virtual' => true,
                 'isPartiallyRefundedOrderShipped' => false
             ],
-            'processing - canCreditmemo, !canShip, isPartiallyRefundedOrderShipped -> complete' => [
-                'can_credit_memo' => true,
-                'can_credit_memo_invoke_count' => 1,
-                'can_ship' => false,
-                'call_can_skip_num' => 1,
-                'current_state' => Order::STATE_PROCESSING,
-                'expected_state' => Order::STATE_COMPLETE,
-                'is_in_process' => true,
-                'get_is_in_process_invoke_count' => 0,
-                'is_canceled' => false,
-                'can_unhold' => false,
-                'is_not_virtual' => true,
-                'isPartiallyRefundedOrderShipped' => true
-            ],
-            'processing - canCreditmemo, !canShip, !isPartiallyRefundedOrderShipped -> processing' => [
-                'can_credit_memo' => true,
-                'can_credit_memo_invoke_count' => 1,
-                'can_ship' => true,
-                'call_can_skip_num' => 1,
-                'current_state' => Order::STATE_PROCESSING,
-                'expected_state' => Order::STATE_PROCESSING,
-                'is_in_process' => true,
-                'get_is_in_process_invoke_count' => 0,
-                'is_canceled' => false,
-                'can_unhold' => false,
-                'is_not_virtual' => true,
-                'isPartiallyRefundedOrderShipped' => false
-            ],
             'new - canCreditmemo, canShip, !IsInProcess -> new' => [
                 'can_credit_memo' => true,
                 'can_credit_memo_invoke_count' => 0,
@@ -370,21 +338,21 @@ public function stateCheckDataProvider()
                 'is_not_virtual' => true,
                 'isPartiallyRefundedOrderShipped' => false
             ],
-            'processing - !canCreditmemo !canShip -> complete(virtual product)' => [
+            'processing - !canCreditmemo!canShip -> complete(virtual product)' => [
                 'can_credit_memo' => false,
                 'can_credit_memo_invoke_count' => 1,
                 'can_ship' => false,
-                'call_can_skip_num' =>2,
+                'call_can_skip_num' => 2,
                 'current_state' => Order::STATE_PROCESSING,
                 'expected_state' => Order::STATE_COMPLETE,
                 'is_in_process' => false,
                 'get_is_in_process_invoke_count' => 0,
                 'is_canceled' => false,
                 'can_unhold' => false,
                 'is_not_virtual' => false,
-                'isPartiallyRefundedOrderShipped' => true
+                'isPartiallyRefundedOrderShipped' => false
             ],
-            'complete - !canCreditmemo, !canShip !isPartiallyRefundedOrderShipped - closed(virtual product)' => [
+            'complete - !canCreditmemo, !canShip - closed(virtual product)' => [
                 'can_credit_memo' => false,
                 'can_credit_memo_invoke_count' => 1,
                 'can_ship' => false,
@@ -395,36 +363,36 @@ public function stateCheckDataProvider()
                 'get_is_in_process_invoke_count' => 0,
                 'is_canceled' => false,
                 'can_unhold' => false,
-                'is_not_virtual' => true,
-                'isPartiallyRefundedOrderShipped' => true
+                'is_not_virtual' => false,
+                'isPartiallyRefundedOrderShipped' => false
             ],
-            'complete - !canCreditmemo, !canShip - closed(virtual product)' => [
-                'can_credit_memo' => false,
+            'processing - canCreditmemo, !canShip, !isPartiallyRefundedOrderShipped -> processing' => [
+                'can_credit_memo' => true,
                 'can_credit_memo_invoke_count' => 1,
-                'can_ship' => false,
+                'can_ship' => true,
                 'call_can_skip_num' => 1,
-                'current_state' => Order::STATE_COMPLETE,
-                'expected_state' => Order::STATE_CLOSED,
-                'is_in_process' => false,
+                'current_state' => Order::STATE_PROCESSING,
+                'expected_state' => Order::STATE_PROCESSING,
+                'is_in_process' => true,
                 'get_is_in_process_invoke_count' => 0,
                 'is_canceled' => false,
                 'can_unhold' => false,
                 'is_not_virtual' => true,
                 'isPartiallyRefundedOrderShipped' => false
             ],
-            'complete - !canCreditmemo, !canShip - closed(virtual product)' => [
-                'can_credit_memo' => false,
+            'processing - canCreditmemo, !canShip, isPartiallyRefundedOrderShipped -> complete' => [
+                'can_credit_memo' => true,
                 'can_credit_memo_invoke_count' => 1,
                 'can_ship' => false,
                 'call_can_skip_num' => 1,
-                'current_state' => Order::STATE_COMPLETE,
-                'expected_state' => Order::STATE_CLOSED,
-                'is_in_process' => false,
+                'current_state' => Order::STATE_PROCESSING,
+                'expected_state' => Order::STATE_COMPLETE,
+                'is_in_process' => true,
                 'get_is_in_process_invoke_count' => 0,
                 'is_canceled' => false,
                 'can_unhold' => false,
                 'is_not_virtual' => true,
-                'isPartiallyRefundedOrderShipped' => false
+                'isPartiallyRefundedOrderShipped' => true
             ],
         ];
     }