Merge remote-tracking branch 'origin/imported-magento-magento2-30749' into 2.4-develop-pr108

Author: zakdma

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

@@ -3,20 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Creditmemo\Validation;
 
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order\Item;
 use Magento\Sales\Model\ValidatorInterface;
 
 /**
- * Class QuantityValidator
+ * Creditmemo QuantityValidator
  */
 class QuantityValidator implements ValidatorInterface
 {
@@ -31,7 +33,7 @@ class QuantityValidator implements ValidatorInterface
     private $invoiceRepository;
 
     /**
-     * @var \Magento\Framework\Pricing\PriceCurrencyInterface
+     * @var PriceCurrencyInterface
      */
     private $priceCurrency;
 
@@ -40,12 +42,12 @@ class QuantityValidator implements ValidatorInterface
      *
      * @param OrderRepositoryInterface $orderRepository
      * @param InvoiceRepositoryInterface $invoiceRepository
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param PriceCurrencyInterface $priceCurrency
      */
     public function __construct(
         OrderRepositoryInterface $orderRepository,
         InvoiceRepositoryInterface $invoiceRepository,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+        PriceCurrencyInterface $priceCurrency
     ) {
         $this->orderRepository = $orderRepository;
         $this->invoiceRepository = $invoiceRepository;
@@ -96,7 +98,7 @@ public function validate($entity)
 
         if ($entity->getGrandTotal() <= 0) {
             $messages[] = __('The credit memo\'s total must be positive.');
-        } elseif ($totalQuantity <= 0 && !$this->canRefundShipping($order)) {
+        } elseif ($totalQuantity < 0 && !$this->canRefundShipping($order)) {
             $messages[] = __('You can\'t create a creditmemo without products.');
         }
 
@@ -117,6 +119,8 @@ private function canRefundShipping(OrderInterface $order)
     }
 
     /**
+     * Invoice qty refund limits
+     *
      * @param CreditmemoInterface $creditmemo
      * @param OrderInterface $order
      * @return array
@@ -156,6 +160,8 @@ private function getInvoiceQtysRefundLimits(CreditmemoInterface $creditmemo, Ord
     }
 
     /**
+     * Get order items
+     *
      * @param OrderInterface $order
      * @return OrderItemInterface[]
      */
@@ -170,6 +176,8 @@ private function getOrderItems(OrderInterface $order)
     }
 
     /**
+     * Check is qty available
+     *
      * @param Item $orderItem
      * @param int $qty
      * @return bool
@@ -182,12 +190,12 @@ private function isQtyAvailable(Item $orderItem, $qty)
     /**
      * Check if order item can be refunded
      *
-     * @param \Magento\Sales\Model\Order\Item $item
+     * @param Item $item
      * @param double $qty
      * @param array $invoiceQtysRefundLimits
      * @return bool
      */
-    private function canRefundItem(\Magento\Sales\Model\Order\Item $item, $qty, array $invoiceQtysRefundLimits)
+    private function canRefundItem(Item $item, $qty, array $invoiceQtysRefundLimits)
     {
         if ($item->isDummy()) {
             return $this->canRefundDummyItem($item, $qty, $invoiceQtysRefundLimits);
@@ -199,11 +207,11 @@ private function canRefundItem(\Magento\Sales\Model\Order\Item $item, $qty, arra
     /**
      * Check if no dummy order item can be refunded
      *
-     * @param \Magento\Sales\Model\Order\Item $item
+     * @param Item $item
      * @param array $invoiceQtysRefundLimits
      * @return bool
      */
-    private function canRefundNoDummyItem(\Magento\Sales\Model\Order\Item $item, array $invoiceQtysRefundLimits = [])
+    private function canRefundNoDummyItem(Item $item, array $invoiceQtysRefundLimits = [])
     {
         if ($item->getQtyToRefund() < 0) {
             return false;
@@ -215,12 +223,14 @@ private function canRefundNoDummyItem(\Magento\Sales\Model\Order\Item $item, arr
     }
 
     /**
+     * Check can refund dummy item
+     *
      * @param Item $item
      * @param int $qty
      * @param array $invoiceQtysRefundLimits
      * @return bool
      */
-    private function canRefundDummyItem(\Magento\Sales\Model\Order\Item $item, $qty, array $invoiceQtysRefundLimits)
+    private function canRefundDummyItem(Item $item, $qty, array $invoiceQtysRefundLimits)
     {
         if ($item->getHasChildren()) {
             foreach ($item->getChildrenItems() as $child) {
@@ -236,16 +246,15 @@ private function canRefundDummyItem(\Magento\Sales\Model\Order\Item $item, $qty,
     }
 
     /**
+     * Check can refund request qty
+     *
      * @param Item $item
      * @param int $qty
      * @param array $invoiceQtysRefundLimits
      * @return bool
      */
-    private function canRefundRequestedQty(
-        \Magento\Sales\Model\Order\Item $item,
-        $qty,
-        array $invoiceQtysRefundLimits
-    ) {
+    private function canRefundRequestedQty(Item $item, $qty, array $invoiceQtysRefundLimits)
+    {
         return $qty === null ? $this->canRefundNoDummyItem($item, $invoiceQtysRefundLimits) : $qty > 0;
     }
 }

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

@@ -147,7 +147,6 @@ public function testValidateWithWrongItemId()
                     'The creditmemo contains product SKU "%1" that is not part of the original order.',
                     $creditmemoItemSku
                 ),
-                __('You can\'t create a creditmemo without products.')
             ],
             $this->validator->validate($creditmemoMock)
         );
@@ -229,6 +228,15 @@ public function dataProviderForValidateQty()
                 'total' => 15,
                 'expected' => []
             ],
+            [
+                'orderId' => 1,
+                'orderItemId' => 1,
+                'qtyToRequest' => 0,
+                'qtyToRefund' => 0,
+                'sku',
+                'total' => 15,
+                'expected' => []
+            ],
             [
                 'orderId' => 1,
                 'orderItemId' => 1,