MAGETWO-31324: Tax labels aren't displayed for Bundle options of "multiple select" & "drop-down" types

- javascript fix and option template restored to the data.* fromat + unit test

Author: Cristian Partica

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -17,9 +17,9 @@ define([
         qtyFieldSelector: 'input.qty',
         priceBoxSelector: '.price-box',
         optionHandlers: {},
-        optionTemplate: '<%- label %>' +
-        '<% if (finalPrice.value) { %>' +
-        ' +<%- finalPrice.formatted %>' +
+        optionTemplate: '<%- data.label %>' +
+        '<% if (data.finalPrice.value) { %>' +
+        ' +<%- data.finalPrice.formatted %>' +
         '<% } %>',
         controlContainer: 'dd', // should be eliminated
         priceFormat: {},
@@ -163,7 +163,9 @@ define([
                     }
 
                     toTemplate = {
-                        label: optionConfig[optionValue] && optionConfig[optionValue].name
+                        data: {
+                            label: optionConfig[optionValue] && optionConfig[optionValue].name
+                        }
                     };
                     prices = optionConfig[optionValue].prices;
 
@@ -172,7 +174,7 @@ define([
                         value += _.reduce(price.adjustments, function (sum, x) {
                             return sum + x;
                         }, 0);
-                        toTemplate[type] = {
+                        toTemplate.data[type] = {
                             value: value,
                             formatted: utils.formatPrice(value, format)
                         };

app/code/Magento/Tax/Model/Observer.php

@@ -310,17 +310,17 @@ public function updateProductOptions(\Magento\Framework\Event\Observer $observer
         // prepare correct template for options render
         if ($this->_taxData->displayBothPrices()) {
             $options['optionTemplate'] = sprintf(
-                '<%%= label %%>'
-                . '<%% if (finalPrice.value) { %%>'
-                . ' <%%= finalPrice.formatted %%> (%1$s <%%= basePrice.formatted %%>)'
+                '<%%= data.label %%>'
+                . '<%% if (data.finalPrice.value) { %%>'
+                . ' <%%= data.finalPrice.formatted %%> (%1$s <%%= data.basePrice.formatted %%>)'
                 . '<%% } %%>',
                 __('Excl. tax:')
             );
         } elseif ($this->_taxData->priceIncludesTax() && $this->_taxData->displayPriceExcludingTax()) {
             $options['optionTemplate'] = sprintf(
-                '<%%= label %%>'
-                . '<%% if (basePrice.value) { %%>'
-                . ' <%%= basePrice.formatted %%>'
+                '<%%= data.label %%>'
+                . '<%% if (data.basePrice.value) { %%>'
+                . ' <%%= data.basePrice.formatted %%>'
                 . '<%% } %%>'
             );
         }

app/code/Magento/Tax/Test/Unit/Model/ObserverTest.php

@@ -90,8 +90,8 @@ public function dataProviderUpdateProductOptions()
             [
                 'expected' => [
                     'calculationAlgorithm' => 'TOTAL_BASE_CALCULATION',
-                    'optionTemplate' => '<%= label %><% if (finalPrice.value) '.
-                        '{ %> <%= finalPrice.formatted %> (Excl. tax: <%= basePrice.formatted %>)<% } %>',
+                    'optionTemplate' => '<%= data.label %><% if (data.finalPrice.value) '.
+                        '{ %> <%= data.finalPrice.formatted %> (Excl. tax: <%= data.basePrice.formatted %>)<% } %>',
                 ],
                 'displayBothPrices' => true,
                 'priceIncludesTax' => false,
@@ -100,7 +100,7 @@ public function dataProviderUpdateProductOptions()
             [
                 'expected' => [
                     'calculationAlgorithm' => 'TOTAL_BASE_CALCULATION',
-                    'optionTemplate' => '<%= label %><% if (basePrice.value) { %> <%= basePrice.formatted %><% } %>',
+                    'optionTemplate' => '<%= data.label %><% if (data.basePrice.value) { %> <%= data.basePrice.formatted %><% } %>',
                 ],
                 'displayBothPrices' => false,
                 'priceIncludesTax' => true,