Skip to content

Commit 7648c0d

Browse files
committed
AC-3178::implemented changes suggested in PR
1 parent 3677712 commit 7648c0d

File tree

1 file changed

+8
-6
lines changed
  • app/code/Magento/Sales/Model/ResourceModel/Order/Handler

1 file changed

+8
-6
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@ public function check(Order $order)
5858
*/
5959
public function isPartiallyRefundedOrderShipped(Order $order): bool
6060
{
61+
$isPartiallyRefundedOrderShipped = false;
6162
if ($this->getShippedItems($order) > 0
6263
&& $order->getTotalQtyOrdered() <= $this->getRefundedItems($order) + $this->getShippedItems($order)) {
63-
return true;
64+
$isPartiallyRefundedOrderShipped = true;
6465
}
65-
return false;
66+
67+
return $isPartiallyRefundedOrderShipped;
6668
}
6769

6870
/**
@@ -76,10 +78,10 @@ private function getRefundedItems(Order $order): int
7678
$num_of_refunded_items = 0;
7779
foreach ($order->getAllItems() as $item) {
7880
if ($item->getProductType() == 'simple') {
79-
$num_of_refunded_items += (int)$item->getQtyRefunded();
81+
$numOfRefundedItems += (int)$item->getQtyRefunded();
8082
}
8183
}
82-
return $num_of_refunded_items;
84+
return $numOfRefundedItems;
8385
}
8486

8587
/**
@@ -92,8 +94,8 @@ private function getShippedItems(Order $order): int
9294
{
9395
$num_of_shipped_items= 0;
9496
foreach ($order->getAllItems() as $item) {
95-
$num_of_shipped_items += (int)$item->getQtyShipped();
97+
$numOfShippedItems += (int)$item->getQtyShipped();
9698
}
97-
return $num_of_shipped_items;
99+
return $numOfShippedItems;
98100
}
99101
}

0 commit comments

Comments
 (0)