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

@@ -17,7 +17,7 @@
 use Magento\Sales\Model\Order\Item;
 use Magento\Sales\Model\ValidatorInterface;
 use Magento\Sales\Api\Data\CreditmemoItemInterface;
-use \Magento\Framework\Phrase;
+use Magento\Framework\Phrase;
 
 /**
  * Creditmemo QuantityValidator
@@ -107,22 +107,22 @@ public function validate($entity)
     private function isValidDecimalRefundQty($isQtyDecimal, float $itemQty): bool
     {
         if (!$isQtyDecimal && (floor($itemQty) !== $itemQty)) {
-            return true;
+            return false;
         }
-        return false;
+        return true;
     }
 
     /**
      * Calculate total quantity.
      *
      * @param array $orderItemsById
-     * @param Magento\Sales\Api\Data\CreditmemoItemInterface|mixed $item
+     * @param CreditmemoItemInterface $item
      * @param array $invoiceQtysRefundLimits
      * @return Phrase|void
      */
     private function validateTotalQuantityRefundable(
         array $orderItemsById,
-        $item,
+        CreditmemoItemInterface $item,
         array $invoiceQtysRefundLimits
     ) {
         if (!isset($orderItemsById[$item->getOrderItemId()])) {
@@ -133,7 +133,7 @@ private function validateTotalQuantityRefundable(
         }
         $orderItem = $orderItemsById[$item->getOrderItemId()];
 
-        if ($this->isValidDecimalRefundQty($orderItem->getIsQtyDecimal(), $item->getQty())) {
+        if (!$this->isValidDecimalRefundQty($orderItem->getIsQtyDecimal(), $item->getQty())) {
             return __(
                 'We found an invalid quantity to refund item "%1".',
                 $orderItem->getSku()

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

@@ -160,10 +160,19 @@ public function testValidateWithWrongItemId()
      * @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();
@@ -190,6 +199,8 @@ public function testValidate($orderId, $orderItemId, $qtyToRequest, $qtyToRefund
         $orderItemMock = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $orderItemMock->expects($this->any())->method('getIsQtyDecimal')
+            ->willReturn($isQtyDecimalAllowed);
         $orderItemMock->expects($this->any())->method('getQtyToRefund')
             ->willReturn($qtyToRefund);
         $creditmemoItemMock->expects($this->any())->method('getQty')
@@ -227,7 +238,8 @@ public function dataProviderForValidateQty()
                 'qtyToRefund' => 1,
                 'sku',
                 'total' => 15,
-                'expected' => []
+                'expected' => [],
+                'isQtyDecimalAllowed' => false
             ],
             [
                 'orderId' => 1,
@@ -236,22 +248,23 @@ public function dataProviderForValidateQty()
                 'qtyToRefund' => 0,
                 'sku',
                 'total' => 15,
-                'expected' => []
+                'expected' => [],
+                'isQtyDecimalAllowed' => false
             ],
             [
                 'orderId' => 1,
                 'orderItemId' => 1,
                 'qtyToRequest' => 1.5,
-                'qtyToRefund' => 1,
+                'qtyToRefund' => 3,
                 'sku',
-                'total' => 0,
+                'total' => 5,
                 'expected' => [
                     __(
                         'We found an invalid quantity to refund item "%1".',
                         $sku
-                    ),
-                    __('The credit memo\'s total must be positive.')
-                ]
+                    )
+                ],
+                'isQtyDecimalAllowed' => false
             ],
             [
                 'orderId' => 1,
@@ -267,7 +280,8 @@ public function dataProviderForValidateQty()
                         $sku
                     ),
                     __('The credit memo\'s total must be positive.')
-                ]
+                ],
+                'isQtyDecimalAllowed' => false
             ],
         ];
     }