File tree Expand file tree Collapse file tree 6 files changed +11
-5
lines changed
view/adminhtml/ui_component Expand file tree Collapse file tree 6 files changed +11
-5
lines changed Original file line number Diff line number Diff line change 1386
1386
comment =" Adjustment Negative" />
1387
1387
<column xsi : type =" decimal" name =" order_base_grand_total" scale =" 4" precision =" 20" unsigned =" false"
1388
1388
nullable =" true" comment =" Order Grand Total" />
1389
+ <column xsi : type =" varchar" name =" order_currency_code" nullable =" true" length =" 3" comment =" Order Currency Code" />
1390
+ <column xsi : type =" varchar" name =" base_currency_code" nullable =" true" length =" 3" comment =" Base Currency Code" />
1389
1391
<constraint xsi : type =" primary" referenceId =" PRIMARY" >
1390
1392
<column name =" entity_id" />
1391
1393
</constraint >
Original file line number Diff line number Diff line change 815
815
"shipping_and_handling" : true ,
816
816
"adjustment_positive" : true ,
817
817
"adjustment_negative" : true ,
818
- "order_base_grand_total" : true
818
+ "order_base_grand_total" : true ,
819
+ "order_currency_code" : true ,
820
+ "base_currency_code" : true
819
821
},
820
822
"index" : {
821
823
"SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID" : true ,
Original file line number Diff line number Diff line change 640
640
<item name =" adjustment_positive" xsi : type =" string" >sales_creditmemo.adjustment_positive</item >
641
641
<item name =" adjustment_negative" xsi : type =" string" >sales_creditmemo.adjustment_negative</item >
642
642
<item name =" order_base_grand_total" xsi : type =" string" >sales_order.base_grand_total</item >
643
+ <item name =" order_currency_code" xsi : type =" string" >sales_order.order_currency_code</item >
644
+ <item name =" base_currency_code" xsi : type =" string" >sales_order.base_currency_code</item >
643
645
</argument >
644
646
</arguments >
645
647
</virtualType >
Original file line number Diff line number Diff line change 6
6
*/
7
7
-->
8
8
<config xmlns : xsi =" http://www.w3.org/2001/XMLSchema-instance" xsi : noNamespaceSchemaLocation =" urn:magento:framework:Module/etc/module.xsd" >
9
- <module name =" Magento_Sales" >
9
+ <module name =" Magento_Sales" >
10
10
<sequence >
11
11
<module name =" Magento_Rule" />
12
12
<module name =" Magento_Catalog" />
Original file line number Diff line number Diff line change 119
119
<column name =" base_grand_total" class =" Magento\Sales\Ui\Component\Listing\Column\Price" >
120
120
<settings >
121
121
<filter >textRange</filter >
122
- <label translate =" true" >Refunded</label >
122
+ <label translate =" true" >Refunded (Base) </label >
123
123
</settings >
124
124
</column >
125
125
<column name =" order_status" component =" Magento_Ui/js/grid/columns/select" >
194
194
<visible >false</visible >
195
195
</settings >
196
196
</column >
197
- <column name =" subtotal" class =" Magento\Sales\Ui\Component\Listing\Column\Price " >
197
+ <column name =" subtotal" class =" Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice " >
198
198
<settings >
199
199
<filter >textRange</filter >
200
200
<label translate =" true" >Subtotal</label >
Original file line number Diff line number Diff line change 130
130
<label translate =" true" >Status</label >
131
131
</settings >
132
132
</column >
133
- <column name =" grand_total " class =" Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice " >
133
+ <column name =" base_grand_total " class =" Magento\Sales\Ui\Component\Listing\Column\Price " >
134
134
<settings >
135
135
<filter >textRange</filter >
136
136
<label translate =" true" >Amount</label >
You can’t perform that action at this time.
0 commit comments