Merge remote-tracking branch 'l3/ACP2E-2610' into Tier4-PR-Delivery-12-1-23

Author: veloraven

app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php

@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Model\Product\Price\Validation;
 
 use Magento\Catalog\Api\Data\TierPriceInterface;
-use Magento\Catalog\Model\Product\Price\TierPricePersistence;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\ProductIdLocatorInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
@@ -54,11 +54,6 @@ class TierPriceValidator implements ResetAfterRequestInterface
      */
     private $validationResult;
 
-    /**
-     * @var TierPricePersistence
-     */
-    private $tierPricePersistence;
-
     /**
      * Groups by code cache.
      *
@@ -86,6 +81,16 @@ class TierPriceValidator implements ResetAfterRequestInterface
      */
     private $allowedProductTypes = [];
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var array
+     */
+    private $productsCacheBySku = [];
+
     /**
      * TierPriceValidator constructor.
      *
@@ -94,9 +99,9 @@ class TierPriceValidator implements ResetAfterRequestInterface
      * @param FilterBuilder $filterBuilder
      * @param GroupRepositoryInterface $customerGroupRepository
      * @param WebsiteRepositoryInterface $websiteRepository
-     * @param TierPricePersistence $tierPricePersistence
      * @param Result $validationResult
      * @param InvalidSkuProcessor $invalidSkuProcessor
+     * @param ProductRepositoryInterface $productRepository
      * @param array $allowedProductTypes [optional]
      */
     public function __construct(
@@ -105,19 +110,19 @@ public function __construct(
         FilterBuilder                      $filterBuilder,
         GroupRepositoryInterface            $customerGroupRepository,
         WebsiteRepositoryInterface             $websiteRepository,
-        TierPricePersistence $tierPricePersistence,
         Result                                                    $validationResult,
         InvalidSkuProcessor                                       $invalidSkuProcessor,
+        ProductRepositoryInterface $productRepository,
         array                                                     $allowedProductTypes = []
     ) {
         $this->productIdLocator = $productIdLocator;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->filterBuilder = $filterBuilder;
         $this->customerGroupRepository = $customerGroupRepository;
         $this->websiteRepository = $websiteRepository;
-        $this->tierPricePersistence = $tierPricePersistence;
         $this->validationResult = $validationResult;
         $this->invalidSkuProcessor = $invalidSkuProcessor;
+        $this->productRepository = $productRepository;
         $this->allowedProductTypes = $allowedProductTypes;
     }
 
@@ -310,7 +315,16 @@ private function checkPriceType(
      */
     private function checkQuantity(TierPriceInterface $price, $key, Result $validationResult)
     {
-        if ($price->getQuantity() < 1) {
+        $sku = $price->getSku();
+        if (isset($this->productsCacheBySku[$sku])) {
+            $product = $this->productsCacheBySku[$sku];
+        } else {
+            $product = $this->productRepository->get($price->getSku());
+            $this->productsCacheBySku[$sku] = $product;
+        }
+
+        $canUseQtyDecimals = $product->getTypeInstance()->canUseQtyDecimals();
+        if ($price->getQuantity() <= 0 || $price->getQuantity() < 1 && !$canUseQtyDecimals) {
             $validationResult->addFailedItem(
                 $key,
                 __(

app/code/Magento/Catalog/Test/Unit/Model/Product/Price/Validation/TierPriceValidatorTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Catalog\Test\Unit\Model\Product\Price\Validation;
 
 use Magento\Catalog\Api\Data\TierPriceInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Price\Validation\InvalidSkuProcessor;
 use Magento\Catalog\Model\Product\Price\Validation\Result;
 use Magento\Catalog\Model\Product\Price\Validation\TierPriceValidator;
@@ -79,6 +80,11 @@ class TierPriceValidatorTest extends TestCase
      */
     private $tierPrice;
 
+    /**
+     * @var ProductRepositoryInterface|MockObject
+     */
+    private $productRepository;
+
     /**
      * {@inheritdoc}
      */
@@ -109,6 +115,9 @@ protected function setUp(): void
         $this->tierPrice = $this->getMockBuilder(TierPriceInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->productRepository = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
         $objectManagerHelper = new ObjectManager($this);
         $this->tierPriceValidator = $objectManagerHelper->getObject(
@@ -120,7 +129,8 @@ protected function setUp(): void
                 'customerGroupRepository' => $this->customerGroupRepository,
                 'websiteRepository' => $this->websiteRepository,
                 'validationResult' => $this->validationResult,
-                'invalidSkuProcessor' => $this->invalidSkuProcessor
+                'invalidSkuProcessor' => $this->invalidSkuProcessor,
+                'productRepository' => $this->productRepository
             ]
         );
     }
@@ -187,6 +197,27 @@ private function prepareRetrieveValidationResultMethod($sku, array $returned)
         ];
         $this->productIdLocator->expects($this->atLeastOnce())->method('retrieveProductIdsBySkus')
             ->willReturn($idsBySku);
+
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $type = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\AbstractType::class)
+            ->onlyMethods(['canUseQtyDecimals'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->productRepository->expects($this->once())
+            ->method('get')
+            ->with($sku)
+            ->willReturn($product);
+
+        $product->expects($this->once())
+            ->method('getTypeInstance')
+            ->willReturn($type);
+
+        $type->expects($this->once())
+            ->method('canUseQtyDecimals')
+            ->willReturn(true);
     }
 
     /**