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 13861386 comment =" Adjustment Negative" />
13871387 <column xsi : type =" decimal" name =" order_base_grand_total" scale =" 4" precision =" 20" unsigned =" false"
13881388 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" />
13891391 <constraint xsi : type =" primary" referenceId =" PRIMARY" >
13901392 <column name =" entity_id" />
13911393 </constraint >
Original file line number Diff line number Diff line change 815815 "shipping_and_handling" : true ,
816816 "adjustment_positive" : true ,
817817 "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
819821 },
820822 "index" : {
821823 "SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID" : true ,
Original file line number Diff line number Diff line change 640640 <item name =" adjustment_positive" xsi : type =" string" >sales_creditmemo.adjustment_positive</item >
641641 <item name =" adjustment_negative" xsi : type =" string" >sales_creditmemo.adjustment_negative</item >
642642 <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 >
643645 </argument >
644646 </arguments >
645647 </virtualType >
Original file line number Diff line number Diff line change 66 */
77-->
88<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" >
1010 <sequence >
1111 <module name =" Magento_Rule" />
1212 <module name =" Magento_Catalog" />
Original file line number Diff line number Diff line change 119119 <column name =" base_grand_total" class =" Magento\Sales\Ui\Component\Listing\Column\Price" >
120120 <settings >
121121 <filter >textRange</filter >
122- <label translate =" true" >Refunded</label >
122+ <label translate =" true" >Refunded (Base) </label >
123123 </settings >
124124 </column >
125125 <column name =" order_status" component =" Magento_Ui/js/grid/columns/select" >
194194 <visible >false</visible >
195195 </settings >
196196 </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 " >
198198 <settings >
199199 <filter >textRange</filter >
200200 <label translate =" true" >Subtotal</label >
Original file line number Diff line number Diff line change 130130 <label translate =" true" >Status</label >
131131 </settings >
132132 </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 " >
134134 <settings >
135135 <filter >textRange</filter >
136136 <label translate =" true" >Amount</label >
You can’t perform that action at this time.
0 commit comments