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

Author: chittima

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

@@ -16,6 +16,8 @@
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order\Item;
 use Magento\Sales\Model\ValidatorInterface;
+use Magento\Sales\Api\Data\CreditmemoItemInterface;
+use Magento\Framework\Phrase;
 
 /**
  * Creditmemo QuantityValidator
@@ -74,23 +76,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->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()
-                );
+            $message = $this->validateTotalQuantityRefundable(
+                $orderItemsById,
+                $item,
+                $invoiceQtysRefundLimits
+            );
+            if ($message) {
+                $messages[] = $message;
             } else {
                 $totalQuantity += $item->getQty();
             }
@@ -105,6 +97,60 @@ public function validate($entity)
         return $messages;
     }
 
+    /**
+     * To check the refund qty is decimal if getIsQtyDecimal is unset.
+     *
+     * @param mixed $isQtyDecimal
+     * @param float $itemQty
+     * @return bool
+     */
+    private function isValidDecimalRefundQty($isQtyDecimal, float $itemQty): bool
+    {
+        if (!$isQtyDecimal && (floor($itemQty) !== $itemQty)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Calculate total quantity.
+     *
+     * @param array $orderItemsById
+     * @param CreditmemoItemInterface $item
+     * @param array $invoiceQtysRefundLimits
+     * @return Phrase|void
+     */
+    private function validateTotalQuantityRefundable(
+        array $orderItemsById,
+        CreditmemoItemInterface $item,
+        array $invoiceQtysRefundLimits
+    ) {
+        if (!isset($orderItemsById[$item->getOrderItemId()])) {
+            return __(
+                'The creditmemo contains product SKU "%1" that is not part of the original order.',
+                $item->getSku()
+            );
+        }
+        $orderItem = $orderItemsById[$item->getOrderItemId()];
+
+        if (!$this->isValidDecimalRefundQty($orderItem->getIsQtyDecimal(), $item->getQty())) {
+            return __(
+                'We found an invalid quantity to refund item "%1".',
+                $orderItem->getSku()
+            );
+        }
+
+        if (!$this->canRefundItem($orderItem, $item->getQty(), $invoiceQtysRefundLimits) ||
+            !$this->isQtyAvailable($orderItem, $item->getQty())
+        ) {
+            return __(
+                'The quantity to creditmemo must not be greater than the unrefunded quantity'
+                . ' for product SKU "%1".',
+                $orderItem->getSku()
+            );
+        }
+    }
+
     /**
      * 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

app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Validation/QuantityValidatorTest.php

@@ -158,11 +158,21 @@ public function testValidateWithWrongItemId()
      * @param int $qtyToRequest
      * @param int $qtyToRefund
      * @param string $sku
+     * @param int $total
      * @param array $expected
+     * @param bool $isQtyDecimalAllowed
      * @dataProvider dataProviderForValidateQty
      */
-    public function testValidate($orderId, $orderItemId, $qtyToRequest, $qtyToRefund, $sku, $total, array $expected)
-    {
+    public function testValidate(
+        $orderId,
+        $orderItemId,
+        $qtyToRequest,
+        $qtyToRefund,
+        $sku,
+        $total,
+        array $expected,
+        bool $isQtyDecimalAllowed
+    ) {
         $creditmemoMock = $this->getMockBuilder(CreditmemoInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -189,7 +199,9 @@ public function testValidate($orderId, $orderItemId, $qtyToRequest, $qtyToRefund
         $orderItemMock = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $orderItemMock->expects($this->exactly(2))->method('getQtyToRefund')
+        $orderItemMock->expects($this->any())->method('getIsQtyDecimal')
+            ->willReturn($isQtyDecimalAllowed);
+        $orderItemMock->expects($this->any())->method('getQtyToRefund')
             ->willReturn($qtyToRefund);
         $creditmemoItemMock->expects($this->any())->method('getQty')
             ->willReturn($qtyToRequest);
@@ -226,7 +238,8 @@ public function dataProviderForValidateQty()
                 'qtyToRefund' => 1,
                 'sku',
                 'total' => 15,
-                'expected' => []
+                'expected' => [],
+                'isQtyDecimalAllowed' => false
             ],
             [
                 'orderId' => 1,
@@ -235,7 +248,23 @@ public function dataProviderForValidateQty()
                 'qtyToRefund' => 0,
                 'sku',
                 'total' => 15,
-                'expected' => []
+                'expected' => [],
+                'isQtyDecimalAllowed' => false
+            ],
+            [
+                'orderId' => 1,
+                'orderItemId' => 1,
+                'qtyToRequest' => 1.5,
+                'qtyToRefund' => 3,
+                'sku',
+                'total' => 5,
+                'expected' => [
+                    __(
+                        'We found an invalid quantity to refund item "%1".',
+                        $sku
+                    )
+                ],
+                'isQtyDecimalAllowed' => false
             ],
             [
                 'orderId' => 1,
@@ -251,7 +280,8 @@ public function dataProviderForValidateQty()
                         $sku
                     ),
                     __('The credit memo\'s total must be positive.')
-                ]
+                ],
+                'isQtyDecimalAllowed' => false
             ],
         ];
     }