Merge branch 'ACP2E-1634' of https://github.com/magento-l3/magento2ce into PR-VK-2023-04-05-CE

Author: chittima

app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml

@@ -6,6 +6,7 @@
 ?>
 
 <?php
+// @codingStandardsIgnoreFile
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 /** @var \Magento\Bundle\Pricing\Render\FinalPriceBox $block */
 
@@ -22,7 +23,7 @@ $regularPriceAttributes = [
     'display_label'     => __('Regular Price'),
     'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
     'include_container' => true,
-    'skip_adjustments'  => true
+    'skip_adjustments'  => false
 ];
 $renderMinimalRegularPrice = $block->renderAmount($minimalRegularPrice, $regularPriceAttributes);
 ?>

app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php

@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Pricing\Price;
 
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * As Low As shows minimal value of Tier Prices
@@ -36,18 +36,7 @@ public function __construct(CalculatorInterface $calculator)
      */
     public function getValue(SaleableInterface $saleableItem)
     {
-        /** @var TierPrice $price */
-        $price = $saleableItem->getPriceInfo()->getPrice(TierPrice::PRICE_CODE);
-        $tierPriceList = $price->getTierPriceList();
-
-        $tierPrices = [];
-        foreach ($tierPriceList as $tierPrice) {
-            /** @var AmountInterface $price */
-            $price = $tierPrice['price'];
-            $tierPrices[] = $price->getValue();
-        }
-
-        return $tierPrices ? min($tierPrices) : null;
+        return $this->getAmount($saleableItem)?->getValue();
     }
 
     /**
@@ -58,10 +47,16 @@ public function getValue(SaleableInterface $saleableItem)
      */
     public function getAmount(SaleableInterface $saleableItem)
     {
-        $value = $this->getValue($saleableItem);
+        $minPrice = null;
+        /** @var TierPrice $price */
+        $tierPrice = $saleableItem->getPriceInfo()->getPrice(TierPrice::PRICE_CODE);
+        $tierPriceList = $tierPrice->getTierPriceList();
+
+        if (count($tierPriceList)) {
+            usort($tierPriceList, fn ($tier1, $tier2) => $tier1['price']->getValue() <=> $tier2['price']->getValue());
+            $minPrice = array_shift($tierPriceList)['price'];
+        }
 
-        return $value === null
-            ? null
-            : $this->calculator->getAmount($value, $saleableItem, 'tax');
+        return $minPrice;
     }
 }

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

@@ -6,16 +6,17 @@
 
 namespace Magento\Catalog\Pricing\Render;
 
-use Magento\Catalog\Pricing\Price;
-use Magento\Framework\Pricing\Render\PriceBox as BasePriceBox;
-use Magento\Msrp\Pricing\Price\MsrpPrice;
 use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface;
-use Magento\Framework\View\Element\Template\Context;
-use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Catalog\Pricing\Price;
+use Magento\Catalog\Pricing\Price\MinimalPriceCalculatorInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\Render\PriceBox as BasePriceBox;
 use Magento\Framework\Pricing\Render\RendererPool;
-use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Pricing\Price\MinimalPriceCalculatorInterface;
+use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Msrp\Pricing\Price\MsrpPrice;
 
 /**
  * Class for final_price rendering
@@ -140,7 +141,7 @@ public function renderAmountMinimal()
                 'display_label'     => __('As low as'),
                 'price_id'          => $id,
                 'include_container' => false,
-                'skip_adjustments' => true
+                'skip_adjustments' => false
             ]
         );
     }
@@ -183,7 +184,7 @@ public function showMinimalPrice()
     public function getCacheKey()
     {
         return parent::getCacheKey()
-            . ($this->getData('list_category_page') ? '-list-category-page': '')
+            . ($this->getData('list_category_page') ? '-list-category-page' : '')
             . ($this->getSaleableItem()->getCustomerGroupId() ?? '');
     }
 

app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Test\Unit\Pricing\Price;
 
+use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Catalog\Pricing\Price\MinimalTierPriceCalculator;
 use Magento\Catalog\Pricing\Price\TierPrice;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
@@ -73,10 +74,10 @@ private function getValueTierPricesExistShouldReturnMinTierPrice()
         $notMinPrice = 10;
 
         $minAmount = $this->getMockForAbstractClass(AmountInterface::class);
-        $minAmount->expects($this->once())->method('getValue')->willReturn($minPrice);
+        $minAmount->expects($this->atLeastOnce())->method('getValue')->willReturn($minPrice);
 
         $notMinAmount = $this->getMockForAbstractClass(AmountInterface::class);
-        $notMinAmount->expects($this->once())->method('getValue')->willReturn($notMinPrice);
+        $notMinAmount->expects($this->atLeastOnce())->method('getValue')->willReturn($notMinPrice);
 
         $tierPriceList = [
             [
@@ -89,10 +90,12 @@ private function getValueTierPricesExistShouldReturnMinTierPrice()
 
         $this->price->expects($this->once())->method('getTierPriceList')->willReturn($tierPriceList);
 
-        $this->priceInfo->expects($this->once())->method('getPrice')->with(TierPrice::PRICE_CODE)
-            ->willReturn($this->price);
+        $this->priceInfo->expects($this->atLeastOnce())
+            ->method('getPrice')
+            ->withConsecutive([TierPrice::PRICE_CODE], [FinalPrice::PRICE_CODE])
+            ->willReturnOnConsecutiveCalls($this->price, $notMinAmount);
 
-        $this->saleable->expects($this->once())->method('getPriceInfo')->willReturn($this->priceInfo);
+        $this->saleable->expects($this->atLeastOnce())->method('getPriceInfo')->willReturn($this->priceInfo);
         return $minPrice;
     }
 
@@ -107,12 +110,8 @@ public function testGetGetAmountMinTierPriceExistShouldReturnAmountObject()
         $minPrice = $this->getValueTierPricesExistShouldReturnMinTierPrice();
 
         $amount = $this->getMockForAbstractClass(AmountInterface::class);
+        $amount->method('getValue')->willReturn($minPrice);
 
-        $this->calculator->expects($this->once())
-            ->method('getAmount')
-            ->with($minPrice, $this->saleable)
-            ->willReturn($amount);
-
-        $this->assertSame($amount, $this->object->getAmount($this->saleable));
+        $this->assertEquals($amount, $this->object->getAmount($this->saleable));
     }
 }

app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -339,10 +339,10 @@ public function testRenderAmountMinimal(): void
         $arguments = [
             'zone' => 'test_zone',
             'list_category_page' => true,
-            'display_label' => 'As low as',
+            'display_label' => __('As low as'),
             'price_id' => $priceId,
             'include_container' => false,
-            'skip_adjustments' => true
+            'skip_adjustments' => false
         ];
 
         $amountRender = $this->createPartialMock(Amount::class, ['toHtml']);

app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml

@@ -6,6 +6,7 @@
 ?>
 
 <?php
+// @codingStandardsIgnoreFile
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
@@ -34,7 +35,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
             'price_type'        => 'oldPrice',
             'include_container' => true,
-            'skip_adjustments'  => true
+            'skip_adjustments'  => false
         ]); ?>
     </span>
 <?php else :?>

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/CheckProductPriceTest.php

@@ -9,9 +9,17 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Block\Product\ListProduct;
+use Magento\Catalog\Test\Fixture\Category as CategoryFixture;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Customer\Model\Group;
 use Magento\Customer\Model\Session;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Tax\Model\Config as TaxConfig;
+use Magento\Tax\Test\Fixture\TaxRate as TaxRateFixture;
+use Magento\Tax\Test\Fixture\TaxRule as TaxRuleFixture;
+use Magento\TestFramework\Fixture\Config as ConfigFixture;
+use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
@@ -242,6 +250,30 @@ private function assertAsLowAsPrice(string $priceHtml, float $expectedPrice): vo
         );
     }
 
+    /**
+     * Assert that price html contain "As low as" label and expected price amount with taxes
+     *
+     * @param string $priceHtml
+     * @param float $expectedPriceWithTaxes
+     * @param float $expectedPriceWithoutTaxes
+     * @return void
+     */
+    private function assertAsLowAsPriceWithTaxes(
+        string $priceHtml,
+        float $expectedPriceWithTaxes,
+        float $expectedPriceWithoutTaxes
+    ): void {
+        $this->assertMatchesRegularExpression(
+            sprintf(
+                '/<span class="price-label">As low as<\/span>(.)+<span.*data-price-amount="%s".*>\\$%01.2f<\/span>(.)+<span class="price">\$%01.2f<\/span>/',//phpcs:ignore
+                $expectedPriceWithTaxes,
+                $expectedPriceWithTaxes,
+                $expectedPriceWithoutTaxes
+            ),
+            $priceHtml
+        );
+    }
+
     /**
      * Assert that price html contain expected final price amount.
      *
@@ -307,4 +339,43 @@ private function getListProductBlock(): ListProduct
 
         return $categoryProductsBlock->getChildBlock('product_list');
     }
+
+    #[
+        ConfigFixture(TaxConfig::CONFIG_XML_PATH_PRICE_INCLUDES_TAX, 0, 'store', 'default'),
+        ConfigFixture(TaxConfig::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE, 3, 'store', 'default'),
+        DataFixture(
+            TaxRateFixture::class,
+            as: 'rate'
+        ),
+        DataFixture(
+            TaxRuleFixture::class,
+            [
+                'customer_tax_class_ids' => [3],
+                'product_tax_class_ids' => [2],
+                'tax_rate_ids' => ['$rate.id$']
+            ],
+            'rule'
+        ),
+        DataFixture(CategoryFixture::class, as: 'category'),
+        DataFixture(
+            ProductFixture::class,
+            [
+                'sku' => 'simple-product-tax-both',
+                'category_ids' => ['1', '$category.id$'],
+                'tier_prices' => [
+                    [
+                        'customer_group_id' => Group::NOT_LOGGED_IN_ID,
+                        'qty' => 2,
+                        'value' => 5
+                    ]
+                ]
+            ]
+        )
+    ]
+    public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPriceWithTaxes()
+    {
+        $priceHtml = $this->getProductPriceHtml('simple-product-tax-both');
+        $this->assertFinalPrice($priceHtml, 10.00);
+        $this->assertAsLowAsPriceWithTaxes($priceHtml, 5.500001, 5.00);
+    }
 }