MC-23915: Wrong currency symbol in creditmemo_grid & sales_order_view > creditmemo grid for subtotal & Shipping and Handling fee

Author: engcom-Echo

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

@@ -22,17 +22,17 @@ class PurchasedPriceTest extends TestCase
     /**
      * @var Price
      */
-    protected $model;
+    private $model;
 
     /**
      * @var Currency|MockObject
      */
-    protected $currencyMock;
+    private $currencyMock;
 
     /**
      * @var OrderRepositoryInterface|MockObject
      */
-    protected $orderMock;
+    private $orderRepository;
 
     protected function setUp(): void
     {
@@ -47,7 +47,7 @@ protected function setUp(): void
             ->setMethods(['load', 'format'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->orderMock = $this->getMockBuilder(OrderRepositoryInterface::class)
+        $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class)
             ->setMethods(['getList','get','delete','save','getOrderCurrencyCode'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -56,7 +56,7 @@ protected function setUp(): void
             [
                 'currency' => $this->currencyMock,
                 'context' => $contextMock,
-                'order' => $this->orderMock,
+                'order' => $this->orderRepository,
             ]
         );
     }
@@ -90,10 +90,10 @@ public function testPrepareDataSource(
             $currencyCode = $dataSource['data']['items'][0]['order_currency_code'];
         } else {
             $currencyCode = 'FR';
-            $this->orderMock->expects($this->once())
+            $this->orderRepository->expects($this->once())
                 ->method('get')
                 ->willReturnSelf();
-            $this->orderMock->expects($this->once())
+            $this->orderRepository->expects($this->once())
                 ->method('getOrderCurrencyCode')
                 ->willReturn($currencyCode);
         }

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

@@ -32,7 +32,7 @@ class PurchasedPrice extends Column
     /**
      * @var OrderRepositoryInterface
      */
-    private $order;
+    private $orderRepository;
 
     /**
      * Constructor
@@ -43,7 +43,7 @@ class PurchasedPrice extends Column
      * @param array $components
      * @param array $data
      * @param Currency $currency
-     * @param OrderRepositoryInterface $order
+     * @param OrderRepositoryInterface $orderRepository
      */
     public function __construct(
         ContextInterface $context,
@@ -52,12 +52,12 @@ public function __construct(
         array $components = [],
         array $data = [],
         Currency $currency = null,
-        OrderRepositoryInterface $order = null
+        OrderRepositoryInterface $orderRepository = null
     ) {
         $this->priceFormatter = $priceFormatter;
         $this->currency = $currency ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->create(Currency::class);
-        $this->order = $order ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->orderRepository = $orderRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->create(OrderRepositoryInterface::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
@@ -72,9 +72,8 @@ 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']
-                    : $this->order->get($item['order_id'])->getOrderCurrencyCode();
+                $currencyCode = $item['order_currency_code']
+                    ?? $this->orderRepository->get($item['order_id'])->getOrderCurrencyCode();
                 $purchaseCurrency = $this->currency->load($currencyCode);
                 $item[$this->getData('name')] = $purchaseCurrency
                     ->format($item[$this->getData('name')], [], false);