Merge remote-tracking branch 'origin/MC-14895' into 2.2.8-develop-pr79

Author: viktorpetryk

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

@@ -9,7 +9,7 @@
 use Magento\Sales\Model\Order;
 
 /**
- * Class to check order State.
+ * Class to check and adjust order state/status.
  */
 class State
 {
@@ -31,7 +31,10 @@ public function check(Order $order)
         }
 
         if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice()) {
-            if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE]) && !$order->canCreditmemo()) {
+            if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE])
+                && !$order->canCreditmemo()
+                && !$order->canShip()
+            ) {
                 $order->setState(Order::STATE_CLOSED)
                     ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
             } elseif ($currentState === Order::STATE_PROCESSING && !$order->canShip()) {

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

@@ -118,13 +118,13 @@ public function stateCheckDataProvider(): array
     {
         return [
             'processing - !canCreditmemo!canShip -> closed' =>
-                [false, 1, false, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
+                [false, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_CLOSED],
             'complete - !canCreditmemo,!canShip -> closed' =>
-                [false, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
-            'processing - !canCreditmemo,canShip -> closed' =>
-                [false, 1, true, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
-            'complete - !canCreditmemo,canShip -> closed' =>
-                [false, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
+                [false, 1, false, 1, Order::STATE_COMPLETE, Order::STATE_CLOSED],
+            'processing - !canCreditmemo,canShip -> processing' =>
+                [false, 1, true, 2, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
+            'complete - !canCreditmemo,canShip -> complete' =>
+                [false, 1, true, 1, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
             'processing - canCreditmemo,!canShip -> complete' =>
                 [true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE],
             'complete - canCreditmemo,!canShip -> complete' =>