ENGCOM-5529: Resolve Incorrect base currency in order grid for historical orders issue 23805 #23817

 - Merge Pull Request #23817 from edenduong/magento2:2.3-bugfix/incorrent_currency_format_grid_issue23805
 - Merged commits:
   1. a52ae7e

Author: magento-engcom-team

app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PriceTest.php

@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Ui\Component\Listing\Column;
 
-use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Directory\Model\Currency;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Ui\Component\Listing\Column\Price;
 
@@ -20,9 +22,9 @@ class PriceTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Currency|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $priceFormatterMock;
+    protected $currencyMock;
 
     protected function setUp()
     {
@@ -33,12 +35,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $contextMock->expects($this->never())->method('getProcessor')->willReturn($processor);
-        $this->priceFormatterMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Pricing\PriceCurrencyInterface::class
-        );
+        $this->currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+            ->setMethods(['load', 'format'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = $objectManager->getObject(
             \Magento\Sales\Ui\Component\Listing\Column\Price::class,
-            ['priceFormatter' => $this->priceFormatterMock, 'context' => $contextMock]
+            ['currency' => $this->currencyMock, 'context' => $contextMock]
         );
     }
 
@@ -50,14 +53,22 @@ public function testPrepareDataSource()
         $dataSource = [
             'data' => [
                 'items' => [
-                    [$itemName => $oldItemValue]
+                    [
+                        $itemName => $oldItemValue,
+                        'base_currency_code' => 'US'
+                    ]
                 ]
             ]
         ];
 
-        $this->priceFormatterMock->expects($this->once())
+        $this->currencyMock->expects($this->once())
+            ->method('load')
+            ->with($dataSource['data']['items'][0]['base_currency_code'])
+            ->willReturnSelf();
+
+        $this->currencyMock->expects($this->once())
             ->method('format')
-            ->with($oldItemValue, false)
+            ->with($oldItemValue, [], false)
             ->willReturn($newItemValue);
 
         $this->model->setData('name', $itemName);

app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PurchasedPriceTest.php

@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Ui\Component\Listing\Column;
 
-use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Directory\Model\Currency;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Ui\Component\Listing\Column\Price;
 
@@ -20,9 +22,9 @@ class PurchasedPriceTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Currency|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $priceFormatterMock;
+    protected $currencyMock;
 
     protected function setUp()
     {
@@ -33,12 +35,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $contextMock->expects($this->never())->method('getProcessor')->willReturn($processor);
-        $this->priceFormatterMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Pricing\PriceCurrencyInterface::class
-        );
+        $this->currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+            ->setMethods(['load', 'format'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = $objectManager->getObject(
             \Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice::class,
-            ['priceFormatter' => $this->priceFormatterMock, 'context' => $contextMock]
+            ['currency' => $this->currencyMock, 'context' => $contextMock]
         );
     }
 
@@ -58,9 +61,14 @@ public function testPrepareDataSource()
             ]
         ];
 
-        $this->priceFormatterMock->expects($this->once())
+        $this->currencyMock->expects($this->once())
+            ->method('load')
+            ->with($dataSource['data']['items'][0]['order_currency_code'])
+            ->willReturnSelf();
+
+        $this->currencyMock->expects($this->once())
             ->method('format')
-            ->with($oldItemValue, false, null, null, 'US')
+            ->with($oldItemValue, [], false)
             ->willReturn($newItemValue);
 
         $this->model->setData('name', $itemName);

app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php

@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Directory\Model\Currency;
 
 /**
  * Class Price
@@ -20,6 +23,11 @@ class Price extends Column
      */
     protected $priceFormatter;
 
+    /**
+     * @var Currency
+     */
+    private $currency;
+
     /**
      * Constructor
      *
@@ -28,15 +36,19 @@ class Price extends Column
      * @param PriceCurrencyInterface $priceFormatter
      * @param array $components
      * @param array $data
+     * @param Currency $currency
      */
     public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         PriceCurrencyInterface $priceFormatter,
         array $components = [],
-        array $data = []
+        array $data = [],
+        Currency $currency = null
     ) {
         $this->priceFormatter = $priceFormatter;
+        $this->currency = $currency ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->create(Currency::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
@@ -51,13 +63,9 @@ public function prepareDataSource(array $dataSource)
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
                 $currencyCode = isset($item['base_currency_code']) ? $item['base_currency_code'] : null;
-                $item[$this->getData('name')] = $this->priceFormatter->format(
-                    $item[$this->getData('name')],
-                    false,
-                    null,
-                    null,
-                    $currencyCode
-                );
+                $basePurchaseCurrency = $this->currency->load($currencyCode);
+                $item[$this->getData('name')] = $basePurchaseCurrency
+                    ->format($item[$this->getData('name')], [], false);
             }
         }
 

app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php

@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Directory\Model\Currency;
 
 /**
  * Class Price
@@ -20,6 +23,11 @@ class PurchasedPrice extends Column
      */
     protected $priceFormatter;
 
+    /**
+     * @var Currency
+     */
+    private $currency;
+
     /**
      * Constructor
      *
@@ -28,15 +36,19 @@ class PurchasedPrice extends Column
      * @param PriceCurrencyInterface $priceFormatter
      * @param array $components
      * @param array $data
+     * @param Currency $currency
      */
     public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         PriceCurrencyInterface $priceFormatter,
         array $components = [],
-        array $data = []
+        array $data = [],
+        Currency $currency = null
     ) {
         $this->priceFormatter = $priceFormatter;
+        $this->currency = $currency ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->create(Currency::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
@@ -51,14 +63,9 @@ public function prepareDataSource(array $dataSource)
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
                 $currencyCode = isset($item['order_currency_code']) ? $item['order_currency_code'] : null;
-                $item[$this->getData('name')] =
-                    $this->priceFormatter->format(
-                        $item[$this->getData('name')],
-                        false,
-                        null,
-                        null,
-                        $currencyCode
-                    );
+                $purchaseCurrency = $this->currency->load($currencyCode);
+                $item[$this->getData('name')] = $purchaseCurrency
+                    ->format($item[$this->getData('name')], [], false);
             }
         }