Merge branch 'ACP2E-1541' of https://github.com/magento-l3/magento2ce into PR-02142023

Author: chittima

app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php

@@ -138,10 +138,10 @@ private function getStoreCurrencyRate(string $currencyCode, DataObject $row): fl
         $catalogPriceScope = $this->getCatalogPriceScope();
         $adminCurrencyCode = $this->getAdminCurrencyCode();
 
-        if (($catalogPriceScope != 0
+        if (((int)$catalogPriceScope !== 0
             && $adminCurrencyCode !== $currencyCode)) {
-            $storeCurrency = $this->currencyFactory->create()->load($adminCurrencyCode);
-            $currencyRate = $storeCurrency->getRate($currencyCode);
+            $currency = $this->currencyFactory->create()->load($adminCurrencyCode);
+            $currencyRate = $currency->getAnyRate($currencyCode);
         } else {
             $currencyRate = $this->_getRate($row);
         }

app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/CurrencyTest.php

@@ -181,6 +181,7 @@ protected function setUp(): void
      * @param string $storeCurrencyCode
      * @param string $adminOrderAmount
      * @param string $convertedAmount
+     * @param bool $needToGetRateFromModel
      * @throws LocalizedException
      * @throws NoSuchEntityException
      * @throws CurrencyException
@@ -195,7 +196,8 @@ public function testRender(
         string $adminCurrencyCode,
         string $storeCurrencyCode,
         string $adminOrderAmount,
-        string $convertedAmount
+        string $convertedAmount,
+        bool $needToGetRateFromModel
     ): void {
         $this->row = new DataObject(
             [
@@ -252,6 +254,14 @@ public function testRender(
             ->willReturn($currLocaleMock);
         $this->gridColumnMock->method('getCurrency')->willReturn('USD');
         $this->gridColumnMock->method('getRateField')->willReturn('test_rate_field');
+
+        if ($needToGetRateFromModel) {
+            $this->currencyMock->expects($this->once())
+                ->method('getAnyRate')
+                ->with($storeCurrencyCode)
+                ->willReturn($rate);
+        }
+
         $actualAmount = $this->model->render($this->row);
         $this->assertEquals($convertedAmount, $actualAmount);
     }
@@ -272,7 +282,8 @@ public function getCurrencyDataProvider(): array
                 'adminCurrencyCode' => 'EUR',
                 'storeCurrencyCode' => 'EUR',
                 'adminOrderAmount' => '105.00',
-                'convertedAmount' => '105.00'
+                'convertedAmount' => '105.00',
+                'needToGetRateFromModel' => false
             ],
             'rate conversion with different admin and storefront rate' => [
                 'rate' => 1.4150,
@@ -282,8 +293,20 @@ public function getCurrencyDataProvider(): array
                 'adminCurrencyCode' => 'USD',
                 'storeCurrencyCode' => 'EUR',
                 'adminOrderAmount' => '105.00',
-                'convertedAmount' => '148.575'
-            ]
+                'convertedAmount' => '148.575',
+                'needToGetRateFromModel' => true
+            ],
+            'rate conversation with same rate for different currencies' => [
+                'rate' => 1.00,
+                'columnIndex' => 'total_income_amount',
+                'catalogPriceScope' => 1,
+                'adminWebsiteId' => 1,
+                'adminCurrencyCode' => 'USD',
+                'storeCurrencyCode' => 'THB',
+                'adminOrderAmount' => '100.00',
+                'convertedAmount' => '100.00',
+                'needToGetRateFromModel' => true
+            ],
         ];
     }