ACP2E-3276: Order reports showing the wrong currency symbol

Author: lakshmana49

app/code/Magento/Directory/Model/Currency/DefaultLocator.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Directory\Model\Currency;
 
+use Magento\Store\Model\Store;
+
 class DefaultLocator
 {
     /**
@@ -15,7 +17,7 @@ class DefaultLocator
     protected $_configuration;
 
     /**
-     * Store manager
+     * Store manager model
      *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -35,7 +37,9 @@ public function __construct(
 
     /**
      * Retrieve default currency for selected store, website or website group
+     *
      * @todo: Refactor to ScopeDefiner
+     *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return string
      */
@@ -66,6 +70,7 @@ public function getDefaultCurrency(\Magento\Framework\App\RequestInterface $requ
 
     /**
      * Retrieve display currency for selected store, website or website group
+     *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return string
      */
@@ -77,7 +82,7 @@ public function getDisplayCurrency(\Magento\Framework\App\RequestInterface $requ
         } else {
             if ($request->getParam('website')) {
                 $website = $request->getParam('website');
-                $currencyCode = $this->_storeManager->getWebsite($website)->getDefaultCurrencyCode();
+                $currencyCode = $this->getDefaultCurrencyCode($website);
             } else {
                 if ($request->getParam('group')) {
                     $group = $request->getParam('group');
@@ -93,4 +98,26 @@ public function getDisplayCurrency(\Magento\Framework\App\RequestInterface $requ
 
         return $currencyCode;
     }
+
+    /**
+     * Retrieve website default currency code
+     *
+     * @param string $website
+     * @return string
+     */
+    private function getDefaultCurrencyCode($website): string
+    {
+        $website = $this->_storeManager->getWebsite($website);
+        $priceScope = $website->getConfig(Store::XML_PATH_PRICE_SCOPE);
+        if ($priceScope == Store::PRICE_SCOPE_GLOBAL) {
+            $currencyCode = $this->_configuration->getValue(
+                \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
+                'default'
+            );
+        } else {
+            $currencyCode = $website->getConfig(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT);
+        }
+
+        return $currencyCode;
+    }
 }

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

@@ -23,7 +23,6 @@
 /**
  * Adminhtml grid item renderer currency
  *
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  *

app/code/Magento/Store/Model/Website.php

@@ -656,28 +656,6 @@ public function getBaseCurrencyCode()
         return $currencyCode;
     }
 
-    /**
-     * Retrieve website default currency code
-     *
-     * @return string
-     */
-    public function getDefaultCurrencyCode()
-    {
-        if ($this->getConfig(
-                \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE
-            ) == \Magento\Store\Model\Store::PRICE_SCOPE_GLOBAL
-        ) {
-            $currencyCode = $this->_coreConfig->getValue(
-                \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
-                'default'
-            );
-        } else {
-            $currencyCode = $this->getConfig(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT);
-        }
-
-        return $currencyCode;
-    }
-
     /**
      * Retrieve website base currency
      *