Merge branch '2.4-develop' of https://github.com/magento/magento2ce into develop-prs

Author: rganin

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php

@@ -33,32 +33,4 @@ public function __construct(
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _translateCondition($field, $condition)
-    {
-        if ($field !== 'order_currency_code'
-            && !isset($this->_map['fields'][$field])
-        ) {
-            $this->_map['fields'][$field] = 'main_table.' . $field;
-        }
-
-        return parent::_translateCondition($field, $condition);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _renderFiltersBefore()
-    {
-        $this->getSelect()->joinLeft(
-            ['cgf' => $this->getTable('sales_order_grid')],
-            'main_table.order_id = cgf.entity_id',
-            [
-                'order_currency_code' => 'order_currency_code',
-            ]
-        );
-    }
 }

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php

@@ -33,32 +33,4 @@ public function __construct(
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _translateCondition($field, $condition)
-    {
-        if ($field !== 'order_currency_code'
-            && !isset($this->_map['fields'][$field])
-        ) {
-            $this->_map['fields'][$field] = 'main_table.' . $field;
-        }
-
-        return parent::_translateCondition($field, $condition);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _renderFiltersBefore()
-    {
-        $this->getSelect()->joinLeft(
-            ['cgf' => $this->getTable('sales_order_grid')],
-            'main_table.order_id = cgf.entity_id',
-            [
-                'order_currency_code' => 'order_currency_code',
-            ]
-        );
-    }
 }

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

@@ -194,14 +194,14 @@
                 <visible>false</visible>
             </settings>
         </column>
-        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
+        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Subtotal</label>
                 <visible>false</visible>
             </settings>
         </column>
-        <column name="shipping_and_handling" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
+        <column name="shipping_and_handling" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Shipping &amp; Handling</label>

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

@@ -207,14 +207,14 @@
                 <visible>false</visible>
             </settings>
         </column>
-        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
+        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Subtotal</label>
                 <visible>false</visible>
             </settings>
         </column>
-        <column name="shipping_and_handling" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
+        <column name="shipping_and_handling" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Shipping &amp; Handling</label>