ACP2E-3045: Order closed without fully refunded

Author: aplapana

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
@@ -30,7 +31,11 @@ public function check(Order $order)
             $currentState = Order::STATE_PROCESSING;
         }
 
-        if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice() && $order->getTotalDue() == 0) {
+        if (!$order->isCanceled()
+            && !$order->canUnhold()
+            && !$order->canInvoice()
+            && !$this->orderHasOpenInvoices($order)
+        ) {
             if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE])
                 && !$order->canCreditmemo()
                 && !$order->canShip()
@@ -67,6 +72,24 @@ public function isPartiallyRefundedOrderShipped(Order $order): bool
         return $isPartiallyRefundedOrderShipped;
     }
 
+    /**
+     * 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;
+    }
+
     /**
      * Get all refunded items number
      *

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

@@ -9,8 +9,10 @@
 
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\ResourceModel\Order\Address\Collection;
 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;
 
@@ -46,14 +48,25 @@ protected function setUp(): void
                     'getIsNotVirtual',
                     'getStatus',
                     'getAllItems',
-                    'getTotalDue'
+                    'getInvoiceCollection'
                 ]
             )
             ->disableOriginalConstructor()
             ->getMock();
         $this->orderMock->expects($this->any())
             ->method('getConfig')
             ->willReturnSelf();
+        $invoice = $this->createMock(Invoice::class);
+        $invoice->expects($this->once())
+            ->method('getState')
+            ->willReturn(Invoice::STATE_PAID);
+        $invoiceCollection = $this->createMock(InvoiceCollection::class);
+        $invoiceCollection->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$invoice]);
+        $this->orderMock->expects($this->once())
+            ->method('getInvoiceCollection')
+            ->willReturn($invoiceCollection);
         $this->state = new State();
     }
 
@@ -108,8 +121,6 @@ public function testCheck(
             ->willReturn($isNotVirtual);
         $this->orderMock->method('getAllItems')
             ->willReturn([]);
-        $this->orderMock->method('getTotalDue')
-            ->willReturn(0);
         if (!$isNotVirtual) {
             $this->orderMock->method('getIsVirtual')
                 ->willReturn(!$isNotVirtual);