ACP2E-1456: display bundle options taking into account catalog tax configurations

Author: alzota

app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php

@@ -48,28 +48,36 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      */
     private $catalogHelper;
 
+    /**
+     * @var \Magento\Tax\Helper\Data|mixed
+     */
+    private $taxHelper;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfiguration
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param \Magento\Catalog\Helper\Data|null $catalogHelper
+     * @param \Magento\Tax\Helper\Data|null $taxHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Catalog\Helper\Product\Configuration $productConfiguration,
         \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        \Magento\Catalog\Helper\Data $catalogHelper = null
+        \Magento\Catalog\Helper\Data $catalogHelper = null,
+        \Magento\Tax\Helper\Data $taxHelper = null
     ) {
         $this->productConfiguration = $productConfiguration;
         $this->pricingHelper = $pricingHelper;
         $this->escaper = $escaper;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         $this->catalogHelper = $catalogHelper ?? ObjectManager::getInstance()->get(\Magento\Catalog\Helper\Data::class);
+        $this->taxHelper = $taxHelper ?? ObjectManager::getInstance()->get(\Magento\Tax\Helper\Data::class);
         parent::__construct($context);
     }
 
@@ -104,16 +112,14 @@ public function getSelectionFinalPrice(ItemInterface $item, \Magento\Catalog\Mod
         /** @var \Magento\Bundle\Model\Product\Price $price */
         $price = $product->getPriceModel();
 
-        $selectionPrice = $price->getSelectionFinalTotalPrice(
+        return $price->getSelectionFinalTotalPrice(
             $product,
             $selectionProduct,
             $item->getQty(),
             $this->getSelectionQty($product, $selectionProduct->getSelectionId()),
             false,
             true
         );
-
-        return $this->catalogHelper->getTaxPrice($selectionProduct, $selectionPrice);
     }
 
     /**
@@ -162,12 +168,25 @@ public function getBundleOptions(ItemInterface $item)
                         foreach ($bundleSelections as $bundleSelection) {
                             $qty = $this->getSelectionQty($product, $bundleSelection->getSelectionId()) * 1;
                             if ($qty) {
+                                $selectionPrice = $this->getSelectionFinalPrice($item, $bundleSelection);
+                                $selectionFinalPrice = $this->catalogHelper->getTaxPrice($item, $selectionPrice);
+
+                                $displayBothPrices = $this->taxHelper->displayBothPrices();
+                                if ($displayBothPrices) {
+                                    $selectionFinalPrice = $this->catalogHelper->getTaxPrice($item, $selectionPrice, true);
+                                    $selectionFinalPriceExclTax = $this->catalogHelper->getTaxPrice($item, $selectionPrice, false);
+                                }
                                 $option['value'][] = $qty . ' x '
                                     . $this->escaper->escapeHtml($bundleSelection->getName())
                                     . ' '
                                     . $this->pricingHelper->currency(
-                                        $this->getSelectionFinalPrice($item, $bundleSelection)
-                                    );
+                                        $selectionFinalPrice
+                                    )
+                                    . ' '
+                                    . ($displayBothPrices ? __('Excl. tax:') . ' '
+                                    . $this->pricingHelper->currency(
+                                        $selectionFinalPriceExclTax
+                                    ) : '');
                                 $option['has_html'] = true;
                             }
                         }

app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php

@@ -62,6 +62,11 @@ class ConfigurationTest extends TestCase
      */
     private $catalogHelper;
 
+    /**
+     * @var \Magento\Tax\Helper\Data|MockObject
+     */
+    private $taxHelper;
+
     /**
      * @inheritDoc
      */
@@ -78,6 +83,7 @@ protected function setUp(): void
             ->onlyMethods(['unserialize'])
             ->getMockForAbstractClass();
         $this->catalogHelper = $this->createPartialMock(\Magento\Catalog\Helper\Data::class, ['getTaxPrice']);
+        $this->taxHelper = $this->createPartialMock(\Magento\Tax\Helper\Data::class, ['displayBothPrices']);
 
         $this->serializer->expects($this->any())
             ->method('unserialize')
@@ -94,7 +100,8 @@ function ($value) {
                 'productConfiguration' => $this->productConfiguration,
                 'escaper' => $this->escaper,
                 'serializer' => $this->serializer,
-                'catalogHelper' => $this->catalogHelper
+                'catalogHelper' => $this->catalogHelper,
+                'taxHelper' => $this->taxHelper
             ]
         );
     }
@@ -271,7 +278,11 @@ public function testGetOptions(): void
             ->willReturn('name');
         $this->catalogHelper->expects($this->any())
             ->method('getTaxPrice')
+            ->with($itemOption, 15)
             ->willReturn(15);
+        $this->taxHelper->expects($this->any())
+            ->method('displayBothPrices')
+            ->willReturn(false);
         $this->pricingHelper->expects($this->once())->method('currency')->with(15)
             ->willReturn('<span class="price">$15.00</span>');
         $priceModel->expects($this->once())->method('getSelectionFinalTotalPrice')->willReturn(15);