fix tier price show only including price

engcom-Charlie · engcom-Charlie · commit e4be19bc290e · 2020-09-10T14:02:00.000+03:00
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -9,19 +9,27 @@
 use Magento\Catalog\Model\Product;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
 use Magento\Customer\Model\Group\RetrieverInterface as CustomerGroupRetrieverInterface;
+use Magento\Tax\Model\Config;
 
 /**
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class TierPrice extends AbstractPrice implements TierPriceInterface, BasePriceProviderInterface
 {
+    private const XML_PATH_TAX_DISPLAY_TYPE = 'tax/display/type';
+
     /**
      * Price type tier
      */
@@ -61,42 +69,44 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      * @var CustomerGroupRetrieverInterface
      */
     private $customerGroupRetriever;
+
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param CalculatorInterface $calculator
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param PriceCurrencyInterface $priceCurrency
      * @param Session $customerSession
      * @param GroupManagementInterface $groupManagement
      * @param CustomerGroupRetrieverInterface|null $customerGroupRetriever
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         CalculatorInterface $calculator,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        PriceCurrencyInterface $priceCurrency,
         Session $customerSession,
         GroupManagementInterface $groupManagement,
         CustomerGroupRetrieverInterface $customerGroupRetriever = null,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
         $quantity = (float)$quantity ? $quantity : 1;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->customerSession = $customerSession;
         $this->groupManagement = $groupManagement;
         $this->customerGroupRetriever = $customerGroupRetriever
-            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomerGroupRetrieverInterface::class);
+            ?? ObjectManager::getInstance()->get(CustomerGroupRetrieverInterface::class);
         if ($saleableItem->hasCustomerGroupId()) {
             $this->customerGroup = (int) $saleableItem->getCustomerGroupId();
         } else {
             $this->customerGroup = (int) $this->customerGroupRetriever->getCustomerGroupId();
         }
-        $this->scopeConfig = $scopeConfig;
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -142,6 +152,8 @@ protected function isFirstPriceBetter($firstPrice, $secondPrice)
     }
 
     /**
+     * Returns tier price count
+     *
      * @return int
      */
     public function getTierPriceCount()
@@ -150,6 +162,8 @@ public function getTierPriceCount()
     }
 
     /**
+     * Returns tier price list
+     *
      * @return array
      */
     public function getTierPriceList()
@@ -161,18 +175,32 @@ public function getTierPriceList()
                 $this->priceList,
                 function (&$priceData) {
                     /* convert string value to float */
-                    $priceData['price_qty'] = $priceData['price_qty'] * 1;
-                    $priceData['price'] = $this->applyAdjustment($priceData['price']);
-                    if ($this->scopeConfig->getValue('tax/display/type') == 3) {
-                        $priceData['excl_tax_price'] = $this->applyAdjustment($priceData['excl_tax_price'], true);
+                    $priceData['price_qty'] *= 1;
+                    if ($this->getConfigTaxDisplayType() === Config::DISPLAY_TYPE_BOTH) {
+                        $exclTaxPrice = $this->calculator->getAmount($priceData['price'], $this->product, true);
+                        $priceData['excl_tax_price'] = $exclTaxPrice;
                     }
+                    $priceData['price'] = $this->applyAdjustment($priceData['price']);
                 }
             );
         }
+
         return $this->priceList;
     }
 
     /**
+     * Returns config tax display type
+     *
+     * @return int
+     */
+    private function getConfigTaxDisplayType(): int
+    {
+        return (int) $this->scopeConfig->getValue(self::XML_PATH_TAX_DISPLAY_TYPE);
+    }
+
+    /**
+     * Filters tier prices
+     *
      * @param array $priceList
      * @return array
      */
@@ -213,6 +241,8 @@ protected function filterTierPrices(array $priceList)
     }
 
     /**
+     * Returns base price
+     *
      * @return float
      */
     protected function getBasePrice()
@@ -222,27 +252,24 @@ protected function getBasePrice()
     }
 
     /**
-     * Calculates savings percentage according to the given tier price amount
-     * and related product price amount.
+     * Calculates savings percentage according to the given tier price amount and related product price amount.
      *
      * @param AmountInterface $amount
-     *
      * @return float
      */
     public function getSavePercent(AmountInterface $amount)
     {
-        $productPriceAmount = $this->priceInfo->getPrice(
-            FinalPrice::PRICE_CODE
-        )->getAmount();
+        $productPriceAmount = $this->priceInfo->getPrice(FinalPrice::PRICE_CODE)
+            ->getAmount();
 
-        return round(
-            100 - ((100 / $productPriceAmount->getValue()) * $amount->getValue())
-        );
+        return round(100 - ((100 / $productPriceAmount->getValue()) * $amount->getValue()));
     }
 
     /**
+     * Apply adjustment to price
+     *
      * @param float|string $price
-     * @return \Magento\Framework\Pricing\Amount\AmountInterface
+     * @return AmountInterface
      */
     protected function applyAdjustment($price)
     {
@@ -323,6 +350,8 @@ protected function getStoredTierPrices()
     }
 
     /**
+     * Return is percentage discount
+     *
      * @return bool
      */
     public function isPercentageDiscount()
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -7,6 +7,7 @@
  */
 namespace Magento\ConfigurableProduct\Block\Product\View\Type;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
@@ -287,49 +288,65 @@ protected function getOptionPrices()
     {
         $prices = [];
         foreach ($this->getAllowProducts() as $product) {
-            $tierPrices = [];
             $priceInfo = $product->getPriceInfo();
-            $tierPriceModel =  $priceInfo->getPrice('tier_price');
-            $tierPricesList = $tierPriceModel->getTierPriceList();
-            foreach ($tierPricesList as $tierPrice) {
-                $tierPrices[] = [
-                    'qty' => $this->localeFormat->getNumber($tierPrice['price_qty']),
-                    'price' => $this->localeFormat->getNumber($tierPrice['price']->getValue()),
-                    'excl_tax_price' => (is_object($tierPrice['excl_tax_price'])) ? $this->localeFormat->getNumber($tierPrice['excl_tax_price']->getValue()) : $tierPrice['base_price'],
-                    'percentage' => $this->localeFormat->getNumber(
-                        $tierPriceModel->getSavePercent($tierPrice['price'])
-                    ),
-                ];
-            }
 
-            $prices[$product->getId()] =
-                [
-                    'oldPrice' => [
-                        'amount' => $this->localeFormat->getNumber(
-                            $priceInfo->getPrice('regular_price')->getAmount()->getValue()
-                        ),
-                    ],
-                    'basePrice' => [
-                        'amount' => $this->localeFormat->getNumber(
-                            $priceInfo->getPrice('final_price')->getAmount()->getBaseAmount()
-                        ),
-                    ],
-                    'finalPrice' => [
-                        'amount' => $this->localeFormat->getNumber(
-                            $priceInfo->getPrice('final_price')->getAmount()->getValue()
-                        ),
-                    ],
-                    'tierPrices' => $tierPrices,
-                    'msrpPrice' => [
-                        'amount' => $this->localeFormat->getNumber(
-                            $product->getMsrp()
-                        ),
-                    ],
-                 ];
+            $prices[$product->getId()] = [
+                'oldPrice' => [
+                    'amount' => $this->localeFormat->getNumber(
+                        $priceInfo->getPrice('regular_price')->getAmount()->getValue()
+                    ),
+                ],
+                'basePrice' => [
+                    'amount' => $this->localeFormat->getNumber(
+                        $priceInfo->getPrice('final_price')->getAmount()->getBaseAmount()
+                    ),
+                ],
+                'finalPrice' => [
+                    'amount' => $this->localeFormat->getNumber(
+                        $priceInfo->getPrice('final_price')->getAmount()->getValue()
+                    ),
+                ],
+                'tierPrices' => $this->getTierPricesByProduct($product),
+                'msrpPrice' => [
+                    'amount' => $this->localeFormat->getNumber(
+                        $product->getMsrp()
+                    ),
+                ],
+            ];
         }
+
         return $prices;
     }
 
+    /**
+     * Returns product's tier prices list
+     *
+     * @param ProductInterface $product
+     * @return array
+     */
+    private function getTierPricesByProduct(ProductInterface $product): array
+    {
+        $tierPrices = [];
+        $tierPriceModel = $product->getPriceInfo()->getPrice('tier_price');
+        foreach ($tierPriceModel->getTierPriceList() as $tierPrice) {
+            $tierPriceData = [
+                'qty' => $this->localeFormat->getNumber($tierPrice['price_qty']),
+                'price' => $this->localeFormat->getNumber($tierPrice['price']->getValue()),
+                'percentage' => $this->localeFormat->getNumber(
+                    $tierPriceModel->getSavePercent($tierPrice['price'])
+                ),
+            ];
+
+            if (isset($tierPrice['excl_tax_price'])) {
+                $excludingTax = $tierPrice['excl_tax_price'];
+                $tierPriceData['excl_tax_price'] = $this->localeFormat->getNumber($excludingTax->getBaseAmount());
+            }
+            $tierPrices[] = $tierPriceData;
+        }
+
+        return $tierPrices;
+    }
+
     /**
      * Replace ',' on '.' for js
      *
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
@@ -11,7 +11,6 @@
                 + '<span data-price-amount="' + priceUtils.formatPrice(item.price, currencyFormat) + '"'
                 + ' data-price-type=""' + ' class="price-wrapper ">'
                 + '<span class="price">' + priceUtils.formatPrice(item.price, currencyFormat) + '</span>'
-                + '<span class="price"> excl. tax ' + priceUtils.formatPrice(item.excl_tax_price, currencyFormat) + '</span>
                 + '</span>'
             + '</span>'; %>
         <li class="item">
@@ -22,6 +21,11 @@
                 <?= $block->escapeHtml(__('save')) ?><span
                         class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
             </strong>
+            <%  if (item['excl_tax_price']) { %>
+                <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+                    <span class="price"><%= priceUtils.formatPrice(item['excl_tax_price'], currencyFormat) %></span>
+                </span>
+            <% } %>
         </li>
         <% }); %>
     </ul>
diff --git a/app/design/frontend/Magento/blank/web/css/source/_price.less b/app/design/frontend/Magento/blank/web/css/source/_price.less
@@ -73,4 +73,20 @@
 
     .price-style-1();
     .price-style-3();
+
+    .prices-tier.items {
+        .price-excluding-tax {
+            display: block;
+
+            &:before {
+                content: attr(data-label) ': ';
+                .lib-font-size(11);
+            }
+
+            .price {
+                font-size: 1.2rem;
+                font-weight: 700;
+            }
+        }
+    }
 }
