Przeglądaj źródła

Merge branch 'feature/new-backend-adaptation' of http://16.162.42.175:8014/guanli/ngds into feature/new-backend-adaptation

kevin_zhangl 2 lat temu
rodzic
commit
5db50fe978
100 zmienionych plików z 338 dodań i 167 usunięć
  1. 8 10
      backendApi/modules/v1/controllers/AdminController.php
  2. 2 2
      backendApi/modules/v1/controllers/AtlasController.php
  3. 4 4
      backendApi/modules/v1/controllers/BaseController.php
  4. 40 40
      backendApi/modules/v1/controllers/BonusController.php
  5. 43 38
      backendApi/modules/v1/controllers/FinanceController.php
  6. 1 1
      backendApi/modules/v1/controllers/LogController.php
  7. 3 3
      backendApi/modules/v1/controllers/ReconsumeController.php
  8. 7 7
      backendApi/modules/v1/controllers/ShopController.php
  9. 9 9
      backendApi/modules/v1/controllers/UserController.php
  10. 8 8
      backendApi/modules/v1/models/AdminForm.php
  11. 1 2
      backendApi/modules/v1/models/AdminRoleForm.php
  12. 0 0
      common/config/i18n.php
  13. 0 0
      common/messages/en-US/app.php
  14. 87 2
      common/messages/en-US/ctx.php
  15. 0 0
      common/messages/zh-CN/app.php
  16. 86 2
      common/messages/zh-CN/ctx.php
  17. 0 0
      common/models/CalcBonusBSDefault.php
  18. 0 0
      common/models/CalcOperation.php
  19. 7 7
      common/models/Withdraw.php
  20. 16 16
      common/models/forms/ChangeBalanceForm.php
  21. 16 16
      common/models/forms/WithdrawForm.php
  22. 0 0
      composer.lock
  23. 0 0
      frontendApi/config/menuV2.php
  24. 0 0
      node_modules/.package-lock.json
  25. 0 0
      node_modules/moment/CHANGELOG.md
  26. 0 0
      node_modules/moment/LICENSE
  27. 0 0
      node_modules/moment/README.md
  28. 0 0
      node_modules/moment/dist/locale/af.js
  29. 0 0
      node_modules/moment/dist/locale/ar-dz.js
  30. 0 0
      node_modules/moment/dist/locale/ar-kw.js
  31. 0 0
      node_modules/moment/dist/locale/ar-ly.js
  32. 0 0
      node_modules/moment/dist/locale/ar-ma.js
  33. 0 0
      node_modules/moment/dist/locale/ar-sa.js
  34. 0 0
      node_modules/moment/dist/locale/ar-tn.js
  35. 0 0
      node_modules/moment/dist/locale/ar.js
  36. 0 0
      node_modules/moment/dist/locale/az.js
  37. 0 0
      node_modules/moment/dist/locale/be.js
  38. 0 0
      node_modules/moment/dist/locale/bg.js
  39. 0 0
      node_modules/moment/dist/locale/bm.js
  40. 0 0
      node_modules/moment/dist/locale/bn-bd.js
  41. 0 0
      node_modules/moment/dist/locale/bn.js
  42. 0 0
      node_modules/moment/dist/locale/bo.js
  43. 0 0
      node_modules/moment/dist/locale/br.js
  44. 0 0
      node_modules/moment/dist/locale/bs.js
  45. 0 0
      node_modules/moment/dist/locale/ca.js
  46. 0 0
      node_modules/moment/dist/locale/cs.js
  47. 0 0
      node_modules/moment/dist/locale/cv.js
  48. 0 0
      node_modules/moment/dist/locale/cy.js
  49. 0 0
      node_modules/moment/dist/locale/da.js
  50. 0 0
      node_modules/moment/dist/locale/de-at.js
  51. 0 0
      node_modules/moment/dist/locale/de-ch.js
  52. 0 0
      node_modules/moment/dist/locale/de.js
  53. 0 0
      node_modules/moment/dist/locale/dv.js
  54. 0 0
      node_modules/moment/dist/locale/el.js
  55. 0 0
      node_modules/moment/dist/locale/en-au.js
  56. 0 0
      node_modules/moment/dist/locale/en-ca.js
  57. 0 0
      node_modules/moment/dist/locale/en-gb.js
  58. 0 0
      node_modules/moment/dist/locale/en-ie.js
  59. 0 0
      node_modules/moment/dist/locale/en-il.js
  60. 0 0
      node_modules/moment/dist/locale/en-in.js
  61. 0 0
      node_modules/moment/dist/locale/en-nz.js
  62. 0 0
      node_modules/moment/dist/locale/en-sg.js
  63. 0 0
      node_modules/moment/dist/locale/eo.js
  64. 0 0
      node_modules/moment/dist/locale/es-do.js
  65. 0 0
      node_modules/moment/dist/locale/es-mx.js
  66. 0 0
      node_modules/moment/dist/locale/es-us.js
  67. 0 0
      node_modules/moment/dist/locale/es.js
  68. 0 0
      node_modules/moment/dist/locale/et.js
  69. 0 0
      node_modules/moment/dist/locale/eu.js
  70. 0 0
      node_modules/moment/dist/locale/fa.js
  71. 0 0
      node_modules/moment/dist/locale/fi.js
  72. 0 0
      node_modules/moment/dist/locale/fil.js
  73. 0 0
      node_modules/moment/dist/locale/fo.js
  74. 0 0
      node_modules/moment/dist/locale/fr-ca.js
  75. 0 0
      node_modules/moment/dist/locale/fr-ch.js
  76. 0 0
      node_modules/moment/dist/locale/fr.js
  77. 0 0
      node_modules/moment/dist/locale/fy.js
  78. 0 0
      node_modules/moment/dist/locale/ga.js
  79. 0 0
      node_modules/moment/dist/locale/gd.js
  80. 0 0
      node_modules/moment/dist/locale/gl.js
  81. 0 0
      node_modules/moment/dist/locale/gom-deva.js
  82. 0 0
      node_modules/moment/dist/locale/gom-latn.js
  83. 0 0
      node_modules/moment/dist/locale/gu.js
  84. 0 0
      node_modules/moment/dist/locale/he.js
  85. 0 0
      node_modules/moment/dist/locale/hi.js
  86. 0 0
      node_modules/moment/dist/locale/hr.js
  87. 0 0
      node_modules/moment/dist/locale/hu.js
  88. 0 0
      node_modules/moment/dist/locale/hy-am.js
  89. 0 0
      node_modules/moment/dist/locale/id.js
  90. 0 0
      node_modules/moment/dist/locale/is.js
  91. 0 0
      node_modules/moment/dist/locale/it-ch.js
  92. 0 0
      node_modules/moment/dist/locale/it.js
  93. 0 0
      node_modules/moment/dist/locale/ja.js
  94. 0 0
      node_modules/moment/dist/locale/jv.js
  95. 0 0
      node_modules/moment/dist/locale/ka.js
  96. 0 0
      node_modules/moment/dist/locale/kk.js
  97. 0 0
      node_modules/moment/dist/locale/km.js
  98. 0 0
      node_modules/moment/dist/locale/kn.js
  99. 0 0
      node_modules/moment/dist/locale/ko.js
  100. 0 0
      node_modules/moment/dist/locale/ku.js

+ 8 - 10
backendApi/modules/v1/controllers/AdminController.php

@@ -75,7 +75,7 @@ class AdminController extends BaseController
      */
     public function actionAdd(){
         if(Yii::$app->request->isPost) {
-            return parent::edit(AdminForm::class, '管理员添加成功', null, null, null, function($formModel, $result){
+            return parent::edit(AdminForm::class, Yii::t('ctx', 'AdminAddedSuccessfully'), null, null, null, function($formModel, $result){
                 // 添加操作日志
                 // Log::adminHandle('添加管理员:'.$result->ADMIN_NAME);
             });
@@ -94,7 +94,7 @@ class AdminController extends BaseController
     public function actionEdit(){
         $id = Yii::$app->request->get('id');
         if(Yii::$app->request->isPost){
-            return parent::edit(AdminForm::class, '管理员编辑成功', null, null, null, function($formModel, $result){
+            return parent::edit(AdminForm::class, Yii::t('ctx', 'AdminEditedSuccessfully'), null, null, null, function($formModel, $result){
                 // 添加操作日志
                 // Log::adminHandle('编辑管理员:'.$result->ADMIN_NAME);
             });
@@ -116,7 +116,7 @@ class AdminController extends BaseController
         $form->scenario = 'changePassword';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->edit()){
             // Log::adminHandle('管理员'.$result->ADMIN_NAME.'重置密码');
-            return static::notice('Password change succeeded'); // 重置密码成功
+            return static::notice(Yii::t('ctx', 'passwordChangeSucceeded')); // 重置密码成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -180,7 +180,7 @@ class AdminController extends BaseController
             $formModel = new AdminRoleForm();
             $formModel->scenario = 'add';
             if ($formModel->load(Yii::$app->request->post(), '') && $formModel->add()) {
-                return static::notice('添加管理员角色成功');
+                return static::notice(Yii::t('ctx', 'successAddAdminRole'));
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -195,13 +195,13 @@ class AdminController extends BaseController
     public function actionRoleEdit(){
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminRoleForm::class, '编辑管理员角色成功', 'edit', ['edit'], null, function ($form, $result) {
+            return parent::edit(AdminRoleForm::class, Yii::t('ctx', 'editAdminRoleSuccess'), 'edit', ['edit'], null, function ($form, $result) {
                 Cache::updateAdminRole();
             });
         }
         // 获得当前会员的用户名等信息
         if (!$role = AdminRole::findOneAsArray('ID=:ID', [':ID' => $id], 'ROLE_NAME,REMARK')) {
-            return static::notice('角色不存在', 404);
+            return static::notice(Yii::t('ctx', 'roleDoesNotExist'), 404);
         }
         return static::notice($role);
     }
@@ -236,7 +236,7 @@ class AdminController extends BaseController
         $oneAdminRole = AdminRole::findOne($id);
 
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminRoleForm::class, '设置管理员角色权限成功', 'permission', ['permission'], null, function ($form, $result) {
+            return parent::edit(AdminRoleForm::class, Yii::t('ctx', 'successSetAdminRolePermissions'), 'permission', ['permission'], null, function ($form, $result) {
                 Cache::updateAdminRole();
             });
         }
@@ -310,7 +310,7 @@ class AdminController extends BaseController
         $id = Yii::$app->request->get('id');
 
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminRoleForm::class, '设置管理员角色列表字段权限成功', 'columnPermission', ['columnPermission'], null, function ($form, $result) {
+            return parent::edit(AdminRoleForm::class, Yii::t('ctx', 'successSetAdminRoleListFieldPermissions'), 'columnPermission', ['columnPermission'], null, function ($form, $result) {
                 Cache::updateAdminRole();
             });
         }
@@ -334,6 +334,4 @@ class AdminController extends BaseController
 
         return $allRoleColumns;
     }
-
-
 }

+ 2 - 2
backendApi/modules/v1/controllers/AtlasController.php

@@ -149,7 +149,7 @@ class AtlasController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -214,7 +214,7 @@ class AtlasController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 4 - 4
backendApi/modules/v1/controllers/BaseController.php

@@ -190,7 +190,7 @@ class BaseController extends \yii\rest\ActiveController {
             $selected = \Yii::$app->request->post('selected');
         }
         if (!$selected) {
-            return self::notice('must select one item to delete', 500);// 必须选择一条删除数据
+            return self::notice(Yii::t('ctx', 'mustSelectOneItemToDelete'), 500);// 必须选择一条删除数据
         }
 
         // 是否存在 DONT_DEL 字段
@@ -226,7 +226,7 @@ class BaseController extends \yii\rest\ActiveController {
             if ($isDelData) {
                 // 真实删除数据
                 if (!$modelClass::deleteAll($condition, $params)) {
-                    throw new Exception('failed to delete');//删除失败
+                    throw new Exception(Yii::t('ctx', 'deleteFailed'));//删除失败 
                 }
             } else {
                 // 设置IS_DEL字段为1
@@ -234,7 +234,7 @@ class BaseController extends \yii\rest\ActiveController {
             }
             if ($afterFun) $afterFun($selected);
             $transaction->commit();
-            return self::notice('delete successfully');//删除成功
+            return self::notice(Yii::t('ctx', 'deleteSuccessfully'));//删除成功
         } catch (Exception $e) {
             $transaction->rollBack();
             return self::notice($e->getMessage(), 500);
@@ -320,7 +320,7 @@ class BaseController extends \yii\rest\ActiveController {
                 reset($getValueArr);
                 if($filterModel == 'date'){
                     if( $getSymbol !== '>=' && $getSymbol !== '<=' && $getSymbol !== '>' && $getSymbol !== '<' ) {
-                        throw new \Exception("Incorrect date format");//日期筛选格式不对
+                        throw new \Exception(Yii::t('ctx', 'incorrectDateFormat'));//日期筛选格式不对
                     }
                     $bindValue = strtotime($getValueArr[1]);
                     $isDate = true;

+ 40 - 40
backendApi/modules/v1/controllers/BonusController.php

@@ -292,7 +292,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -347,7 +347,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -399,7 +399,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -455,7 +455,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -510,7 +510,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -567,7 +567,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -624,7 +624,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -675,7 +675,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -828,7 +828,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -910,7 +910,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1069,7 +1069,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1112,7 +1112,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1162,7 +1162,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1212,7 +1212,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -1263,7 +1263,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1313,7 +1313,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1363,7 +1363,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1413,7 +1413,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1463,7 +1463,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1513,7 +1513,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -1564,7 +1564,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1614,7 +1614,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1664,7 +1664,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1714,7 +1714,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1764,7 +1764,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1814,7 +1814,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -1865,7 +1865,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1915,7 +1915,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2028,7 +2028,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2106,7 +2106,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2200,7 +2200,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2270,7 +2270,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2330,7 +2330,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2390,7 +2390,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2464,7 +2464,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2508,7 +2508,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2554,7 +2554,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2598,7 +2598,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -2645,7 +2645,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
 
@@ -2774,7 +2774,7 @@ class BonusController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 43 - 38
backendApi/modules/v1/controllers/FinanceController.php

@@ -125,11 +125,11 @@ class FinanceController extends BaseController {
             'AUDIT_ADMIN_NAME' => 'ADMU.ADMIN_NAME',
         ]);
         $form = new FinanceExportForm();
-        $result = $form->run($filter, 'Member_Ecoin_adjustment_list'); // 会员余额调整列表
+        $result = $form->run($filter, Yii::t('ctx', 'memberEcoinAdjustmentListFileName')); // 会员余额调整列表
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -139,7 +139,7 @@ class FinanceController extends BaseController {
      */
     public function actionChangeBalance() {
         if (Yii::$app->request->isPost) { // 申请变动会员余额成功
-            return static::edit(ChangeBalanceForm::class, 'Application for change of member balance succeeded', 'changeAdd', ['changeAdd'], null, function ($formModel, $result) {
+            return static::edit(ChangeBalanceForm::class, Yii::t('ctx', 'applicationChangeBalanceSucceeded'), 'changeAdd', ['changeAdd'], null, function ($formModel, $result) {
                 // $userInfo = User::getBaseInfoFromRedis($result['USER_ID']);
                 // $type = BalanceAudit::TYPE[$result['TYPE']]['label'];
                 // Log::adminHandle('申请调整会员' . $userInfo['USER_NAME'] . '的' . $type . '余额,金额:' . $result['AMOUNT'], 1, $userInfo['ID'], $userInfo['USER_NAME'], $result['CREATE_REMARK']);
@@ -168,7 +168,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $balanceAudit = BalanceAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$balanceAudit) {
-            return static::notice('Data not exists', 400);
+            return static::notice(Yii::t('ctx', 'dataNotExists'), 400);
         }
         $balanceAudit['BASE_INFO'] = Info::baseInfoWithBalance($balanceAudit['USER_ID']);
         return static::notice(['id' => $balanceAudit['ID'], 'baseInfo' => $balanceAudit['BASE_INFO'], 'type' => $balanceAudit['TYPE'], 'dealType' => $balanceAudit['DEAL_TYPE'], 'amount' => Tool::formatPrice($balanceAudit['AMOUNT']), 'remark' => $balanceAudit['CREATE_REMARK'], 'isShow' => $balanceAudit['REMARK_IS_SHOW']]);
@@ -186,7 +186,7 @@ class FinanceController extends BaseController {
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             // $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '调整会员余额录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('Modification and adjustment of member balance entry data completed'); // 修改调整会员余额录入数据完成
+            return static::notice(Yii::t('ctx', 'modificationAdjustmentMemberBalanceCompleted')); // 修改调整会员余额录入数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -203,7 +203,7 @@ class FinanceController extends BaseController {
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->pass()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('审核通过' . $user['USER_NAME'] . '调整会员余额录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('The review is done through the member balance'); // 审核通过会员余额完成
+            return static::notice(Yii::t('ctx', 'reviewThroughMemberBalance')); // 审核通过会员余额完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -222,7 +222,7 @@ class FinanceController extends BaseController {
                 $userName = Info::getUserNameByUserId($value['userId']);
                 // Log::adminHandle('审核调整会员余额录入数据' . $userName . '发放' . $value['type'], 1, $value['userId'], $userName);
             }*/
-            return static::notice('Batch audit/audit reject member balance completed'); // 批量审核/审核拒绝会员余额完成
+            return static::notice(Yii::t('ctx', 'batchAuditMemberBalanceCompleted')); // 批量审核/审核拒绝会员余额完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -311,7 +311,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -364,7 +364,7 @@ class FinanceController extends BaseController {
      */
     public function actionWithdrawAdd() {
         if (Yii::$app->request->isPost) {// 新增会员提现成功
-            return parent::edit(WithdrawForm::class, 'The newly added member successfully withdrew cash', 'addByAdmin', ['add'], null, function ($form, $result) {
+            return parent::edit(WithdrawForm::class, Yii::t('ctx', 'addedMemberSuccessfullyWithdrewCash'), 'addByAdmin', ['add'], null, function ($form, $result) {
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '提现' . $result['WITHDRAW_AMOUNT'], 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -384,7 +384,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $withdraw = Withdraw::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$withdraw) {
-            return static::notice('The data does not exist', 400); // 数据不存在
+            return static::notice(Yii::t('ctx', 'dataDoesNotExists'), 400); // 数据不存在
         }
         $withdraw['BASE_INFO'] = Info::baseInfoZh($withdraw['USER_ID']);
         $withdraw['PLAN_PAID_AT'] = $withdraw['PLAN_PAID_AT'] ? Date::convert($withdraw['PLAN_PAID_AT']) : null;
@@ -406,7 +406,7 @@ class FinanceController extends BaseController {
             if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->editByAdmin()) {
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('修改提现信息,ID为:' . $result['ID'], 1, $result['USER_ID'], $user['USER_NAME']);
-                return static::notice('The withdrawal information is modified successfully.'); // 修改提现信息成功
+                return static::notice(Yii::t('ctx', 'withdrawalInformationModifiedSuccessfully')); // 修改提现信息成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -432,12 +432,12 @@ class FinanceController extends BaseController {
                     $userName = Info::getUserNameByUserId($k);
                     // Log::adminHandle('为会员' . $userName . '的提现流水号为' . $value . '改变提现状态至' . Withdraw::STATUS_NAME[$result['status']], 1, $k, $userName);
                 }
-                return static::notice('Status setting succeeded'); // 状态设置成功
+                return static::notice(Yii::t('ctx', 'statusSettingSucceeded')); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
-        return static::notice('Illegal request', 400); // 非法请求
+        return static::notice(Yii::t('ctx', 'illegalRequest'), 400); // 非法请求
     }
 
     /**
@@ -475,11 +475,11 @@ class FinanceController extends BaseController {
             }
         }
         $form = new FinanceExportForm();
-        $result = $form->run($filter, 'Withdraw_Apply'); // 提现申请
+        $result = $form->run($filter, Yii::t('ctx', 'exportWithdrawApplyExcelName')); // 提现申请
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -509,7 +509,7 @@ class FinanceController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('Error' . $errorMsg, 400);
+                return static::notice('Error:' . $errorMsg, 400);
             }
         }
     }
@@ -539,7 +539,7 @@ class FinanceController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('error' . $errorMsg, 400);
+                return static::notice('error:' . $errorMsg, 400);
             }
         }
     }
@@ -591,7 +591,7 @@ class FinanceController extends BaseController {
      */
     public function actionInvoiceAuditAdd() {
         if (Yii::$app->request->isPost) {
-            return parent::edit(InvoiceAuditForm::class, '发票录入成功', 'addByAdmin', ['addByAdmin'], null, function ($form, $result) {
+            return parent::edit(InvoiceAuditForm::class, Yii::t('ctx', 'invoiceEnteredSuccessfully'), 'addByAdmin', ['addByAdmin'], null, function ($form, $result) {
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '发票录入', 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -631,7 +631,7 @@ class FinanceController extends BaseController {
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->editByAdmin()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '发票录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('修改发票录入数据完成');
+            return static::notice(Yii::t('ctx', 'modifyInvoiceEntryCompleted'));
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -648,7 +648,7 @@ class FinanceController extends BaseController {
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->audit()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('审核' . $user['USER_NAME'] . '发票录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('审核发票数据完成');
+            return static::notice(Yii::t('ctx', 'reviewInvoiceDataCompleted'));
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -741,11 +741,11 @@ class FinanceController extends BaseController {
             'AUDIT_ADMIN_NAME' => 'ADMU.ADMIN_NAME',
         ]);
         $form = new FinanceExportForm();
-        $result = $form->run($filter, '会员业绩调整列表');
+        $result = $form->run($filter, Yii::t('ctx', 'memberPerformanceAdjustmentList'));
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -755,7 +755,7 @@ class FinanceController extends BaseController {
      */
     public function actionPerfApply() {
         if (\Yii::$app->request->isPost) { // 申请调整会员业绩成功
-            return static::edit(ChangePerfForm::class, 'The application to adjust the member performance was successful', 'add', ['add'], null, function ($formModel, $result) {
+            return static::edit(ChangePerfForm::class, Yii::t('ctx', 'applicationAdjustMemberPerfSuccess'), 'add', ['add'], null, function ($formModel, $result) {
                 // 添加操作日志
                 // Log::adminHandle('申请调整会员' . $formModel->userName . '的' . $formModel->location . '区业绩,调整额度为:' . $formModel->amount);
             });
@@ -773,11 +773,13 @@ class FinanceController extends BaseController {
         $periodNum = Period::sentMaxPeriodNum();
         if (Period::find()->where('IS_SENT=:IS_SENT AND PERIOD_NUM>=:START_PERIOD_NUM AND PERIOD_NUM<=:END_PERIOD_NUM', [':IS_SENT' => Period::SEND_FINISH, ':START_PERIOD_NUM' => $periodNum + 1, ':END_PERIOD_NUM' => $periodNum + 1])->count() == 1) {
 //            return static::notice('下一期【' . ($periodNum + 1) . '】已挂网,该期无法调整', 400);
-            return static::notice('The next period [' . ($periodNum + 1) . '] has been connected to the net, and this period cannot be adjusted', 400);
+            return static::notice(Yii::t('ctx', 'nextPeriodConnectedNetCannotAdjusted',[
+                'periodNum' => $periodNum + 1
+            ]), 400);
         }
         $userName = \Yii::$app->request->get('userName');
         if (!$userId = Info::getUserIdByUserName($userName)) {
-            return static::notice('Member does not exist', 400); // 会员不存在
+            return static::notice(Yii::t('ctx', 'memberDoesNotExist'), 400); // 会员不存在
         }
         $perf = PerfAudit::getUserPerfAndPerfPeriod($userId, $periodNum);
         return static::notice(array_merge(['REAL_NAME' => Info::getUserRealNameByUserId($userId)], $perf));
@@ -792,7 +794,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $perfAudit = PerfAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$perfAudit) {
-            return static::notice('The data does not exist', 400); // 数据不存在
+            return static::notice(Yii::t('ctx', 'dataDoesNotExists'), 400); // 数据不存在
         }
         $perf = PerfAudit::getUserPerfAndPerfPeriod($perfAudit['USER_ID'], $perfAudit['PERIOD_NUM']);
         return static::notice(['userInfo'=>array_merge(['USER_NAME' => Info::getUserNameByUserId($perfAudit['USER_ID']),'REAL_NAME' => Info::getUserRealNameByUserId($perfAudit['USER_ID'])], $perf),'perfAudit'=>['periodNum'=>$perfAudit['PERIOD_NUM'],'perfType'=>$perfAudit['PERF_TYPE'],'location'=>$perfAudit['PERF_LOCATION'],'amount'=>Tool::formatPrice($perfAudit['AMOUNT']),'remark'=>$perfAudit['REMARK'],'id'=>$perfAudit['ID']]]);
@@ -810,7 +812,7 @@ class FinanceController extends BaseController {
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->pass()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('审核通过' . $user['USER_NAME'] . '调整会员业绩录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('审核通过调整会员业绩成功');
+            return static::notice(Yii::t('ctx', 'passReviewAdjustPerfSuccess'));
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -829,7 +831,7 @@ class FinanceController extends BaseController {
                 $userName = Info::getUserNameByUserId($value['userId']);
                 // Log::adminHandle('审核调整会员业绩录入数据' . $userName, 1, $value['userId'], $userName);
             }
-            return static::notice('批量审核/审核拒绝会员业绩完成');
+            return static::notice(Yii::t('ctx', 'batchReviewMemberPerfCompletion'));
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -877,7 +879,7 @@ class FinanceController extends BaseController {
      */
     public function actionDealTypeAdd() {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DealTypeForm::class, '交易类型添加成功', 'add', ['add'], null, function ($form, $result) {
+            return parent::edit(DealTypeForm::class, Yii::t('ctx', 'transactionTypeAddSuccess'), 'add', ['add'], null, function ($form, $result) {
                 // Log::adminHandle('交易类型录入');
             });
         }
@@ -892,7 +894,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $dealType = DealType::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$dealType) {
-            return static::notice('The data does not exist', 400); // 数据不存在
+            return static::notice(Yii::t('ctx', 'dataDoesNotExists'), 400); // 数据不存在
         }
         return static::notice(['id' => $dealType['ID'], 'typeName' => $dealType['TYPE_NAME'], 'isEnable' => $dealType['IS_ENABLE'] ? true : false, 'isPreset' => $dealType['IS_PRESET'] ? true : false, 'createRemark' => $dealType['CREATE_REMARK'], 'sort' => $dealType['SORT_ORDER']]);
     }
@@ -908,7 +910,7 @@ class FinanceController extends BaseController {
         $formModel->scenario = 'edit';
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             // Log::adminHandle('修改交易类型');
-            return static::notice('修改交易类型完成');
+            return static::notice(Yii::t('ctx', 'modifyTransactionTypeCompleted'));
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -920,7 +922,7 @@ class FinanceController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionDealTypeDelete() {
-        return static::notice('无法删除', 400);
+        return static::notice(Yii::t('ctx', 'unableDelete'), 400);
         $result = static::delete(DealType::class, null, function ($selected) {
             DealTypeForm::delete($selected);
             // Log::adminHandle('删除交易类型');
@@ -955,7 +957,7 @@ class FinanceController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误:' . $errorMsg, 400);
+                return static::notice($errorMsg, 400);
             }
         }
     }
@@ -985,7 +987,7 @@ class FinanceController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误:' . $errorMsg, 400);
+                return static::notice($errorMsg, 400);
             }
         }
     }
@@ -1082,7 +1084,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1128,7 +1130,7 @@ class FinanceController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1149,13 +1151,16 @@ class FinanceController extends BaseController {
                     $userName = Info::getUserNameByUserId($k);
                     // Log::adminHandle('为会员' . $userName . '的充值流水号为' . $value . '改变充值状态至' . Recharge::STATUS_NAME[$result['status']], 1, $k, $userName);
                 }
-                return static::notice('Status setting succeeded'); // 状态设置成功
+                return static::notice(Yii::t('ctx', 'statusSettingSucceeded')); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
         // 所有开户行
-        $statusArray = [2=>'Approve',3=>'Reject']; // 2=>'审核通过',3=>'审核拒绝'
+        $statusArray = [
+            2=>Yii::t('ctx', 'backendApiControllersFinaceRechargeStatusApprove'),
+            3=>Yii::t('ctx', 'backendApiControllersFinaceRechargeStatusReject'),
+        ]; // 2=>'审核通过',3=>'审核拒绝'
         return static::notice(['statusArray' => $statusArray]);
     }
 

+ 1 - 1
backendApi/modules/v1/controllers/LogController.php

@@ -100,7 +100,7 @@ class LogController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 3 - 3
backendApi/modules/v1/controllers/ReconsumeController.php

@@ -68,7 +68,7 @@ class ReconsumeController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -123,7 +123,7 @@ class ReconsumeController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -391,7 +391,7 @@ class ReconsumeController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**

+ 7 - 7
backendApi/modules/v1/controllers/ShopController.php

@@ -97,7 +97,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -356,7 +356,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     // 删除订单
@@ -421,7 +421,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -694,7 +694,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -723,7 +723,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -817,7 +817,7 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -844,6 +844,6 @@ class ShopController extends BaseController {
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(\Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 }

+ 9 - 9
backendApi/modules/v1/controllers/UserController.php

@@ -213,7 +213,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -326,7 +326,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -453,7 +453,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -574,7 +574,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -687,7 +687,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -755,7 +755,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -1917,7 +1917,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2214,7 +2214,7 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 
     /**
@@ -2368,6 +2368,6 @@ class UserController extends BaseController
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
-        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+        return static::notice(Yii::t('ctx', 'startExporting')); // 导出开始,请到文件管理-导出文件查看
     }
 }

+ 8 - 8
backendApi/modules/v1/models/AdminForm.php

@@ -40,7 +40,7 @@ class AdminForm extends Model
             [['password', 'surePassword'], 'required', 'on'=>['add', 'changePassword', 'noLoginModifyPassword']],
             [['adminName', 'oldPassword'], 'required', 'on'=>['noLoginModifyPassword']],
             [['adminName'], 'unique', 'targetClass'=>Admin::class, 'targetAttribute'=>'ADMIN_NAME', 'on'=>['add']],
-            ['surePassword', 'compare', 'compareAttribute'=>'password', 'message' => 'The two passwords must be the same'], // 两次密码必须一致
+            ['surePassword', 'compare', 'compareAttribute'=>'password', 'message' => \Yii::t('ctx', 'twoPasswordsMustSame')], // 两次密码必须一致
         ];
     }
 
@@ -114,20 +114,20 @@ class AdminForm extends Model
         } elseif($this->scenario == 'noLoginModifyPassword') {
             $model =  Admin::findOne(["ADMIN_NAME"=>$this->adminName]);
             if( !$model ) {
-                $this->addError('noLoginModifyPassword', 'The member name does not exist'); // 不存在的用户名
+                $this->addError('noLoginModifyPassword', \Yii::t('ctx', 'memberNameDoesNotExist')); // 不存在的用户名
                 return null;
             }
             if( $this->oldPassword === $this->password ) {
-                $this->addError('noLoginModifyPassword', 'The login password has not changed'); // 登录密码没有发生改变
+                $this->addError('noLoginModifyPassword', \Yii::t('ctx', 'loginPasswordHasNotChanged')); // 登录密码没有发生改变
                 return null;
             }
             if ( !$model->validatePassword($this->oldPassword) ) {
-                $this->addError('noLoginModifyPassword', 'The old login password is incorrect'); // 原登录密码错误
+                $this->addError('noLoginModifyPassword', \Yii::t('ctx', 'oldLoginPasswordIncorrect')); // 原登录密码错误
                 return null;
             }
             $model->IS_MODIFY_PASSWORD = 0;
         }else {
-            $this->addError('id', 'The submission does not exist'); // 提交场景不存在
+            $this->addError('id', \Yii::t('ctx', 'submissionDoesNotExist')); // 提交场景不存在
             return null;
         }
 
@@ -135,7 +135,7 @@ class AdminForm extends Model
         if($this->password){
             if ($this->scenario == 'changePassword' || $this->scenario == 'noLoginModifyPassword'){
                 if (strlen($this->password) < 8){
-                    $this->addError($this->scenario, 'The password must contain at least eight characters'); // 登录密码不能小于8位
+                    $this->addError($this->scenario, \Yii::t('ctx', 'passwordLeastEightCharacters')); // 登录密码不能小于8位
                     return null;
                 }
 //               $symbol = '!#$%^&*';
@@ -143,7 +143,7 @@ class AdminForm extends Model
                $passwordRules = '/^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)(?!['.$symbol.']+$)[\da-zA-z'.$symbol.']{8,}$/';
                $verificationResults = preg_match($passwordRules,$this->password);
                if (!$verificationResults){
-                   $this->addError($this->scenario, 'The password must contain at least two types of digits, capital letters, small letters and special characters'); // 登录密码中需要包含数字、大写字母、小写字母、特殊字符至少两种
+                   $this->addError($this->scenario, \Yii::t('ctx', 'passwordRule')); // 登录密码中需要包含数字、大写字母、小写字母、特殊字符至少两种
                    return null;
                }
             }
@@ -196,7 +196,7 @@ class AdminForm extends Model
     public function beforeDelete($selected) {
         foreach ($selected as $value){
             if($value==\Yii::$app->user->id){
-                throw new \Exception('无法删除自己');
+                throw new \Exception(\Yii::t('ctx', 'unableToDeleteOneSelf'));
             }
         }
         $this->adminOperateLogger->setIsBatch(true)->beforeDelete($selected, 'ID');

+ 1 - 2
backendApi/modules/v1/models/AdminRoleForm.php

@@ -172,7 +172,7 @@ class AdminRoleForm extends Model
         $this->adminOperateLogger->setIsBatch(true)->beforeDelete($selected, 'ID');
         foreach ($selected as $id) {
             if(Admin::find()->where('ROLE_ID=:ROLE_ID',[':ROLE_ID'=>$id])->exists()){
-                throw new \Exception('所选角色下有管理员不得删除');
+                throw new \Exception(\Yii::t('ctx', 'adminUnderSelectedRoleCannotDeleted'));
             }
         }
     }
@@ -186,5 +186,4 @@ class AdminRoleForm extends Model
             'optType' => '删除管理员角色',
         ]);
     }
-
 }

+ 0 - 0
common/config/i18n.php


+ 0 - 0
common/messages/en-US/app.php


+ 87 - 2
common/messages/en-US/ctx.php

@@ -1,6 +1,91 @@
 <?php
 return [
+    #Admin
+    'AdminAddedSuccessfully' => 'Administrator added successfully',
+    'AdminEditedSuccessfully' => 'Administrator edited successfully',
+    'passwordChangeSucceeded' => 'Password change succeeded',
+    'successAddAdminRole' => 'Successfully added the administrator role',
+    'editAdminRoleSuccess' => 'Edit administrator role succeeded',
+    'roleDoesNotExist' => 'Role does not exist',
+    'successSetAdminRolePermissions' => 'Successfully set administrator role permissions',
+    'successSetAdminRoleListFieldPermissions' => 'Successfully set administrator role list field permissions',
+    'adminUnderSelectedRoleCannotDeleted' => 'Administrators under the selected role cannot be deleted',
+    'twoPasswordsMustSame' => 'The two passwords must be the same',
+    'memberNameDoesNotExist' => 'The member name does not exist',
+    'loginPasswordHasNotChanged' => 'The login password has not changed',
+    'oldLoginPasswordIncorrect' => 'The old login password is incorrect',
+    'submissionDoesNotExist' => 'The submission does not exist',
+    'passwordLeastEightCharacters' => 'The password must contain at least eight characters',
+    'passwordRule' => 'The password must contain at least two types of digits, capital letters, small letters and special characters',
+    'unableToDeleteOneSelf' => 'Unable to delete oneself',
+
+    #Finance
+    // 系统功能
+    'commonModelsWithdrawStatusNameStatusApplied' => 'Applied',
+    'commonModelsWithdrawStatusNameStatusAudited' => 'Withdrawal has been reviewed',
+    'commonModelsWithdrawStatusNameStatusWaitPaid' => 'Unpaid',
+    'commonModelsWithdrawStatusNameStatusPaidFalse' => 'Failed',
+    'commonModelsWithdrawStatusNameStatusRefused' => 'Refused',
+    'commonModelsWithdrawStatusNameStatusPaid' => 'Withdrawal has been paid',
+    'commonModelsWithdrawStatusNameStatusReturned' => 'Returned',
+    'backendApiControllersFinaceRechargeStatusApprove' => 'Approve',
+    'backendApiControllersFinaceRechargeStatusReject' => 'Reject',
+
+    'memberEcoinAdjustmentListFileName'=> 'Member_Ecoin_adjustment_list',
+    'applicationChangeBalanceSucceeded'=> 'Application for change of member balance succeeded',
+    'applicationCannotReviewedAgain'=> 'The application has been reviewed and cannot be reviewed again',
+    'idNotMatchName'=>'Member ID does not match member name',
+    'incorrectBalanceType'=>'Incorrect balance type',
+    'incorrectTransactionType'=>'Incorrect transaction type',
+    'adjustmentAmountCannotZero'=>'The adjustment amount cannot be 0',
+    'pointsEnoughAdjustmentNotAllowed' => 'Insufficient balance of member cancellation points, adjustment not allowed',
+    'cannotSetPendingReview' => 'Cannot be set to pending review',
+    'auditCannotRepeated' => 'The audit has been approved and cannot be repeated',
+    'rejectedAuditCannotRepeated'=> 'It has been reviewed and rejected and cannot be reviewed again',
+    'statusParameterError' => 'Status parameter error',
+    'adjustmentBalanceCodeFailed' => 'Balance adjustment review verification code failed',
+    'aPieceMustBeSelected' => 'A piece of data must be selected',
+    'noEligibleData' => 'No eligible data',
+    'modificationAdjustmentMemberBalanceCompleted'=>'Modification and adjustment of member balance entry data completed',
+    'reviewThroughMemberBalance'=>'The review is done through the member balance',
+    'batchAuditMemberBalanceCompleted'=>'Batch audit/audit reject member balance completed',
+    'addedMemberSuccessfullyWithdrewCash' => 'The newly added member successfully withdrew cash',
+    'withdrawalInformationModifiedSuccessfully'=>'The withdrawal information is modified successfully',
+    'withdrawalApplyDoesNotExist'=>'The withdrawal application does not exist',
+    'memberNameOrNumberInconsistentSystem' => 'The member name or ID number number entered is inconsistent with the system',
+    'memberRegisterTypeInconsistentWithSystem'=>'The selected member registration type is inconsistent with the system',
+    'withdrawalMustGreaterThanZero'=>'The withdrawal amount must be greater than 0',
+    'withdrawalAmountMustInteger' => 'Withdrawal amount must be an integer',
+    'withdrawalAmountCannotLessThan' => 'The withdrawal amount cannot be less than',
+    'WithdrawalAmountCannotHigherThan' => 'Withdrawal amount cannot be higher than',
+    'withdrawalAmountMustLessThanAvailableBalance' => 'The withdrawal amount must be less than the available balance of',
+    'paymentPasswordIncorrect' => 'The payment password is incorrect',
+    'failedApplyWithdrawalVerify' => 'Failed to apply for cash withdrawal verification',
+    'withdrawalAuditVerificationFailed' => 'Withdrawal audit verification failed',
+    'cannotSelectDateInThePast'=>'Cannot select a date in the past',
+    'statusSettingSucceeded' => 'Status setting succeeded',
+    'exportWithdrawApplyExcelName' => 'Withdraw_Apply',
+    'invoiceEnteredSuccessfully' => 'Invoice entered successfully',
+    'modifyInvoiceEntryCompleted' => 'Modify invoice entry data completed',
+    'reviewInvoiceDataCompleted' => 'Review invoice data completed',
+    'memberPerformanceAdjustmentList' => 'Member Performance Adjustment List',
+    'applicationAdjustMemberPerfSuccess' => 'The application to adjust the member performance was successful',
+    'nextPeriodConnectedNetCannotAdjusted' => 'The next period [ {periodNum} ] has been connected to the net, and this period cannot be adjusted',
+    'passReviewAdjustPerfSuccess' => "Pass the review and adjust the member's performance successfully",
+    'batchReviewMemberPerfCompletion' => 'Batch review/review reject member performance completion',
+    'transactionTypeAddSuccess'=> 'Transaction type added successfully',
+    'modifyTransactionTypeCompleted' => 'Modify transaction type completed',
+    'unableDelete' => 'Unable to delete',
+
+
     # 公用
+    'amountUnit' => '₦',
+    'sceneDoesNotExist' => 'Scene does not exist',
+    'memberDoesNotExist' => 'Member does not exist',
+    'mustSelectOneItemToDelete' => 'must select one item to delete',
+    'dataNotExists' => 'Data not exists',
+    'startExporting'=> 'Starting exporting, please go to File Management - Export Files to view.',
+    'incorrectDateFormat' => 'Incorrect date format',
     'notConnection' => 'Connection not operated for too long',
     'deleteFailed' => 'failed to delete',
     'deleteSuccessfully' => 'delete successfully',
@@ -202,7 +287,7 @@ return [
     'failedToGenerateMemberNumber' => 'Failed to generate member number',
     'memberNumberDoesNotExist' => 'Member number does not exist',
     'repeatSalesMemberNoDoesNotExist' => 'Repeat sales Member No. does not exist',
-    'memberDoesNotExist' => 'Member does not exist',
+    
     'memberDoesNotInSamePlacementNetwork' => 'The member is not in the same placement network as the current user',
     'viewSubMembersMost' => 'View the top 20 sub members of the member at most',
     'upgradeMethodIncorrect' => 'The upgrade method is incorrect. Please contact the customer service personnel',
@@ -290,7 +375,7 @@ return [
 
     # 登录
     'refreshTokenFailed' => 'refresh token failed',
-    'passwordChangeSucceeded' => 'Password change succeeded',
+    
     'accountDoesNotExist' => 'The account does not exist',
     'memberNameOrPasswordIncorrect' => 'The member name or password is incorrect',
     'abnormalMemberCode' => 'Abnormal member code',

+ 0 - 0
common/messages/zh-CN/app.php


+ 86 - 2
common/messages/zh-CN/ctx.php

@@ -1,6 +1,90 @@
 <?php
 return [
+    #Admin
+    'AdminAddedSuccessfully' => '管理员添加成功',
+    'AdminEditedSuccessfully' => '管理员编辑成功',
+    'passwordChangeSucceeded' => '密码修改成功',
+    'successAddAdminRole' => '添加管理员角色成功',
+    'editAdminRoleSuccess' => '编辑管理员角色成功',
+    'roleDoesNotExist' => '角色不存在',
+    'successSetAdminRolePermissions' => '设置管理员角色权限成功',
+    'successSetAdminRoleListFieldPermissions' => '设置管理员角色列表字段权限成功',
+    'adminUnderSelectedRoleCannotDeleted' => '所选角色下有管理员不得删除',
+    'twoPasswordsMustSame' => '两次密码必须一致',
+    'memberNameDoesNotExist' => '不存在的用户名',
+    'loginPasswordHasNotChanged' => '登录密码没有发生改变',
+    'oldLoginPasswordIncorrect' => '原登录密码错误',
+    'submissionDoesNotExist' => '提交场景不存在',
+    'passwordLeastEightCharacters' => '登录密码不能小于8位',
+    'passwordRule' => '登录密码中需要包含数字、大写字母、小写字母、特殊字符至少两种',
+    'unableToDeleteOneSelf' => '无法删除自己',
+
+    #Finance
+    // 系统功能
+    'commonModelsWithdrawStatusNameStatusApplied' => '提现待审核',
+    'commonModelsWithdrawStatusNameStatusAudited' => '提现已审核',
+    'commonModelsWithdrawStatusNameStatusWaitPaid' => '提现待付款',
+    'commonModelsWithdrawStatusNameStatusPaidFalse' => '付款失败',
+    'commonModelsWithdrawStatusNameStatusRefused' => '已拒绝',
+    'commonModelsWithdrawStatusNameStatusPaid' => '提现已付款',
+    'commonModelsWithdrawStatusNameStatusReturned' => '已退回',
+    'backendApiControllersFinaceRechargeStatusApprove' => '审核通过',
+    'backendApiControllersFinaceRechargeStatusReject' => '审核拒绝',
+
+    'memberEcoinAdjustmentListFileName'=> '会员余额调整列表',
+    'applicationChangeBalanceSucceeded'=> '申请变动会员余额成功',
+    'applicationCannotReviewedAgain'=> '该申请已经被审核,不能重复审核',
+    'idNotMatchName'=>'会员编号与会员姓名不匹配',
+    'incorrectBalanceType'=>'余额类型不正确',
+    'incorrectTransactionType'=>'交易类型不正确',
+    'adjustmentAmountCannotZero'=>'调整金额不能为0',
+    'pointsEnoughAdjustmentNotAllowed' => '会员复消积分余额不足,不允许调整',
+    'cannotSetPendingReview' => '不能设置为待审核状态',
+    'auditCannotRepeated' => '已经审核通过不能重复审核',
+    'rejectedAuditCannotRepeated'=> '已经审核拒绝不能重复审核',
+    'statusParameterError' => '状态参数有误',
+    'adjustmentBalanceCodeFailed' => '余额调整审核校验码失败',
+    'aPieceMustBeSelected' => '必须选择一条数据',
+    'noEligibleData' => '没有符合条件的数据',
+    'modificationAdjustmentMemberBalanceCompleted'=>'修改调整会员余额录入数据完成',
+    'reviewThroughMemberBalance'=>'审核通过会员余额完成',
+    'batchAuditMemberBalanceCompleted'=>'批量审核/审核拒绝会员余额完成',
+    'addedMemberSuccessfullyWithdrewCash' => '新增会员提现成功',
+    'withdrawalInformationModifiedSuccessfully'=>'修改提现信息成功',
+    'withdrawalApplyDoesNotExist'=>'提现申请不存在',
+    'memberNameOrNumberInconsistentSystem' => '输入的会员姓名或身份证号与系统不一致',
+    'memberRegisterTypeInconsistentWithSystem'=>'选择的会员注册类型与系统不一致',
+    'withdrawalMustGreaterThanZero'=>'提现金额必须大于0',
+    'withdrawalAmountMustInteger'=>'提现金额必须是整数',
+    'withdrawalAmountCannotLessThan' => '提现金额不能少于',
+    'WithdrawalAmountCannotHigherThan' => '提现金额不能高于',
+    'withdrawalAmountMustLessThanAvailableBalance' => '提现金额必须小于的可用余额',
+    'paymentPasswordIncorrect' => '支付密码不正确',
+    'failedApplyWithdrawalVerify' => '申请提现校验失败',
+    'withdrawalAuditVerificationFailed' => '提现审核校验失败',
+    'cannotSelectDateInThePast'=>'不能选择过去的日期',
+    'statusSettingSucceeded' => '状态设置成功',
+    'exportWithdrawApplyExcelName' => '提现申请',
+    'invoiceEnteredSuccessfully' => '发票录入成功',
+    'modifyInvoiceEntryCompleted' => '修改发票录入数据完成',
+    'reviewInvoiceDataCompleted' => '审核发票数据完成',
+    'memberPerformanceAdjustmentList' => '会员业绩调整列表',
+    'applicationAdjustMemberPerfSuccess' => '申请调整会员业绩成功',
+    'nextPeriodConnectedNetCannotAdjusted' => '下一期 [ {periodNum} ] 已挂网,该期无法调整',
+    'passReviewAdjustPerfSuccess' => "审核通过调整会员业绩成功",
+    'batchReviewMemberPerfCompletion' => '批量审核/审核拒绝会员业绩完成',
+    'transactionTypeAddSuccess'=> '交易类型添加成功',
+    'modifyTransactionTypeCompleted' => '修改交易类型完成',
+    'unableDelete' => '无法删除',
+
     # 公用
+    'amountUnit' => '元',
+    'sceneDoesNotExist' => '场景不存在',
+    'memberDoesNotExist' => '会员不存在',
+    'mustSelectOneItemToDelete' => '必须选择一条删除数据',
+    'dataNotExists' => '数据不存在',
+    'startExporting'=> '导出开始,请到文件管理-导出文件查看',
+    'incorrectDateFormat' => '日期筛选格式不对',
     'notConnection' => '长时间未操作',
     'deleteFailed' => '删除失败',
     'deleteSuccessfully' => '删除成功',
@@ -207,7 +291,7 @@ return [
     'failedToGenerateMemberNumber' => '会员编号生成失败',
     'memberNumberDoesNotExist' => '会员编号不存在',
     'repeatSalesMemberNoDoesNotExist' => '复消会员编号不存在',
-    'memberDoesNotExist' => '会员不存在',
+    
     'memberDoesNotInSamePlacementNetwork' => '会员与当前用户不再同一安置网络内',
     'viewSubMembersMost' => '最多查看会员的前20层子会员',
     'upgradeMethodIncorrect' => '升级方式不正确,请联系客服人员',
@@ -300,7 +384,7 @@ return [
 
     # 登录
     'refreshTokenFailed' => '刷新token失败',
-    'passwordChangeSucceeded' => '密码修改成功',
+    
     'wrongTransactionType' => '错误的交易类型',
     'accountDoesNotExist' => '账号不存在',
     'memberNameOrPasswordIncorrect' => '用户名或密码错误',

+ 0 - 0
common/models/CalcBonusBSDefault.php


+ 0 - 0
common/models/CalcOperation.php


+ 7 - 7
common/models/Withdraw.php

@@ -66,14 +66,14 @@ class Withdraw extends \common\components\ActiveRecord {
     const STATUS_RETURN = 7;        // 提现退回
 
     const STATUS_NAME = [
-        self::STATUS_APPLIED => 'Applied', // 提现待审核
+        self::STATUS_APPLIED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusApplied'), // 提现待审核
 //        self::STATUS_INVOICED => '提现待审核',
-        self::STATUS_AUDITED => 'Withdrawal has been reviewed', // 提现已审核
-        self::STATUS_WAIT_PAID => 'Unpaid', // 提现待付款
-        self::STATUS_PAID_FALSE => 'Failed', // 付款失败
-        self::STATUS_REFUSED => 'Refused', // 已拒绝
-        self::STATUS_PAID => 'Withdrawal has been paid', // 提现已付款
-        self::STATUS_RETURN => 'Returned',
+        self::STATUS_AUDITED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusAudited'), // 提现已审核 
+        self::STATUS_WAIT_PAID => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusWaitPaid'), // 提现待付款 
+        self::STATUS_PAID_FALSE => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusPaidFalse'), // 付款失败  
+        self::STATUS_REFUSED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusRefused'), // 已拒绝 
+        self::STATUS_PAID => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusPaid'), // 提现已付款 
+        self::STATUS_RETURN => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusReturned'), // 已退回
     ];
 
     /**

+ 16 - 16
common/models/forms/ChangeBalanceForm.php

@@ -109,7 +109,7 @@ class ChangeBalanceForm extends Model {
         $model = $this->_model = BalanceAudit::findOne(['ID' => $this->id]);
         $this->_userId = $model['USER_ID'];
         if ($model->AUDIT_STATUS > \Yii::$app->params['auditStatus']['un']['value']) {
-            $this->addError($attribute, 'The application has been reviewed and cannot be reviewed again');// 该申请已经被审核,不能重复审核
+            $this->addError($attribute, \Yii::t('ctx', 'applicationCannotReviewedAgain'));// 该申请已经被审核,不能重复审核
         }
     }
 
@@ -124,11 +124,11 @@ class ChangeBalanceForm extends Model {
             if ($this->scenario == 'excelChangeBalance') {
                 $realName = Info::getUserRealNameByUserId($this->_userId);
                 if ($realName != $this->realName) {
-                    $this->addError($attribute, '会员编号与会员姓名不匹配');
+                    $this->addError($attribute, \Yii::t('ctx', 'idNotMatchName'));
                 }
             }
         } else {
-            $this->addError($attribute, 'Member does not exist'); // 会员不存在
+            $this->addError($attribute, \Yii::t('ctx', 'memberDoesNotExist')); // 会员不存在
         }
     }
 
@@ -138,7 +138,7 @@ class ChangeBalanceForm extends Model {
      */
     public function isType($attribute) {
         if (!key_exists($this->type, BalanceAudit::TYPE)) {
-            $this->addError($attribute, '余额类型不正确');
+            $this->addError($attribute, \Yii::t('ctx', 'incorrectBalanceType'));
         }
         // 查看表里面是否有想同类型的未审核单,如果有的话,不允许再申请,需等审核完成以后,才能申请
         /*if(BalanceAudit::find()->where('USER_ID=:USER_ID AND TYPE=:TYPE AND STATUS=:STATUS', [':USER_ID'=>$this->_userId, ':TYPE'=>$this->type, ':STATUS'=>BalanceAudit::STATUS_APPLIED])->exists()){
@@ -153,7 +153,7 @@ class ChangeBalanceForm extends Model {
      */
     public function isDealType($attribute) {
         if (!key_exists($this->dealType, DealType::getTypes())) {
-            $this->addError($attribute, '交易类型不正确');
+            $this->addError($attribute, \Yii::t('ctx', 'incorrectTransactionType'));
         }
     }
 
@@ -162,9 +162,9 @@ class ChangeBalanceForm extends Model {
      * @param $attribute
      */
     public function isAmount($attribute) {
-        if ($this->amount == 0) $this->addError($attribute, '调整金额不能为0');
+        if ($this->amount == 0) $this->addError($attribute, \Yii::t('ctx', 'adjustmentAmountCannotZero'));
         if ($this->amount < 0 && $this->type == 'reconsume_points' && abs($this->amount) > Balance::getBalanceReconsumePoints($this->_userId)) {
-            $this->addError('scenario', '会员复消积分余额不足,不允许调整');
+            $this->addError('scenario', \Yii::t('ctx', 'pointsEnoughAdjustmentNotAllowed'));
         }
 //        if ($this->amount < 0 && $this->type == 'lx' && abs($this->amount) > Balance::getBalanceLX($this->_userId)) {
 //            $this->addError('scenario', '会员领袖分红余额不足,不允许调整');
@@ -185,24 +185,24 @@ class ChangeBalanceForm extends Model {
         }
         switch ($this->auditStatus) {
             case 'un':
-                $this->addError($attribute, 'Cannot be set to pending review' . $this->auditStatus); // 不能设置为待审核状态
+                $this->addError($attribute, \Yii::t('ctx', 'cannotSetPendingReview') . $this->auditStatus); // 不能设置为待审核状态
                 break;
             case 'true':
                 if (isset($oneData['AUDIT_STATUS']) && $oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['true']['value']) {
-                    $this->addError($attribute, 'The audit has been approved and cannot be repeated'); // 已经审核通过不能重复审核
+                    $this->addError($attribute, \Yii::t('ctx', 'auditCannotRepeated')); // 已经审核通过不能重复审核
                 } elseif (isset($oneData['AUDIT_STATUS']) && $oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['reject']['value']) {
-                    $this->addError($attribute, 'It has been reviewed and rejected and cannot be reviewed again'); // 已经审核拒绝不能重复审核
+                    $this->addError($attribute, \Yii::t('ctx', 'rejectedAuditCannotRepeated')); // 已经审核拒绝不能重复审核
                 }
                 break;
             case 'reject':
                 if ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['true']['value']) {
-                    $this->addError($attribute, 'The audit has been approved and cannot be repeated'); // 已经审核通过不能重复审核
+                    $this->addError($attribute, \Yii::t('ctx', 'auditCannotRepeated')); // 已经审核通过不能重复审核
                 } elseif ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['reject']['value']) {
-                    $this->addError($attribute, 'It has been reviewed and rejected and cannot be reviewed again'); // 已经审核拒绝不能重复审核
+                    $this->addError($attribute, \Yii::t('ctx', 'rejectedAuditCannotRepeated')); // 已经审核拒绝不能重复审核
                 }
                 break;
             default:
-                $this->addError($attribute, '状态参数有误');
+                $this->addError($attribute, \Yii::t('ctx', 'statusParameterError'));
         }
     }
 
@@ -210,7 +210,7 @@ class ChangeBalanceForm extends Model {
         $adminId = \Yii::$app->user->id;
         $redisCode = \Yii::$app->redis->getset('balanceCode_'.$adminId,'');
         if ($this->balanceCode!=$redisCode) {
-            $this->addError($attribute, '余额调整审核校验码失败');
+            $this->addError($attribute, \Yii::t('ctx', 'adjustmentBalanceCodeFailed'));
         }
     }
 
@@ -220,7 +220,7 @@ class ChangeBalanceForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selected) {
-            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
+            $this->addError($attributes, \Yii::t('ctx', 'aPieceMustBeSelected')); // 必须选择一条数据
         }
         if (!is_array($this->selected)) {
             $this->selected = [$this->selected];
@@ -244,7 +244,7 @@ class ChangeBalanceForm extends Model {
         $this->selected = array_values($this->selected);
 
         if (!$this->selected) {
-            $this->addError($attributes, '没有符合条件的数据');
+            $this->addError($attributes, \Yii::t('ctx', 'noEligibleData'));
         }
     }
 

+ 16 - 16
common/models/forms/WithdrawForm.php

@@ -73,8 +73,8 @@ class WithdrawForm extends Model {
         return [
             [['id', 'userName', 'realName', 'idCard', 'regType', 'applyAmount', 'payPassword', 'planPaidAt', 'auditStatus', 'createdAt', 'remark', 'createRemark', 'selectedIds', 'sn', 'withdrawPeriodNum', 'paidAt', 'paidFailRemark', 'amount', 'bankRealName', 'bankNo'], 'trim'],
             [['id', 'userName', 'applyAmount', 'payPassword', 'auditStatus','withdrawCode','withdrawAudit'], 'required'],
-            [['id'], 'exist', 'targetClass' => Withdraw::class, 'targetAttribute' => 'ID', 'message' => '提现申请不存在'],
-            [['userName'], 'exist', 'targetClass' => UserInfo::class, 'targetAttribute' => 'USER_NAME', 'message' => '会员不存在'],
+            [['id'], 'exist', 'targetClass' => Withdraw::class, 'targetAttribute' => 'ID', 'message' => Yii::t('ctx', 'withdrawalApplyDoesNotExist')],
+            [['userName'], 'exist', 'targetClass' => UserInfo::class, 'targetAttribute' => 'USER_NAME', 'message' => Yii::t('ctx', 'memberDoesNotExist')],
             [['applyAmount'], 'price'],
             [['applyAmount'], 'isApplyAmount'],
             [['userName'], 'isUserName'],
@@ -131,15 +131,15 @@ class WithdrawForm extends Model {
             if ($this->scenario == 'addByAdmin') {
                 $baseInfo = Info::baseInfoZh($userInfo['USER_ID']);
                 if ($baseInfo['REAL_NAME'] != $this->realName || $baseInfo['ID_CARD'] != $this->idCard) {
-                    $this->addError($attributes, '输入的会员姓名或身份证号与系统不一致');
+                    $this->addError($attributes, Yii::t('ctx', 'memberNameOrNumberInconsistentSystem'));
                 }
                 if ($userInfo['REG_TYPE'] != $this->regType) {
-                    $this->addError($attributes, '选择的会员注册类型与系统不一致');
+                    $this->addError($attributes, Yii::t('ctx', 'memberRegisterTypeInconsistentWithSystem'));
                 }
             }
             $this->_userId = $userInfo['USER_ID'];
         } else {
-            $this->addError($attributes, $this->userName . 'Member does not exist'); // 会员不存在
+            $this->addError($attributes, $this->userName . Yii::t('ctx', 'memberDoesNotExist'));
         }
     }
 
@@ -151,10 +151,10 @@ class WithdrawForm extends Model {
     public function isApplyAmount($attribute) {
         $config = Cache::getSystemConfig();
         if ($this->applyAmount <= 0) {
-            $this->addError('scenario', '提现金额必须大于0');
+            $this->addError('scenario', Yii::t('ctx', 'withdrawalMustGreaterThanZero'));
         }
         if ((int)($this->applyAmount)!=$this->applyAmount) {
-            $this->addError('scenario', '提现金额必须是整数');
+            $this->addError('scenario', Yii::t('ctx', 'withdrawalAmountMustInteger'));
         }
         $minAmount = 0;
         $maxAmount = 0;
@@ -166,14 +166,14 @@ class WithdrawForm extends Model {
             $userInfo = UserInfo::findOneAsArray(['USER_NAME' => $this->userName]);
             $this->_userId = $userInfo['USER_ID'];
         } else {
-            $this->addError($attribute, '场景不存在');
+            $this->addError($attribute, Yii::t('ctx', 'sceneDoesNotExist'));
             return false;
         }
         if ($minAmount != 0 && $this->applyAmount < $minAmount) {
-            $this->addError($attribute, '提现金额不能少于' . $minAmount . '元');
+            $this->addError($attribute, Yii::t('ctx', 'withdrawalAmountCannotLessThan') . $minAmount . Yii::t('ctx', 'amountUnit'));
         }
         if ($maxAmount != 0 && $this->applyAmount > $maxAmount) {
-            $this->addError($attribute, '提现金额不能高于' . $maxAmount . '元');
+            $this->addError($attribute, Yii::t('ctx', 'WithdrawalAmountCannotHigherThan') . $maxAmount . Yii::t('ctx', 'amountUnit'));
         }
 
         // 提现条件判断
@@ -186,7 +186,7 @@ class WithdrawForm extends Model {
 //        }
         // 获取当前提现用户的金额
         if ($this->applyAmount > Balance::getAvailableBalance($this->_userId)) {
-            $this->addError('scenario', '提现金额必须小于的可用余额');
+            $this->addError('scenario', Yii::t('ctx', 'withdrawalAmountMustLessThanAvailableBalance'));
         }
     }
 
@@ -197,7 +197,7 @@ class WithdrawForm extends Model {
      */
     public function validatePassword($attribute, $params) {
         if (!User::validatePayPassword($this->_userId, $this->payPassword)) {
-            $this->addError($attribute, 'The payment password is incorrect');//支付密码不正确
+            $this->addError($attribute, Yii::t('ctx', 'paymentPasswordIncorrect'));//支付密码不正确
         }
     }
 
@@ -206,7 +206,7 @@ class WithdrawForm extends Model {
         $redisCode = \Yii::$app->redis->getset('withdrawCode_'.$uid,'');
         \Yii::$app->redis->del('withdrawCode_'.$uid);
         if ($this->withdrawCode!=$redisCode) {
-            $this->addError($attribute, '申请提现校验失败');
+            $this->addError($attribute, Yii::t('ctx', 'failedApplyWithdrawalVerify'));
         }
     }
 
@@ -214,7 +214,7 @@ class WithdrawForm extends Model {
         $adminId = \Yii::$app->user->id;
         $redisCode = \Yii::$app->redis->getset('withdrawAudit_'.$adminId,'');
         if ($this->withdrawAudit!=$redisCode) {
-            $this->addError($attribute, '提现审核校验失败');
+            $this->addError($attribute, Yii::t('ctx', 'withdrawalAuditVerificationFailed'));
         }
     }
 
@@ -224,7 +224,7 @@ class WithdrawForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selectedIds) {
-            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
+            $this->addError($attributes, Yii::t('ctx', 'aPieceMustBeSelected')); // 必须选择一条数据
         }
         if (!is_array($this->selectedIds)) {
             $this->selectedIds = [$this->selectedIds];
@@ -244,7 +244,7 @@ class WithdrawForm extends Model {
      */
     public function isPlanPaidAt($attribute) {
         if (Date::utcToTime($this->planPaidAt) < Date::nowTime()) {
-            $this->addError($attribute, '不能选择过去的日期');
+            $this->addError($attribute, Yii::t('ctx', 'cannotSelectDateInThePast'));
         }
     }
 

+ 0 - 0
composer.lock


+ 0 - 0
frontendApi/config/menuV2.php


+ 0 - 0
node_modules/.package-lock.json


+ 0 - 0
node_modules/moment/CHANGELOG.md


+ 0 - 0
node_modules/moment/LICENSE


+ 0 - 0
node_modules/moment/README.md


+ 0 - 0
node_modules/moment/dist/locale/af.js


+ 0 - 0
node_modules/moment/dist/locale/ar-dz.js


+ 0 - 0
node_modules/moment/dist/locale/ar-kw.js


+ 0 - 0
node_modules/moment/dist/locale/ar-ly.js


+ 0 - 0
node_modules/moment/dist/locale/ar-ma.js


+ 0 - 0
node_modules/moment/dist/locale/ar-sa.js


+ 0 - 0
node_modules/moment/dist/locale/ar-tn.js


+ 0 - 0
node_modules/moment/dist/locale/ar.js


+ 0 - 0
node_modules/moment/dist/locale/az.js


+ 0 - 0
node_modules/moment/dist/locale/be.js


+ 0 - 0
node_modules/moment/dist/locale/bg.js


+ 0 - 0
node_modules/moment/dist/locale/bm.js


+ 0 - 0
node_modules/moment/dist/locale/bn-bd.js


+ 0 - 0
node_modules/moment/dist/locale/bn.js


+ 0 - 0
node_modules/moment/dist/locale/bo.js


+ 0 - 0
node_modules/moment/dist/locale/br.js


+ 0 - 0
node_modules/moment/dist/locale/bs.js


+ 0 - 0
node_modules/moment/dist/locale/ca.js


+ 0 - 0
node_modules/moment/dist/locale/cs.js


+ 0 - 0
node_modules/moment/dist/locale/cv.js


+ 0 - 0
node_modules/moment/dist/locale/cy.js


+ 0 - 0
node_modules/moment/dist/locale/da.js


+ 0 - 0
node_modules/moment/dist/locale/de-at.js


+ 0 - 0
node_modules/moment/dist/locale/de-ch.js


+ 0 - 0
node_modules/moment/dist/locale/de.js


+ 0 - 0
node_modules/moment/dist/locale/dv.js


+ 0 - 0
node_modules/moment/dist/locale/el.js


+ 0 - 0
node_modules/moment/dist/locale/en-au.js


+ 0 - 0
node_modules/moment/dist/locale/en-ca.js


+ 0 - 0
node_modules/moment/dist/locale/en-gb.js


+ 0 - 0
node_modules/moment/dist/locale/en-ie.js


+ 0 - 0
node_modules/moment/dist/locale/en-il.js


+ 0 - 0
node_modules/moment/dist/locale/en-in.js


+ 0 - 0
node_modules/moment/dist/locale/en-nz.js


+ 0 - 0
node_modules/moment/dist/locale/en-sg.js


+ 0 - 0
node_modules/moment/dist/locale/eo.js


+ 0 - 0
node_modules/moment/dist/locale/es-do.js


+ 0 - 0
node_modules/moment/dist/locale/es-mx.js


+ 0 - 0
node_modules/moment/dist/locale/es-us.js


+ 0 - 0
node_modules/moment/dist/locale/es.js


+ 0 - 0
node_modules/moment/dist/locale/et.js


+ 0 - 0
node_modules/moment/dist/locale/eu.js


+ 0 - 0
node_modules/moment/dist/locale/fa.js


+ 0 - 0
node_modules/moment/dist/locale/fi.js


+ 0 - 0
node_modules/moment/dist/locale/fil.js


+ 0 - 0
node_modules/moment/dist/locale/fo.js


+ 0 - 0
node_modules/moment/dist/locale/fr-ca.js


+ 0 - 0
node_modules/moment/dist/locale/fr-ch.js


+ 0 - 0
node_modules/moment/dist/locale/fr.js


+ 0 - 0
node_modules/moment/dist/locale/fy.js


+ 0 - 0
node_modules/moment/dist/locale/ga.js


+ 0 - 0
node_modules/moment/dist/locale/gd.js


+ 0 - 0
node_modules/moment/dist/locale/gl.js


+ 0 - 0
node_modules/moment/dist/locale/gom-deva.js


+ 0 - 0
node_modules/moment/dist/locale/gom-latn.js


+ 0 - 0
node_modules/moment/dist/locale/gu.js


+ 0 - 0
node_modules/moment/dist/locale/he.js


+ 0 - 0
node_modules/moment/dist/locale/hi.js


+ 0 - 0
node_modules/moment/dist/locale/hr.js


+ 0 - 0
node_modules/moment/dist/locale/hu.js


+ 0 - 0
node_modules/moment/dist/locale/hy-am.js


+ 0 - 0
node_modules/moment/dist/locale/id.js


+ 0 - 0
node_modules/moment/dist/locale/is.js


+ 0 - 0
node_modules/moment/dist/locale/it-ch.js


+ 0 - 0
node_modules/moment/dist/locale/it.js


+ 0 - 0
node_modules/moment/dist/locale/ja.js


+ 0 - 0
node_modules/moment/dist/locale/jv.js


+ 0 - 0
node_modules/moment/dist/locale/ka.js


+ 0 - 0
node_modules/moment/dist/locale/kk.js


+ 0 - 0
node_modules/moment/dist/locale/km.js


+ 0 - 0
node_modules/moment/dist/locale/kn.js


+ 0 - 0
node_modules/moment/dist/locale/ko.js


+ 0 - 0
node_modules/moment/dist/locale/ku.js


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików