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

- fix for the optionTemplate "data." was not needed, config format for price-bundle.js

Author: Cristian Partica

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(
-                '<%%= data.label %%>'
-                . '<%% if (data.finalPrice.value) { %%>'
-                . ' <%%= data.finalPrice.formatted %%> (%1$s <%%= data.basePrice.formatted %%>)'
+                '<%%= label %%>'
+                . '<%% if (finalPrice.value) { %%>'
+                . ' <%%= finalPrice.formatted %%> (%1$s <%%= basePrice.formatted %%>)'
                 . '<%% } %%>',
                 __('Excl. tax:')
             );
         } elseif ($this->_taxData->priceIncludesTax() && $this->_taxData->displayPriceExcludingTax()) {
             $options['optionTemplate'] = sprintf(
-                '<%%= data.label %%>'
-                . '<%% if (data.basePrice.value) { %%>'
-                . ' <%%= data.basePrice.formatted %%>'
+                '<%%= label %%>'
+                . '<%% if (basePrice.value) { %%>'
+                . ' <%%= basePrice.formatted %%>'
                 . '<%% } %%>'
             );
         }

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

@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Test class for \Magento\Weee\Model\Observer
+ */
+namespace Magento\Tax\Test\Unit\Model;
+
+use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ObserverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Tests the methods that rely on the ScopeConfigInterface object to provide their return values
+     * @param array $expected
+     * @param bool $displayBothPrices
+     * @param bool $priceIncludesTax
+     * @param bool $displayPriceExcludingTax
+     * @dataProvider dataProviderUpdateProductOptions
+     */
+    public function testUpdateProductOptions($expected, $displayBothPrices, $priceIncludesTax, $displayPriceExcludingTax)
+    {
+
+        $frameworkObject= new \Magento\Framework\Object();
+        $frameworkObject->setAdditionalOptions([]);
+
+        $product=$this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
+
+        $registry=$this->getMock('Magento\Framework\Registry', [], [], '', false);
+        $registry->expects($this->any())
+            ->method('registry')
+            ->with('current_product')
+            ->will($this->returnValue($product));
+
+        $taxData=$this->getMock('Magento\Tax\Helper\Data', [], [], '', false);
+        $taxData->expects($this->any())
+            ->method('getCalculationAlgorithm')
+            ->will($this->returnValue('TOTAL_BASE_CALCULATION'));
+
+        $taxData->expects($this->any())
+            ->method('displayBothPrices')
+            ->will($this->returnValue($displayBothPrices));
+
+        $taxData->expects($this->any())
+            ->method('priceIncludesTax')
+            ->will($this->returnValue($priceIncludesTax));
+
+        $taxData->expects($this->any())
+            ->method('displayPriceExcludingTax')
+            ->will($this->returnValue($displayPriceExcludingTax));
+
+        $eventObject=$this->getMock('Magento\Framework\Event', ['getResponseObject'], [], '', false);
+        $eventObject->expects($this->any())
+            ->method('getResponseObject')
+            ->will($this->returnValue($frameworkObject));
+
+        $observerObject=$this->getMock('Magento\Framework\Event\Observer', [], [], '', false);
+
+        $observerObject->expects($this->any())
+            ->method('getEvent')
+            ->will($this->returnValue($eventObject));
+
+         $objectManager = new ObjectManager($this);
+         $taxObserverObject = $objectManager->getObject(
+             'Magento\Tax\Model\Observer',
+             [
+                 'taxData' => $taxData,
+                 'registry' => $registry,
+             ]
+         );
+
+         $taxObserverObject->updateProductOptions($observerObject);
+
+         $this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateProductOptions()
+    {
+        return [
+            [
+                'expected' => [
+                    'calculationAlgorithm' => 'TOTAL_BASE_CALCULATION',
+                    'optionTemplate' => '<%= label %><% if (finalPrice.value) { %> <%= finalPrice.formatted %> (Excl. tax: <%= basePrice.formatted %>)<% } %>',
+                ],
+                'displayBothPrices' => true,
+                'priceIncludesTax' => false,
+                'displayPriceExcludingTax' => false,
+            ],
+            [
+                'expected' => [
+                    'calculationAlgorithm' => 'TOTAL_BASE_CALCULATION',
+                    'optionTemplate' => '<%= label %><% if (basePrice.value) { %> <%= basePrice.formatted %><% } %>',
+                ],
+                'displayBothPrices' => false,
+                'priceIncludesTax' => true,
+                'displayPriceExcludingTax' => true,
+            ],
+            [
+                'expected' => [
+                    'calculationAlgorithm' => 'TOTAL_BASE_CALCULATION',
+                ],
+                'displayBothPrices' => false,
+                'priceIncludesTax' => false,
+                'displayPriceExcludingTax' => false,
+            ],
+        ];
+    }
+}