Merge remote-tracking branch 'origin/BUG#AC-2811' into spartans_pr_04082022

Author: glo80326

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

@@ -41,6 +41,8 @@ public function check(Order $order)
             } elseif ($currentState === Order::STATE_PROCESSING && !$order->canShip()) {
                 $order->setState(Order::STATE_COMPLETE)
                     ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
+            } elseif ($order->getIsVirtual() && $order->getStatus() === Order::STATE_CLOSED) {
+                $order->setState(Order::STATE_CLOSED);
             }
         }
         return $this;

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

@@ -42,7 +42,9 @@ protected function setUp(): void
                     'canCreditmemo',
                     'getTotalRefunded',
                     'getConfig',
-                    'getIsNotVirtual'
+                    'getIsVirtual',
+                    'getIsNotVirtual',
+                    'getStatus',
                 ]
             )
             ->disableOriginalConstructor()
@@ -102,6 +104,12 @@ public function testCheck(
             ->willReturn($isInProcess);
         $this->orderMock->method('getIsNotVirtual')
             ->willReturn($isNotVirtual);
+        if (!$isNotVirtual) {
+            $this->orderMock->method('getIsVirtual')
+                ->willReturn(!$isNotVirtual);
+            $this->orderMock->method('getStatus')
+                ->willReturn($expectedState);
+        }
         $this->state->check($this->orderMock);
         $this->assertEquals($expectedState, $this->orderMock->getState());
     }
@@ -323,6 +331,19 @@ public function stateCheckDataProvider()
                 'can_unhold' => false,
                 'is_not_virtual' => false
             ],
+            'complete - !canCreditmemo, !canShip - closed(virtual product)' => [
+                'can_credit_memo' => false,
+                '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,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => false,
+            ],
         ];
     }
 }