Merge remote-tracking branch 'magento-l3/ACP2E-2303' into 2.4-develop

Author: Sarmistha

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

@@ -921,7 +921,9 @@ public function needPriceConversion($store = null)
         $res = false;
         $priceIncludesTax = $this->priceIncludesTax($store)
             || $this->getNeedUseShippingExcludeTax()
-            || $this->shippingPriceIncludesTax($store);
+            || $this->shippingPriceIncludesTax($store)
+            || $this->displayCartShippingInclTax()
+            || $this->displayCartShippingBoth();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
                 case self::DISPLAY_TYPE_EXCLUDING_TAX:

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

@@ -381,4 +381,50 @@ public function dataProviderScopeConfigMethods(): array
             ]
         ];
     }
+
+    /**
+     * Tests check if necessary do product price conversion
+     *
+     * @return void
+     */
+    public function testNeedPriceConversion(): void
+    {
+        $scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $scopeConfigMock
+            ->method('getValue')
+            ->willReturnMap(
+                [
+                    [
+                        Config::XML_PATH_DISPLAY_CART_SHIPPING,
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        true
+                    ],
+                    [
+                        Config::XML_PATH_DISPLAY_CART_SHIPPING,
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        false
+                    ],
+                    [
+                        Config::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE,
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        true
+                    ],
+                    [
+                        Config::XML_PATH_DISPLAY_CART_PRICE,
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        false
+                    ]
+                ]
+            );
+        /** @var Config */
+        $model = new Config($scopeConfigMock);
+        $model->setPriceIncludesTax(false);
+        $model->setNeedUseShippingExcludeTax(false);
+        $model->setShippingPriceIncludeTax(false);
+        $this->assertEquals(true, $model->needPriceConversion());
+    }
 }