Browse Source

update: server log

tokumeikoi 3 years ago
parent
commit
3ea8781146

+ 2 - 2
app/Http/Controllers/User/ServerController.php

@@ -38,11 +38,11 @@ class ServerController extends Controller
             DB::raw('sum(d) as d'),
             'log_at',
             'user_id',
-            DB::raw('avg(rate) as rate')
+            'rate'
         ])
             ->where('user_id', $request->session()->get('id'))
             ->where('log_at', '>=', strtotime(date('Y-m-1')))
-            ->groupBy('log_at', 'user_id')
+            ->groupBy('log_at', 'user_id', 'rate')
             ->orderBy('log_at', 'DESC');
         return response([
             'data' => $serverLogModel->get()

+ 1 - 1
public/theme/v2board/assets/i18n/en-US.js

@@ -285,5 +285,5 @@ window.settings.i18n['en-US'] = {
   'This subscription cannot be renewed. Only new users are allowed to purchase it': 'This subscription cannot be renewed. Only new users are allowed to purchase it',
   'Reset current month flow': 'Reset current month flow',
   'The flow details only retain the data of recent months for query.': 'The flow details only retain the data of recent months for query.',
-  'Average rate': 'Average rate'
+  'Fee deduction rate': 'Fee deduction rate'
 }

+ 1 - 1
public/theme/v2board/assets/i18n/ja-JP.js

@@ -315,5 +315,5 @@ window.settings.i18n['ja-JP'] = {
   'This subscription cannot be renewed. Only new users are allowed to purchase it': 'このサブスクリプションは更新できません。新しいユーザだけがそれを購入できます。',
   'Reset current month flow': 'リセット月フロー',
   'The flow details only retain the data of recent months for query.': 'トラフィック詳細は、クエリー用に近月データのみを保持します。',
-  'Average rate': '平均レート'
+  'Fee deduction rate': '控除率'
 }

+ 1 - 1
public/theme/v2board/assets/i18n/vi-VN.js

@@ -315,5 +315,5 @@ window.settings.i18n['vi-VN'] = {
   'This subscription cannot be renewed. Only new users are allowed to purchase it': 'Không thể thay đổi bản đăng ký này. Chỉ có người dùng mới được phép mua nó.',
   'Reset current month flow': 'Làm lại dòng tháng hiện tại',
   'The flow details only retain the data of recent months for query.': 'Các chi tiết dòng chảy chỉ lưu lại dữ liệu của tháng gần đây để truy vấn.',
-  'Average rate': 'Tỷ lệ trung bình'
+  'Average rate': 'Tỷ lệ khấu trừ'
 }

+ 1 - 1
public/theme/v2board/assets/i18n/zh-CN.js

@@ -317,5 +317,5 @@ window.settings.i18n['zh-CN'] = {
   'This subscription cannot be renewed. Only new users are allowed to purchase it': '该订阅无法续费,仅允许新用户购买',
   'Reset current month flow': '重置当月流量',
   'The flow details only retain the data of recent months for query.': '流量明细仅保留近月数据以供查询。',
-  'Average rate': '平均倍率'
+  'Fee deduction rate': '扣费倍率'
 }

File diff suppressed because it is too large
+ 0 - 0
public/theme/v2board/assets/umi.js


Some files were not shown because too many files changed in this diff