diff --git a/packages/Nicelizhi/Manage/src/Http/Controllers/Sales/OrderController.php b/packages/Nicelizhi/Manage/src/Http/Controllers/Sales/OrderController.php index cf488c17d..42707c893 100644 --- a/packages/Nicelizhi/Manage/src/Http/Controllers/Sales/OrderController.php +++ b/packages/Nicelizhi/Manage/src/Http/Controllers/Sales/OrderController.php @@ -49,6 +49,8 @@ public function index() array( 'db' => '`o`.`customer_email`', 'dt' => 'customer_email', 'field'=>'customer_email' ), array( 'db' => '`o`.`customer_first_name`', 'dt' => 'customer_first_name', 'field'=>'customer_first_name' ), array( 'db' => '`o`.`customer_last_name`', 'dt' => 'customer_last_name', 'field'=>'customer_last_name' ), + array( 'db' => '`o`.`order_currency_code`', 'dt' => 'order_currency_code', 'field'=>'order_currency_code' ), + array( 'db' => '`o`.`grand_total`', 'dt' => 'grand_total', 'field'=>'grand_total' ), array( 'db' => '`o`.`base_grand_total`', 'dt' => 'base_grand_total', 'field'=>'base_grand_total', 'formatter' => function($d, $row) { return core()->currency($d); }), diff --git a/packages/Nicelizhi/Manage/src/Resources/views/sales/orders/index.blade.php b/packages/Nicelizhi/Manage/src/Resources/views/sales/orders/index.blade.php index 65f399036..f39f275bd 100644 --- a/packages/Nicelizhi/Manage/src/Resources/views/sales/orders/index.blade.php +++ b/packages/Nicelizhi/Manage/src/Resources/views/sales/orders/index.blade.php @@ -26,6 +26,8 @@ Increment ID Status Client + order_currency_code + grand_total base_grand_total Transaction Id Payment Method @@ -97,6 +99,11 @@ render: function(data, type, row, meta) { return "

" + data + "

" + row['customer_first_name'] + ' ' + row['customer_last_name']; } + },{ + data: 'order_currency_code' + } + ,{ + data: 'grand_total' }, { data: 'base_grand_total'