ENGCOM-8158: Old price excluding TAX shown correct on Product Page #27832

Author: gabrieldagama

app/code/Magento/Catalog/Block/Product/View.php

@@ -196,6 +196,10 @@ public function getJsonConfig()
             'productId'   => (int)$product->getId(),
             'priceFormat' => $this->_localeFormat->getPriceFormat(),
             'prices'      => [
+                'baseOldPrice' => [
+                    'amount'      => $priceInfo->getPrice('regular_price')->getAmount()->getBaseAmount() * 1,
+                    'adjustments' => []
+                ],
                 'oldPrice'   => [
                     'amount'      => $priceInfo->getPrice('regular_price')->getAmount()->getValue() * 1,
                     'adjustments' => []

app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php

@@ -303,6 +303,11 @@ protected function getOptionPrices()
 
             $prices[$product->getId()] =
                 [
+                    'baseOldPrice' => [
+                        'amount' => $this->localeFormat->getNumber(
+                            $priceInfo->getPrice('regular_price')->getAmount()->getBaseAmount()
+                        ),
+                    ],
                     'oldPrice' => [
                         'amount' => $this->localeFormat->getNumber(
                             $priceInfo->getPrice('regular_price')->getAmount()->getValue()

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Variations/Prices.php

@@ -39,6 +39,9 @@ public function getFormattedPrices(\Magento\Framework\Pricing\PriceInfo\Base $pr
         $finalPrice = $priceInfo->getPrice('final_price');
 
         return [
+            'baseOldPrice' => [
+                'amount' => $this->localeFormat->getNumber($regularPrice->getAmount()->getBaseAmount()),
+            ],
             'oldPrice' => [
                 'amount' => $this->localeFormat->getNumber($regularPrice->getAmount()->getValue()),
             ],

app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php

@@ -254,8 +254,11 @@ public function cacheKeyProvider(): array
      * @param string|null $priceCurrency
      * @param int|null $customerGroupId
      */
-    public function testGetCacheKeyInfo(array $expected, ?string $priceCurrency = null, ?int $customerGroupId = null)
-    {
+    public function testGetCacheKeyInfo(
+        array $expected,
+        ?string $priceCurrency = null,
+        ?int $customerGroupId = null
+    ): void {
         $storeMock = $this->getMockBuilder(StoreInterface::class)
             ->setMethods(['getCurrentCurrency'])
             ->getMockForAbstractClass();
@@ -282,7 +285,7 @@ public function testGetCacheKeyInfo(array $expected, ?string $priceCurrency = nu
     /**
      * Check that getJsonConfig() method returns expected value
      */
-    public function testGetJsonConfig()
+    public function testGetJsonConfig(): void
     {
         $productId = 1;
         $amount = 10.50;
@@ -347,6 +350,9 @@ public function testGetJsonConfig()
             ->with($priceInfoMock)
             ->willReturn(
                 [
+                    'baseOldPrice' => [
+                        'amount' => $amount,
+                    ],
                     'oldPrice' => [
                         'amount' => $amount,
                     ],
@@ -386,6 +392,9 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage):
             'currencyFormat' => '%s',
             'optionPrices' => [
                 $productId => [
+                    'baseOldPrice' => [
+                        'amount' => $amount,
+                    ],
                     'oldPrice' => [
                         'amount' => $amount,
                     ],
@@ -403,12 +412,15 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage):
                         ],
                     ],
                     'msrpPrice' => [
-                        'amount' => null    ,
+                        'amount' => null,
                     ]
                 ],
             ],
             'priceFormat' => [],
             'prices' => [
+                'baseOldPrice' => [
+                    'amount' => $amount,
+                ],
                 'oldPrice' => [
                     'amount' => $amount,
                 ],
@@ -434,7 +446,7 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage):
      * @param MockObject $productMock
      * @return MockObject
      */
-    private function getProductTypeMock(MockObject $productMock)
+    private function getProductTypeMock(MockObject $productMock): MockObject
     {
         $currencyMock = $this->getMockBuilder(Currency::class)
             ->disableOriginalConstructor()

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php

@@ -36,9 +36,12 @@ protected function setUp(): void
         );
     }
 
-    public function testGetFormattedPrices()
+    public function testGetFormattedPrices(): void
     {
         $expected = [
+            'baseOldPrice' => [
+                'amount' => 1000
+            ],
             'oldPrice' => [
                 'amount' => 500
             ],
@@ -60,8 +63,8 @@ public function testGetFormattedPrices()
 
         $this->localeFormatMock->expects($this->atLeastOnce())
             ->method('getNumber')
-            ->withConsecutive([500], [1000], [500])
-            ->will($this->onConsecutiveCalls(500, 1000, 500));
+            ->withConsecutive([1000], [500], [1000], [500])
+            ->will($this->onConsecutiveCalls(1000, 500, 1000, 500));
 
         $this->assertEquals($expected, $this->model->getFormattedPrices($priceInfoMock));
     }

app/code/Magento/Tax/Pricing/Render/Adjustment.php

@@ -38,6 +38,8 @@ public function __construct(
     }
 
     /**
+     * Apply the right HTML output to the adjustment
+     *
      * @return string
      */
     protected function apply()
@@ -173,4 +175,16 @@ public function displayPriceExcludingTax()
     {
         return $this->taxHelper->displayPriceExcludingTax();
     }
+
+    /**
+     * Obtain a value for data-price-type attribute
+     *
+     * @return string
+     */
+    public function getDataPriceType(): string
+    {
+        return $this->amountRender->getPriceType() === 'finalPrice'
+            ? 'basePrice'
+            : 'base' . ucfirst($this->amountRender->getPriceType());
+    }
 }

app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml

@@ -6,12 +6,13 @@
 ?>
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
+<?php /** @var $escaper \Magento\Framework\Escaper */ ?>
 
-<?php if ($block->displayBothPrices()) : ?>
-    <span id="<?= $block->escapeHtmlAttr($block->buildIdWithPrefix('price-excluding-tax-')) ?>"
-          data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"
+<?php if ($block->displayBothPrices()): ?>
+    <span id="<?= $escaper->escapeHtmlAttr($block->buildIdWithPrefix('price-excluding-tax-')) ?>"
+          data-label="<?= $escaper->escapeHtmlAttr(__('Excl. Tax')) ?>"
           data-price-amount="<?= /* @noEscape */ $block->getRawAmount() ?>"
-          data-price-type="basePrice"
+          data-price-type="<?= $escaper->escapeHtmlAttr($block->getDataPriceType()); ?>"
           class="price-wrapper price-excluding-tax">
         <span class="price"><?= /* @noEscape */ $block->getDisplayAmountExclTax() ?></span></span>
 <?php endif; ?>

dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/PriceTest.php

@@ -116,20 +116,23 @@ public function childProductsDataProvider(): array
                 ],
                 'expected_data' => [
                     [
+                        'baseOldPrice' => ['amount' => 150],
                         'oldPrice' => ['amount' => 150],
                         'basePrice' => ['amount' => 50],
                         'finalPrice' => ['amount' => 50],
                         'tierPrices' => [],
                         'msrpPrice' => ['amount' => null],
                     ],
                     [
+                        'baseOldPrice' => ['amount' => 150],
                         'oldPrice' => ['amount' => 150],
                         'basePrice' => ['amount' => 58.55],
                         'finalPrice' => ['amount' => 58.55],
                         'tierPrices' => [],
                         'msrpPrice' => ['amount' => null],
                     ],
                     [
+                        'baseOldPrice' => ['amount' => 150],
                         'oldPrice' => ['amount' => 150],
                         'basePrice' => ['amount' => 75],
                         'finalPrice' => ['amount' => 75],