Browse Source

translate

root 2 years ago
parent
commit
dce95a782a

+ 2 - 1
backendApi/modules/v1/models/lists/finance/RechargeList.php

@@ -73,7 +73,8 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                 'AUDIT_STATUS' => [
                     'header' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnAuditStatus'), // 审核状态
                     'value' => function ($row) {
-                        return Recharge::STATUS_NAME[$row['AUDIT_STATUS']];
+                        // return Recharge::STATUS_NAME[$row['AUDIT_STATUS']];
+                        return Recharge::getStatusName()[$row['AUDIT_STATUS']];
                     },
                     'headerOther' => [
                         'width' => '120',

+ 2 - 1
backendApi/modules/v1/models/lists/finance/WithdrawList.php

@@ -77,7 +77,8 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     'header' => \Yii::t('ctx', 'modelListFinanceWithdrawState'), // 提现状态
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return Withdraw::STATUS_NAME[$row['AUDIT_STATUS']];
+                        return Withdraw::getStatusName()[$row['AUDIT_STATUS']];
+                        // return Withdraw::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
                 ],
                 'USER_NAME' => [

+ 4 - 0
common/messages/en-US/ctx.php

@@ -104,6 +104,10 @@ return [
     'balanceAuditListCash' => 'Member Ecoin account',
     'balanceAuditListGaragePoints' => 'Car points',
     'balanceAuditListVillaPoints' => 'Villa points',
+    'financeRechargeListStatusTobeReviewed' => 'To be reviewed',
+    'financeRechargeListStatusApproved' => 'Approved',
+    'financeRechargeListStatusVoucherUploaded' => 'Voucher uploaded',
+    'financeRechargeListStatusRejected' => 'Rejected',
 
     'memberEcoinAdjustmentListFileName'=> 'Member_Ecoin_adjustment_list',
     'applicationChangeBalanceSucceeded'=> 'Application for change of member balance succeeded',

+ 7 - 3
common/messages/zh-CN/ctx.php

@@ -86,13 +86,17 @@ return [
     'rechargeAuditStatusVoucherUploaded'=>'已上传凭证',
     'rechargeAuditStatusAudited'=>'已审核',
     'rechargeRechargeState'=>'充值状态',
-    'rechargeRechargeStateNew'=>'New',
-    'rechargeRechargeStateProcessing'=>'Processing',
-    'rechargeRechargeStateSuccess'=>'Success',
+    'rechargeRechargeStateNew'=>'待审核',
+    'rechargeRechargeStateProcessing'=>'已上传凭证',
+    'rechargeRechargeStateSuccess'=>'已审核',
     'balanceAuditListGetBalanceAuditType' => '会员账户奖金',
     'balanceAuditListCash' => '会员账户余额',
     'balanceAuditListGaragePoints' => '车奖积分',
     'balanceAuditListVillaPoints' => '房奖积分',
+    'financeRechargeListStatusTobeReviewed' => '待审核',
+    'financeRechargeListStatusApproved' => '已审核',
+    'financeRechargeListStatusVoucherUploaded' => '已上传凭证',
+    'financeRechargeListStatusRejected' => '已拒绝',
 
     'memberEcoinAdjustmentListFileName'=> '会员余额调整列表',
     'applicationChangeBalanceSucceeded'=> '申请变动会员余额成功',

+ 10 - 0
common/models/Recharge.php

@@ -232,4 +232,14 @@ class Recharge extends \common\components\ActiveRecord {
         //$result = curl_exec($ch);
         echo $result;
     }
+
+    // 多语言状态名
+    public static function getStatusName() {
+        return [
+            self::STATUS_APPLIED => \Yii::t('ctx', 'financeRechargeListStatusTobeReviewed'), // 待审核
+            self::STATUS_PROVED => \Yii::t('ctx', 'financeRechargeListStatusVoucherUploaded'), // 已上传凭证
+            self::STATUS_AUDITED => \Yii::t('ctx', 'financeRechargeListStatusApproved'), // 已审核
+            self::STATUS_REFUSED => \Yii::t('ctx', 'financeRechargeListStatusRejected'), // 已拒绝
+        ];
+    }
 }

+ 14 - 1
common/models/Withdraw.php

@@ -413,5 +413,18 @@ class Withdraw extends \common\components\ActiveRecord {
         $total = self::find()->where('AUDIT_STATUS=:AUDIT_STATUS', [':AUDIT_STATUS' => $type])->sum('AMOUNT');
         return $total ? $total : '0.00';
     }
-
+    
+    // 提现状态
+    public static function getStatusName() {
+        return [
+            self::STATUS_APPLIED =>  Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusApplied'), // 提现待审核
+    //        self::STATUS_INVOICED => '提现待审核',
+            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'), // 已退回
+        ];
+    }
 }