AC-13171: Fixed Product Tax (FPT) is not displaying separately with configurable products

Removed unwanted assignments and calculations and refactored code

Author: sumesh-GL

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

@@ -32,24 +32,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * Format price using the store's price format
-     *
-     * @param float $amount
-     * @param array $priceFormat
-     * @return string
-     */
-    private function formatPrice(float $amount, array $priceFormat): string
-    {
-        $pattern = $priceFormat['pattern'] ?? '%s';
-        $precision = $priceFormat['precision'] ?? 2;
-        $decimalSymbol = $priceFormat['decimalSymbol'] ?? '.';
-        $groupSymbol = $priceFormat['groupSymbol'] ?? ',';
-
-        $formatted = number_format($amount, $precision, $decimalSymbol, $groupSymbol);
-        return str_replace('%s', $formatted, $pattern);
-    }
-
     /**
      * Add FPT data to option prices
      *
@@ -104,7 +86,6 @@ private function shouldProcessWeee(?array $config): bool
     private function addWeeeDataToProduct(array &$config, string $productId, $product): void
     {
         $weeeAttributes = $this->weeeHelper->getProductWeeeAttributesForDisplay($product);
-        $config['optionPrices'][$productId]['weeeAttributes'] = [];
 
         if (empty($weeeAttributes)) {
             return;
@@ -156,8 +137,8 @@ private function processWeeeAttributes(array $weeeAttributes): array
      */
     private function addFormattedWeeeData(array &$config, string $productId, array $weeeData): void
     {
-        $config['optionPrices'][$productId]['weeeAttributes'] = $weeeData['attributes'];
-        $basePriceAmount = $config['optionPrices'][$productId]['finalPrice']['amount'] - $weeeData['total'];
+        $finalPriceAmount = $config['optionPrices'][$productId]['finalPrice']['amount'];
+        $basePriceAmount = $finalPriceAmount - $weeeData['total'];
 
         $formattedWeeeAttributes = [];
         foreach ($weeeData['attributes'] as $weeeAttr) {
@@ -174,9 +155,24 @@ private function addFormattedWeeeData(array &$config, string $productId, array $
         $config['optionPrices'][$productId]['finalPrice']['formattedWithoutWeee'] =
             $this->formatPrice($basePriceAmount, $config['priceFormat']);
         $config['optionPrices'][$productId]['finalPrice']['formattedWithWeee'] =
-            $this->formatPrice(
-                $config['optionPrices'][$productId]['finalPrice']['amount'],
-                $config['priceFormat']
-            );
+            $this->formatPrice($finalPriceAmount, $config['priceFormat']);
+    }
+
+    /**
+     * Format price using the store's price format
+     *
+     * @param float $amount
+     * @param array $priceFormat
+     * @return string
+     */
+    private function formatPrice(float $amount, array $priceFormat): string
+    {
+        $pattern = $priceFormat['pattern'] ?? '%s';
+        $precision = $priceFormat['precision'] ?? 2;
+        $decimalSymbol = $priceFormat['decimalSymbol'] ?? '.';
+        $groupSymbol = $priceFormat['groupSymbol'] ?? ',';
+
+        $formatted = number_format($amount, $precision, $decimalSymbol, $groupSymbol);
+        return str_replace('%s', $formatted, $pattern);
     }
 }

app/code/Magento/Weee/view/frontend/web/js/price-box-mixin.js

@@ -128,22 +128,18 @@ define([
              */
             _getWeeeData: function(productId) {
                 var swatchWidget = this._getSwatchWidget(),
-                    configurableWidget,
+                    configurableWidget = this._getConfigurableWidget(),
+                    jsonConfig = (swatchWidget && swatchWidget.options.jsonConfig) ||
+                        (configurableWidget && configurableWidget.options.spConfig),
                     optionPrices;
 
-                if (swatchWidget && swatchWidget.options.jsonConfig) {
-                    optionPrices = swatchWidget.options.jsonConfig.optionPrices;
-                    if (optionPrices && optionPrices[productId] && optionPrices[productId].finalPrice) {
-                        return optionPrices[productId].finalPrice;
-                    }
+                if (!jsonConfig) {
+                    return null;
                 }
 
-                configurableWidget = this._getConfigurableWidget();
-                if (configurableWidget && configurableWidget.options.spConfig) {
-                    optionPrices = configurableWidget.options.spConfig.optionPrices;
-                    if (optionPrices && optionPrices[productId] && optionPrices[productId].finalPrice) {
-                        return optionPrices[productId].finalPrice;
-                    }
+                optionPrices = jsonConfig.optionPrices;
+                if (optionPrices && optionPrices[productId] && optionPrices[productId].finalPrice) {
+                    return optionPrices[productId].finalPrice;
                 }
 
                 return null;