ACP2E-1456: display bundle options taking into account cart tax configurations; fixed unit tests

Author: alzota

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

@@ -197,7 +197,6 @@ private function getOptionPriceHtml(ItemInterface $item, ProductInterface $bundl
         $qty = $this->getSelectionQty($item->getProduct(), $bundleSelection->getSelectionId()) * 1;
         if ($qty) {
             $selectionPrice = $this->getSelectionFinalPrice($item, $bundleSelection);
-            $selectionFinalPrice = $this->taxHelper->getTaxPrice($item->getProduct(), $selectionPrice);
 
             $displayCartPricesBoth = $this->taxHelper->displayCartPricesBoth();
             if ($displayCartPricesBoth) {
@@ -207,6 +206,8 @@ private function getOptionPriceHtml(ItemInterface $item, ProductInterface $bundl
                 $selectionFinalPriceExclTax =
                     $this->taxHelper
                         ->getTaxPrice($product, $selectionPrice, false);
+            } else {
+                $selectionFinalPrice = $this->taxHelper->getTaxPrice($item->getProduct(), $selectionPrice);
             }
             $option['value'][] = $qty . ' x '
                 . $this->escaper->escapeHtml($bundleSelection->getName())

app/code/Magento/Bundle/Pricing/Price/TaxPrice.php

@@ -8,6 +8,7 @@
 namespace Magento\Bundle\Pricing\Price;
 
 use Magento\Catalog\Model\Product;
+use Magento\Checkout\Model\Session;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Exception\LocalizedException;
@@ -68,6 +69,11 @@ class TaxPrice
      */
     private $customerGroupRepository;
 
+    /**
+     * @var Session
+     */
+    private $checkoutSession;
+
     /**
      * @param StoreManagerInterface $storeManager
      * @param TaxClassKeyInterfaceFactory $taxClassKeyFactory
@@ -77,6 +83,7 @@ class TaxPrice
      * @param TaxCalculationInterface $taxCalculationService
      * @param CustomerSession $customerSession
      * @param GroupRepositoryInterface $customerGroupRepository
+     * @param Session $checkoutSession
      */
     public function __construct(
         StoreManagerInterface            $storeManager,
@@ -86,7 +93,8 @@ public function __construct(
         QuoteDetailsItemInterfaceFactory $quoteDetailsItemFactory,
         TaxCalculationInterface          $taxCalculationService,
         CustomerSession                  $customerSession,
-        GroupRepositoryInterface         $customerGroupRepository
+        GroupRepositoryInterface         $customerGroupRepository,
+        Session                          $checkoutSession
     ) {
         $this->storeManager = $storeManager;
         $this->taxClassKeyFactory = $taxClassKeyFactory;
@@ -96,6 +104,7 @@ public function __construct(
         $this->taxCalculationService = $taxCalculationService;
         $this->customerSession = $customerSession;
         $this->customerGroupRepository = $customerGroupRepository;
+        $this->checkoutSession = $checkoutSession;
     }
 
     /**
@@ -129,6 +138,7 @@ public function getTaxPrice(
         $customerTaxClassKey = $this->taxClassKeyFactory->create();
         $item = $this->quoteDetailsItemFactory->create();
         $quoteDetails = $this->quoteDetailsFactory->create();
+        $customerQuote = $this->checkoutSession->getQuote();
 
         if ($priceIncludesTax === null) {
             $priceIncludesTax = $this->taxConfig->priceIncludesTax($store);
@@ -154,6 +164,7 @@ public function getTaxPrice(
             ->setUnitPrice($price);
 
         $quoteDetails
+            ->setShippingAddress($customerQuote->getShippingAddress()->getDataModel())
             ->setCustomerTaxClassKey($customerTaxClassKey)
             ->setItems([$item])
             ->setCustomerId($this->customerSession->getCustomerId());

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

@@ -227,7 +227,6 @@ public function testGetBundleOptionsEmptyBundleSelectionIds(): void
      * @param $includingTax
      * @param $displayCartPriceBoth
      * @return void
-     * @throws LocalizedException
      * @dataProvider getTaxConfiguration
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -275,14 +274,21 @@ public function testGetOptions($includingTax, $displayCartPriceBoth): void
             ->method('escapeHtml')
             ->with('name')
             ->willReturn('name');
-        $this->taxHelper->expects($this->any())
-            ->method('getTaxPrice')
-            ->with($product, 15, $includingTax)
-            ->willReturn(15.00);
+        if ($displayCartPriceBoth) {
+            $this->taxHelper->expects($this->any())
+                ->method('getTaxPrice')
+                ->withConsecutive([$product, 15.00, !$includingTax], [$product, 15.00, $includingTax])
+                ->willReturnOnConsecutiveCalls(15.00, 15.00);
+        } else {
+            $this->taxHelper->expects($this->any())
+                ->method('getTaxPrice')
+                ->with($product, 15.00, $includingTax)
+                ->willReturn(15.00);
+        }
         $this->taxHelper->expects($this->any())
             ->method('displayCartPricesBoth')
             ->willReturn((bool)$displayCartPriceBoth);
-        $this->pricingHelper->expects($this->once())->method('currency')->with(15.00)
+        $this->pricingHelper->expects($this->atLeastOnce())->method('currency')->with(15.00)
             ->willReturn('<span class="price">$15.00</span>');
         $priceModel->expects($this->once())->method('getSelectionFinalTotalPrice')->willReturn(15.00);
         $selectionQty->expects($this->any())->method('getValue')->willReturn(1);
@@ -317,11 +323,16 @@ public function testGetOptions($includingTax, $displayCartPriceBoth): void
         $this->productConfiguration->expects($this->once())->method('getCustomOptions')->with($this->item)
             ->willReturn([0 => ['label' => 'title', 'value' => 'value']]);
 
+        if ($displayCartPriceBoth) {
+            $value = '1 x name <span class="price">$15.00</span> Excl. tax: <span class="price">$15.00</span>';
+        } else {
+            $value = '1 x name <span class="price">$15.00</span>';
+        }
         $this->assertEquals(
             [
                 [
                     'label' => 'title',
-                    'value' => ['1 x name <span class="price">$15.00</span>'],
+                    'value' => [$value],
                     'has_html' => true
                 ],
                 ['label' => 'title', 'value' => 'value']
@@ -338,10 +349,8 @@ public function testGetOptions($includingTax, $displayCartPriceBoth): void
     public function getTaxConfiguration(): array
     {
         return [
-            [1, 0],
-            [0, 0],
-            [1, 1],
-            [0, 1]
+            [null, false],
+            [false, true]
         ];
     }
 }