ENGCOM-5194: Wrong currency sign on creditmemo_grid & sales_order_view > invoice grid #22123

Author: sidolov

app/code/Magento/Sales/Setup/Patch/Data/UpdateCreditmemoGridCurrencyCode.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Setup\Patch\Data;
+
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Sales\Setup\SalesSetup;
+use Magento\Sales\Setup\SalesSetupFactory;
+
+/**
+ * Update credit memo grid currency code.
+ */
+class UpdateCreditmemoGridCurrencyCode implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param SalesSetupFactory $salesSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        SalesSetupFactory $salesSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->salesSetupFactory = $salesSetupFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        /** @var SalesSetup $salesSetup */
+        $salesSetup = $this->salesSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        /** @var Mysql $connection */
+        $connection = $salesSetup->getConnection();
+        $creditMemoGridTable = $salesSetup->getTable('sales_creditmemo_grid');
+        $orderTable = $salesSetup->getTable('sales_order');
+        $select = $connection->select();
+        $condition = 'so.entity_id = scg.order_id';
+        $select->join(['so' => $orderTable], $condition, ['order_currency_code', 'base_currency_code']);
+        $sql = $connection->updateFromSelect($select, ['scg' => $creditMemoGridTable]);
+        $connection->query($sql);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.13';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml

@@ -17,7 +17,7 @@
         <element name="filters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-expand']" timeout="30"/>
         <element name="applyFilters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-apply']" timeout="30"/>
         <element name="invoiceId" type="input" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//input[@name='increment_id']" timeout="30"/>
-        <element name="amountFrom" type="input" selector="[name='grand_total[from]']" timeout="30"/>
-        <element name="amountTo" type="input" selector="[name='grand_total[to]']" timeout="30"/>
+        <element name="amountFrom" type="input" selector="[name='base_grand_total[from]']" timeout="30"/>
+        <element name="amountTo" type="input" selector="[name='base_grand_total[to]']" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Sales/etc/db_schema.xml

@@ -1386,6 +1386,8 @@
                 comment="Adjustment Negative"/>
         <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Order Grand Total"/>
+        <column xsi:type="varchar" name="order_currency_code" nullable="true" length="3" comment="Order Currency Code"/>
+        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
         </constraint>

app/code/Magento/Sales/etc/db_schema_whitelist.json

@@ -815,7 +815,9 @@
             "shipping_and_handling": true,
             "adjustment_positive": true,
             "adjustment_negative": true,
-            "order_base_grand_total": true
+            "order_base_grand_total": true,
+            "order_currency_code": true,
+            "base_currency_code": true
         },
         "index": {
             "SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID": true,

app/code/Magento/Sales/etc/di.xml

@@ -641,6 +641,8 @@
                 <item name="adjustment_positive" xsi:type="string">sales_creditmemo.adjustment_positive</item>
                 <item name="adjustment_negative" xsi:type="string">sales_creditmemo.adjustment_negative</item>
                 <item name="order_base_grand_total" xsi:type="string">sales_order.base_grand_total</item>
+                <item name="order_currency_code" xsi:type="string">sales_order.order_currency_code</item>
+                <item name="base_currency_code" xsi:type="string">sales_order.base_currency_code</item>
             </argument>
         </arguments>
     </virtualType>

app/code/Magento/Sales/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Sales" >
+    <module name="Magento_Sales">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml

@@ -119,7 +119,7 @@
         <column name="base_grand_total" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
-                <label translate="true">Refunded</label>
+                <label translate="true">Refunded (Base)</label>
             </settings>
         </column>
         <column name="order_status" component="Magento_Ui/js/grid/columns/select">
@@ -194,7 +194,7 @@
                 <visible>false</visible>
             </settings>
         </column>
-        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\Price">
+        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Subtotal</label>

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml

@@ -130,7 +130,7 @@
                 <label translate="true">Status</label>
             </settings>
         </column>
-        <column name="grand_total" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
+        <column name="base_grand_total" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Amount</label>

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Invoice/Grid.php

@@ -24,10 +24,10 @@ class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
             'selector' => 'input[name="order_increment_id"]',
         ],
         'grand_total_from' => [
-            'selector' => 'input[name="grand_total[from]"]',
+            'selector' => 'input[name="base_grand_total[from]"]',
         ],
         'grand_total_to' => [
-            'selector' => 'input[name="grand_total[to]"]',
+            'selector' => 'input[name="base_grand_total[to]"]',
         ],
     ];