Merge remote-tracking branch 'origin/ACP2E-4245' into PR_2025_11_04_flowers

Author: thiaramus

app/code/Magento/Tax/Block/Item/Price/Renderer.php

@@ -18,7 +18,6 @@
  * Item price render block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Renderer extends \Magento\Framework\View\Element\Template
@@ -106,6 +105,8 @@ public function setZone($zone)
     }
 
     /**
+     * Get current store ID
+     *
      * @return int|null|string
      */
     public function getStoreId()
@@ -201,19 +202,13 @@ public function formatPrice($price)
     }
 
     /**
-     * Get item price in display currency or order currency depending
-     * on item type
+     * Get item price in display currency or order currency
      *
      * @return float
      */
     public function getItemDisplayPriceExclTax()
     {
-        $item = $this->getItem();
-        if ($item instanceof QuoteItem) {
-            return $item->getCalculationPrice();
-        } else {
-            return $item->getPrice();
-        }
+        return $this->getItem()->getPrice();
     }
 
     /**

app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
@@ -359,11 +359,11 @@ public function testGetItemDisplayPriceExclTaxQuoteItem()
         /** @var \Magento\Quote\Model\Quote\Item|MockObject $quoteItemMock */
         $quoteItemMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getCalculationPrice', '__wakeup'])
+            ->onlyMethods(['getPrice', '__wakeup'])
             ->getMock();
 
         $quoteItemMock->expects($this->once())
-            ->method('getCalculationPrice')
+            ->method('getPrice')
             ->willReturn($price);
 
         $this->renderer->setItem($quoteItemMock);

app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
@@ -80,7 +80,7 @@ protected function setUp(): void
                 'getBasePriceInclTax',
                 'getQtyOrdered'
             ])
-            ->onlyMethods(['getCalculationPrice'])
+            ->onlyMethods(['getPrice'])
             ->getMock();
 
         $this->item->expects($this->any())
@@ -291,7 +291,7 @@ public function testGetUnitDisplayPriceExclTax(
             ->willReturn($weeeTax);
 
         $this->item->expects($this->once())
-            ->method('getCalculationPrice')
+            ->method('getPrice')
             ->willReturn($price);
 
         $this->weeeHelper->expects($this->any())
@@ -601,7 +601,7 @@ public function testGetFinalUnitDisplayPriceExclTax(
             ->willReturn($weeeTax);
 
         $this->item->expects($this->once())
-            ->method('getCalculationPrice')
+            ->method('getPrice')
             ->willReturn($rowTotal);
 
         $this->assertEquals($expectedValue, $this->renderer->getFinalUnitDisplayPriceExclTax());