Merge branch 'ACP2E-3045' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-06-10-CE

Author: vkolesny

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

@@ -7,6 +7,7 @@
 namespace Magento\Sales\Model\ResourceModel\Order\Handler;
 
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Invoice;
 
 /**
  * Checking order status and adjusting order status before saving
@@ -27,7 +28,11 @@ public function check(Order $order)
                 ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING));
             $currentState = Order::STATE_PROCESSING;
         }
-        if ($order->isCanceled() || $order->canUnhold() || $order->canInvoice()) {
+        if ($order->isCanceled() ||
+            $order->canUnhold() ||
+            $order->canInvoice() ||
+            ($this->orderHasOpenInvoices($order) && (int) $order->getTotalDue() > 0)
+        ) {
             return $this;
         }
 
@@ -62,6 +67,24 @@ private function checkForCompleteState(Order $order, ?string $currentState): boo
         return false;
     }
 
+    /**
+     * Check if order has unpaid invoices
+     *
+     * @param Order $order
+     * @return bool
+     */
+    private function orderHasOpenInvoices(Order $order): bool
+    {
+        /** @var Invoice $invoice */
+        foreach ($order->getInvoiceCollection()->getItems() as $invoice) {
+            if ($invoice->getState() == Invoice::STATE_OPEN) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Check if order can be automatically switched to closed state
      *

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

@@ -8,10 +8,10 @@
 namespace Magento\Sales\Test\Unit\Model\ResourceModel\Order\Handler;
 
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Address;
 use Magento\Sales\Model\Order\Item;
-use Magento\Sales\Model\ResourceModel\Order\Address\Collection;
+use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\ResourceModel\Order\Handler\State;
+use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as InvoiceCollection;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -47,14 +47,27 @@ protected function setUp(): void
                     'getIsNotVirtual',
                     'getStatus',
                     'getAllItems',
-                    'getTotalQtyOrdered'
+                    'getInvoiceCollection',
+                    'getTotalQtyOrdered',
+                    'getTotalDue'
                 ]
             )
             ->disableOriginalConstructor()
             ->getMock();
         $this->orderMock->expects($this->any())
             ->method('getConfig')
             ->willReturnSelf();
+        $invoice = $this->createMock(Invoice::class);
+        $invoice->expects($this->any())
+            ->method('getState')
+            ->willReturn(Invoice::STATE_PAID);
+        $invoiceCollection = $this->createMock(InvoiceCollection::class);
+        $invoiceCollection->expects($this->any())
+            ->method('getItems')
+            ->willReturn([$invoice]);
+        $this->orderMock->expects($this->any())
+            ->method('getInvoiceCollection')
+            ->willReturn($invoiceCollection);
         $this->state = new State();
     }