Skip to content

Commit 4b05673

Browse files
committed
ACP2E-3045: Order closed without fully refunded
1 parent a7b5a4c commit 4b05673

File tree

2 files changed

+8
-4
lines changed
  • app/code/Magento/Sales

2 files changed

+8
-4
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ public function check(Order $order)
2828
->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING));
2929
$currentState = Order::STATE_PROCESSING;
3030
}
31-
if ($order->isCanceled() || $order->canUnhold() || $order->canInvoice() || $this->orderHasOpenInvoices($order) || (int) $order->getTotalDue() > 0) {
31+
if ($order->isCanceled() ||
32+
$order->canUnhold() ||
33+
$order->canInvoice() ||
34+
$this->orderHasOpenInvoices($order) ||
35+
(int) $order->getTotalDue() > 0
36+
) {
3237
return $this;
3338
}
3439

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
namespace Magento\Sales\Test\Unit\Model\ResourceModel\Order\Handler;
99

1010
use Magento\Sales\Model\Order;
11-
use Magento\Sales\Model\Order\Address;
1211
use Magento\Sales\Model\Order\Item;
1312
use Magento\Sales\Model\Order\Invoice;
14-
use Magento\Sales\Model\ResourceModel\Order\Address\Collection;
1513
use Magento\Sales\Model\ResourceModel\Order\Handler\State;
1614
use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as InvoiceCollection;
1715
use PHPUnit\Framework\MockObject\MockObject;
@@ -50,7 +48,8 @@ protected function setUp(): void
5048
'getStatus',
5149
'getAllItems',
5250
'getInvoiceCollection',
53-
'getTotalQtyOrdered'
51+
'getTotalQtyOrdered',
52+
'getTotalDue'
5453
]
5554
)
5655
->disableOriginalConstructor()

0 commit comments

Comments
 (0)