#26121: special price & tier price are coming in base currency

Move price transform to PriceTiers

Author: pmarjan

app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php

@@ -8,7 +8,6 @@
 namespace Magento\Catalog\Model\Product\Type;
 
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Store;
@@ -94,11 +93,6 @@ class Price
      */
     private $tierPriceExtensionFactory;
 
-    /**
-     * @var TierPriceBuilder
-     */
-    private $tierPriceBuilder;
-
     /**
      * Constructor
      *
@@ -109,10 +103,9 @@ class Price
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param GroupManagementInterface $groupManagement
-     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory @deprecated
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory @deprecated
-     * @param TierPriceBuilder $tierPriceBuilder
+     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -125,8 +118,7 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
-        ?TierPriceBuilder $tierPriceBuilder = null
+        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
     ) {
         $this->_ruleFactory = $ruleFactory;
         $this->_storeManager = $storeManager;
@@ -139,8 +131,6 @@ public function __construct(
         $this->config = $config;
         $this->tierPriceExtensionFactory = $tierPriceExtensionFactory ?: ObjectManager::getInstance()
             ->get(ProductTierPriceExtensionFactory::class);
-        $this->tierPriceBuilder = $tierPriceBuilder ?: ObjectManager::getInstance()
-            ->get(TierPriceBuilder::class);
     }
 
     /**
@@ -379,7 +369,28 @@ protected function getAllCustomerGroupsId()
      */
     public function getTierPrices($product)
     {
-        return $this->tierPriceBuilder->getTierPrices($product);
+        $prices = [];
+        $tierPrices = $this->getExistingPrices($product, 'tier_price');
+        foreach ($tierPrices as $price) {
+            /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
+            $tierPrice = $this->tierPriceFactory->create()
+                ->setExtensionAttributes($this->tierPriceExtensionFactory->create());
+            $tierPrice->setCustomerGroupId($price['cust_group']);
+            if (array_key_exists('website_price', $price)) {
+                $value = $price['website_price'];
+            } else {
+                $value = $price['price'];
+            }
+            $tierPrice->setValue($value);
+            $tierPrice->setQty($price['price_qty']);
+            if (isset($price['percentage_value'])) {
+                $tierPrice->getExtensionAttributes()->setPercentageValue($price['percentage_value']);
+            }
+            $websiteId = isset($price['website_id']) ? $price['website_id'] : $this->getWebsiteForPriceScope();
+            $tierPrice->getExtensionAttributes()->setWebsiteId($websiteId);
+            $prices[] = $tierPrice;
+        }
+        return $prices;
     }
 
     /**

app/code/Magento/Catalog/Model/Product/Type/Price.php

@@ -12,13 +12,11 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\TierPrice;
-use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 use Magento\Catalog\Model\Product\Type\Price;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\Data\Group;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
@@ -71,8 +69,6 @@ class PriceTest extends TestCase
 
     private $tierPriceExtensionFactoryMock;
 
-    private $priceCurrencyMock;
-
     protected function setUp(): void
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -117,27 +113,14 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->priceCurrencyMock = $this->getMockBuilder(PriceCurrencyInterface::class)
-            ->getMockForAbstractClass();
-        $tierPriceBuilder = $this->objectManagerHelper->getObject(
-            TierPriceBuilder::class,
-            [
-                'tierPriceFactory' => $this->tpFactory,
-                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
-                'config' => $this->scopeConfigMock,
-                'storeManager' => $storeMangerMock,
-                'priceCurrency' => $this->priceCurrencyMock,
-            ]
-        );
         $this->model = $this->objectManagerHelper->getObject(
             Price::class,
             [
                 'tierPriceFactory' => $this->tpFactory,
                 'config' => $this->scopeConfigMock,
                 'storeManager' => $storeMangerMock,
                 'groupManagement' => $this->groupManagementMock,
-                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
-                'tierPriceBuilder' => $tierPriceBuilder
+                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock
             ]
         );
     }
@@ -251,10 +234,6 @@ function () {
         $this->tierPriceExtensionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($tierPriceExtensionMock);
-        $this->priceCurrencyMock->expects($this->any())->method('convertAndRound')
-            ->will(
-                $this->onConsecutiveCalls(10, 20)
-            );
 
         // test with the data retrieved as a REST object
         $tpRests = $this->model->getTierPrices($this->product);