AC-13075: FPT value in cart page and product page are different for same configurations for a dynamic product

Author: wip44850

app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php

@@ -121,7 +121,7 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
                 $deltaRoundingType = self::KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING;
             }
 
-            if ($round && strpos($item->getCode(), 'weee') !== false) {
+            if ($round && strpos((string) $item->getCode(), 'weee') !== false) {
                 $rowTaxPerRate = $this->calculationTool->round($rowTaxPerRate);
             } else {
                 $rowTaxPerRate = $this->roundAmount($rowTaxPerRate, $taxId, false, $deltaRoundingType, $round, $item);

app/code/Magento/Tax/Test/Unit/Model/Calculation/TotalBaseCalculatorTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2014 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
@@ -60,7 +60,7 @@ public function testCalculateWithTaxInPriceNoRounding()
     public function testCalculateWithTaxNotInPrice()
     {
         $this->initTotalBaseCalculator();
-        $this->totalBaseCalculator->expects($this->exactly(1))
+        $this->totalBaseCalculator->expects($this->exactly(2))
             ->method('deltaRound')->willReturn(0);
         $this->initMocks(false);
 

dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php

@@ -1088,30 +1088,42 @@ public static function calculateTaxTaxInclDataProvider()
         $productInclTaxWithoutStoreIdWithoutTaxClassId = $productTaxInclBase;
 
         $productInclTaxWithStoreIdWithTaxClassId['storeId'] = 1;
-        $productInclTaxWithStoreIdWithTaxClassId['quoteDetailsData']['items'][] = $quoteDetailTaxInclItemWithDefaultProductTaxClass;
+        $productInclTaxWithStoreIdWithTaxClassId['quoteDetailsData']['items'][] =
+            $quoteDetailTaxInclItemWithDefaultProductTaxClass;
         $productInclTaxWithStoreIdWithTaxClassId['expectedTaxDetails']['tax_amount'] = 0.70;
         $productInclTaxWithStoreIdWithTaxClassId['expectedTaxDetails']['subtotal'] = 9.30;
         $productInclTaxWithStoreIdWithTaxClassId['expectedTaxDetails']['applied_taxes'] = $quoteDetailAppliedTaxesBase;
-        $productInclTaxWithStoreIdWithTaxClassId['expectedTaxDetails']['items'] = $productTaxInclExpectedItemWithDefaultProductTaxClass;
+        $productInclTaxWithStoreIdWithTaxClassId['expectedTaxDetails']['items'] =
+            $productTaxInclExpectedItemWithDefaultProductTaxClass;
 
         $productInclTaxWithStoreIdWithoutTaxClassId['storeId'] = 1;
         $productInclTaxWithStoreIdWithoutTaxClassId['quoteDetailsData']['items'][] = $productTaxInclQuoteDetailItemBase;
-        $productInclTaxWithStoreIdWithoutTaxClassId['expectedTaxDetails']['items'] = $productTaxInclExpectedItemWithNoProductTaxClass;
+        $productInclTaxWithStoreIdWithoutTaxClassId['expectedTaxDetails']['items'] =
+            $productTaxInclExpectedItemWithNoProductTaxClass;
 
-        $productInclTaxWithoutStoreIdWithTaxClassId['quoteDetailsData']['items'][] = $quoteDetailTaxInclItemWithDefaultProductTaxClass;
+        $productInclTaxWithoutStoreIdWithTaxClassId['quoteDetailsData']['items'][] =
+            $quoteDetailTaxInclItemWithDefaultProductTaxClass;
         $productInclTaxWithoutStoreIdWithTaxClassId['expectedTaxDetails']['tax_amount'] = 0.70;
         $productInclTaxWithoutStoreIdWithTaxClassId['expectedTaxDetails']['subtotal'] = 9.30;
-        $productInclTaxWithoutStoreIdWithTaxClassId['expectedTaxDetails']['applied_taxes'] = $quoteDetailAppliedTaxesBase;
-        $productInclTaxWithoutStoreIdWithTaxClassId['expectedTaxDetails']['items'] = $productTaxInclExpectedItemWithDefaultProductTaxClass;
+        $productInclTaxWithoutStoreIdWithTaxClassId['expectedTaxDetails']['applied_taxes'] =
+            $quoteDetailAppliedTaxesBase;
+        $productInclTaxWithoutStoreIdWithTaxClassId['expectedTaxDetails']['items'] =
+            $productTaxInclExpectedItemWithDefaultProductTaxClass;
 
-        $productInclTaxWithoutStoreIdWithoutTaxClassId['quoteDetailsData']['items'][] = $productTaxInclQuoteDetailItemBase;
-        $productInclTaxWithoutStoreIdWithoutTaxClassId['expectedTaxDetails']['items'] = $productTaxInclExpectedItemWithNoProductTaxClass;
+        $productInclTaxWithoutStoreIdWithoutTaxClassId['quoteDetailsData']['items'][] =
+            $productTaxInclQuoteDetailItemBase;
+        $productInclTaxWithoutStoreIdWithoutTaxClassId['expectedTaxDetails']['items'] =
+            $productTaxInclExpectedItemWithNoProductTaxClass;
 
         return [
-            'product incl tax with store id, with tax class id' => $productInclTaxWithStoreIdWithTaxClassId,
-            'product incl tax with store id, without tax class id' => $productInclTaxWithStoreIdWithoutTaxClassId,
-            'product incl tax without store id, with tax class id' => $productInclTaxWithoutStoreIdWithTaxClassId,
-            'product incl tax without store id, without tax class id' => $productInclTaxWithoutStoreIdWithoutTaxClassId,
+            'product incl tax with store id, with tax class id' =>
+                $productInclTaxWithStoreIdWithTaxClassId,
+            'product incl tax with store id, without tax class id' =>
+                $productInclTaxWithStoreIdWithoutTaxClassId,
+            'product incl tax without store id, with tax class id' =>
+                $productInclTaxWithoutStoreIdWithTaxClassId,
+            'product incl tax without store id, without tax class id' =>
+                $productInclTaxWithoutStoreIdWithoutTaxClassId,
         ];
     }