ACP2E-1634: display taxes according to tax configuration

Author: alzota

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

@@ -22,7 +22,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
@@ -20,12 +20,18 @@ class MinimalTierPriceCalculator implements MinimalPriceCalculatorInterface
      */
     private $calculator;
 
+    /**
+     * @var null
+     */
+    private $lowestTierPrice;
+
     /**
      * @param CalculatorInterface $calculator
      */
     public function __construct(CalculatorInterface $calculator)
     {
         $this->calculator = $calculator;
+        $this->lowestTierPrice = null;
     }
 
     /**
@@ -39,15 +45,19 @@ public function getValue(SaleableInterface $saleableItem)
         /** @var TierPrice $price */
         $price = $saleableItem->getPriceInfo()->getPrice(TierPrice::PRICE_CODE);
         $tierPriceList = $price->getTierPriceList();
+        $finalPrice = $saleableItem->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue();
 
-        $tierPrices = [];
+        $minPrice = $finalPrice;
         foreach ($tierPriceList as $tierPrice) {
             /** @var AmountInterface $price */
             $price = $tierPrice['price'];
-            $tierPrices[] = $price->getValue();
+            if ($minPrice > $price->getValue()) {
+                $minPrice = $price->getValue();
+                $this->lowestTierPrice = $price;
+            }
         }
 
-        return $tierPrices ? min($tierPrices) : null;
+        return $this->lowestTierPrice?->getValue();
     }
 
     /**
@@ -59,9 +69,6 @@ public function getValue(SaleableInterface $saleableItem)
     public function getAmount(SaleableInterface $saleableItem)
     {
         $value = $this->getValue($saleableItem);
-
-        return $value === null
-            ? null
-            : $this->calculator->getAmount($value, $saleableItem, 'tax');
+        return $value === null ? null : $this->lowestTierPrice;
     }
 }

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/view/base/templates/product/price/final_price.phtml

@@ -34,7 +34,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 :?>