Merge remote-tracking branch 'origin/ACP2E-3993' into PR_2025_08_25_muntianu

Author: katmoon

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Discount.php

@@ -72,7 +72,10 @@ private function getPriceDifferenceAsValue(float $regularPrice, float $finalPric
      */
     private function getPriceDifferenceAsPercent(float $regularPrice, float $finalPrice): float
     {
-        $difference = $this->getPriceDifferenceAsValue($regularPrice, $finalPrice);
+        $difference = $regularPrice - $finalPrice;
+        if ($difference <= $this->zeroThreshold) {
+            return 0;
+        }
 
         if ($difference <= $this->zeroThreshold || $regularPrice <= $this->zeroThreshold) {
             return 0;

app/code/Magento/CatalogRule/Model/Indexer/ProductPriceCalculator.php

@@ -3,6 +3,7 @@
  * Copyright 2017 Adobe
  * All Rights Reserved.
  */
+declare(strict_types=1);
 
 namespace Magento\CatalogRule\Model\Indexer;
 
@@ -28,7 +29,7 @@ public function __construct(\Magento\Framework\Pricing\PriceCurrencyInterface $p
      * Calculates product price.
      *
      * @param array $ruleData
-     * @param null $productData
+     * @param array|null $productData
      * @return float
      */
     public function calculate($ruleData, $productData = null)
@@ -56,6 +57,6 @@ public function calculate($ruleData, $productData = null)
                 $productPrice = 0;
         }
 
-        return $this->priceCurrency->round($productPrice);
+        return $this->priceCurrency->roundPrice($productPrice, 4);
     }
 }

app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php

@@ -18,16 +18,14 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Class CatalogRulePrice
- *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CatalogRulePrice extends AbstractPrice implements BasePriceProviderInterface
 {
     /**
      * Price type identifier string
      */
-    const PRICE_CODE = 'catalog_rule_price';
+    public const PRICE_CODE = 'catalog_rule_price';
 
     /**
      * @var TimezoneInterface
@@ -97,7 +95,7 @@ public function getValue()
                 $this->value = $this->value ? (float)$this->value : false;
             }
             if ($this->value) {
-                $this->value = $this->priceCurrency->convertAndRound($this->value);
+                $this->value = $this->priceCurrency->convertAndRound($this->value, null, null, 4);
             }
         }
 

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ProductPriceCalculatorTest.php

@@ -5,7 +5,6 @@
  */
 declare(strict_types=1);
 
-
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
 use Magento\CatalogRule\Model\Indexer\ProductPriceCalculator;
@@ -29,6 +28,7 @@ protected function setUp(): void
     {
         $this->priceCurrencyMock = $this->getMockBuilder(PriceCurrencyInterface::class)
             ->disableOriginalConstructor()
+            ->addMethods(['roundPrice'])
             ->getMockForAbstractClass();
         $this->model = new ProductPriceCalculator($this->priceCurrencyMock);
     }
@@ -44,8 +44,8 @@ public function testCalculateToFixedPrice()
         $productData = ['rule_price' => $rulePrice];
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('round')
-            ->with($actionAmount)
+            ->method('roundPrice')
+            ->with($actionAmount, 4)
             ->willReturn($actionAmount);
 
         $this->assertEquals($actionAmount, $this->model->calculate($ruleData, $productData));
@@ -63,8 +63,8 @@ public function testCalculateToPercentPrice()
         $productData = ['rule_price' => $rulePrice];
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('round')
-            ->with($expectedPrice)
+            ->method('roundPrice')
+            ->with($expectedPrice, 4)
             ->willReturn($expectedPrice);
 
         $this->assertEquals($expectedPrice, $this->model->calculate($ruleData, $productData));
@@ -82,8 +82,8 @@ public function testCalculateByFixedPrice()
         $productData = ['rule_price' => $rulePrice];
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('round')
-            ->with($expectedPrice)
+            ->method('roundPrice')
+            ->with($expectedPrice, 4)
             ->willReturn($expectedPrice);
 
         $this->assertEquals($expectedPrice, $this->model->calculate($ruleData, $productData));
@@ -101,8 +101,8 @@ public function testCalculateByPercentPrice()
         $productData = ['rule_price' => $rulePrice];
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('round')
-            ->with($expectedPrice)
+            ->method('roundPrice')
+            ->with($expectedPrice, 4)
             ->willReturn($expectedPrice);
 
         $this->assertEquals($expectedPrice, $this->model->calculate($ruleData, $productData));

app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php

@@ -142,7 +142,7 @@ public function testGetValue()
             ->willReturn($productId);
         $this->priceCurrencyMock->expects($this->once())
             ->method('convertAndRound')
-            ->with($catalogRulePrice)
+            ->with($catalogRulePrice, null, null, 4)
             ->willReturn($convertedPrice);
 
         $this->assertEquals($convertedPrice, $this->object->getValue());
@@ -155,7 +155,7 @@ public function testGetValueFromData()
 
         $this->priceCurrencyMock->expects($this->any())
             ->method('convertAndRound')
-            ->with($catalogRulePrice)
+            ->with($catalogRulePrice, null, null, 4)
             ->willReturn($convertedPrice);
 
         $this->saleableItemMock->expects($this->once())->method('hasData')

app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php

@@ -1,8 +1,10 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
+
 namespace Magento\Tax\Model\Calculation;
 
 use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
@@ -56,7 +58,7 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
 
         // Calculate $priceInclTax
         $applyTaxAfterDiscount = $this->config->applyTaxAfterDiscount($this->storeId);
-        $priceInclTax = $this->calculationTool->round($item->getUnitPrice());
+        $priceInclTax = $item->getUnitPrice();
         if (!$this->isSameRateAsStore($rate, $storeRate)) {
             $priceInclTax = $this->calculatePriceInclTax($priceInclTax, $storeRate, $rate, $round);
         }