Merge branch 'ACP2E-92' of https://github.com/magento-l3/magento2ce into ACP2E-92

Author: glo23503

app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php

@@ -74,34 +74,13 @@ public function validate($entity)
 
         $totalQuantity = 0;
         foreach ($entity->getItems() as $item) {
-            if (!isset($orderItemsById[$item->getOrderItemId()])) {
-                $messages[] = __(
-                    'The creditmemo contains product SKU "%1" that is not part of the original order.',
-                    $item->getSku()
-                );
-                continue;
-            }
-            $orderItem = $orderItemsById[$item->getOrderItemId()];
-
-            if ($this->isValidRefundQty($orderItem->getIsQtyDecimal(), $item->getQty())) {
-                $messages[] =__(
-                    'You cannot use decimal quantity to refund item "%1".',
-                    $orderItem->getSku()
-                );
-                continue;
-            }
-
-            if (!$this->canRefundItem($orderItem, $item->getQty(), $invoiceQtysRefundLimits) ||
-                !$this->isQtyAvailable($orderItem, $item->getQty())
-            ) {
-                $messages[] =__(
-                    'The quantity to creditmemo must not be greater than the unrefunded quantity'
-                    . ' for product SKU "%1".',
-                    $orderItem->getSku()
-                );
-            } else {
-                $totalQuantity += $item->getQty();
-            }
+            $this->calculateTotalQuantity(
+                $orderItemsById,
+                $messages,
+                $totalQuantity,
+                $item,
+                $invoiceQtysRefundLimits
+            );
         }
 
         if ($entity->getGrandTotal() <= 0) {
@@ -128,6 +107,50 @@ private function isValidRefundQty($isQtyDecimal, float $itemQty): bool
         return false;
     }
 
+    /**
+     * Calculate total quantity.
+     *
+     * @param array $orderItemsById
+     * @param array &$messages
+     * @param int &$totalQuantity
+     * @param Magento\Sales\Api\Data\CreditmemoItemInterface|mixed $item
+     * @param array $invoiceQtysRefundLimits
+     * @return void
+     */
+    private function calculateTotalQuantity(
+        array $orderItemsById,
+        array &$messages,
+        int &$totalQuantity,
+        $item,
+        array $invoiceQtysRefundLimits
+    ) {
+        if (!isset($orderItemsById[$item->getOrderItemId()])) {
+            $messages[] = __(
+                'The creditmemo contains product SKU "%1" that is not part of the original order.',
+                $item->getSku()
+            );
+        } else {
+            $orderItem = $orderItemsById[$item->getOrderItemId()];
+
+            if ($this->isValidRefundQty($orderItem->getIsQtyDecimal(), $item->getQty())) {
+                $messages[] =__(
+                    'You cannot use decimal quantity to refund item "%1".',
+                    $orderItem->getSku()
+                );
+            } elseif (!$this->canRefundItem($orderItem, $item->getQty(), $invoiceQtysRefundLimits) ||
+                !$this->isQtyAvailable($orderItem, $item->getQty())
+            ) {
+                $messages[] =__(
+                    'The quantity to creditmemo must not be greater than the unrefunded quantity'
+                    . ' for product SKU "%1".',
+                    $orderItem->getSku()
+                );
+            } else {
+                $totalQuantity += $item->getQty();
+            }
+        }
+    }
+
     /**
      * We can have problem with float in php (on some server $a=762.73;$b=762.73; $a-$b!=0)
      * for this we have additional diapason for 0