From 228746829283ce3b00a2bdb3976e35c21fae3585 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Thu, 22 Mar 2018 18:38:33 +0800
Subject: [PATCH] fix

---
 src/main/ui/static/dashboard/partner-dashboard.js             | 4 ++--
 src/main/ui/static/dashboard/templates/partner_dashboard.html | 2 +-
 .../templates/partner_dashboard_unsettled_dialog.html         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js
index 0211f9b9c..66a8b7377 100644
--- a/src/main/ui/static/dashboard/partner-dashboard.js
+++ b/src/main/ui/static/dashboard/partner-dashboard.js
@@ -554,13 +554,13 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
         });
         $scope.manualSettle  = function () {
             if($scope.currentSettle.locked){
-              alert("正在清算,暂不能提现,请稍后再试!");
+              alert("系统正好在执行清算任务,暂不能提现,请稍后再试!");
               return;
             }
             $scope.settle_to = $scope.params.to_date || $scope.params.maxData;
             $scope.settle_to = $filter('date')($scope.settle_to, 'yyyy-MM-dd');
             $http.put('/client/manual_settle/today', {settle_to: $scope.settle_to}).then(function () {
-                commonDialog.alert({title: 'Success', content: '提现成功', type: 'success'});
+                commonDialog.alert({title: 'Success', content: 'Withdraw application has been submitted', type: 'success'});
                 $scope.$close();
             }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html
index 1ee15af8a..17db7d8b5 100644
--- a/src/main/ui/static/dashboard/templates/partner_dashboard.html
+++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html
@@ -80,7 +80,7 @@
                         <!--<a role="button" ui-sref="settlementlogs"><label style="font-size: smaller;color: green">-->
                         <!--<i class="fa fa-info" aria-hidden="true" tooltip-placement="left-bottom" uib-tooltip="Click it,show settlement logs"></i></label></a>-->
                       <a role="button" ng-click="toShowUnSettledDialog()" ng-if="manual_settle&&([1]|withRole)">
-                        <i class="fa fa-info-circle" uib-tooltip="我要提现" aria-hidden="true"></i></a>
+                        <i class="fa fa-info-circle" uib-tooltip="withdraw deposit" aria-hidden="true"></i></a>
                         <label ng-if="analysis.pre_amount != 0" style="font-size: smaller;color: grey">(preauthorised {{analysis.pre_amount}})</label>
                     </span>
                 </div>
diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard_unsettled_dialog.html b/src/main/ui/static/dashboard/templates/partner_dashboard_unsettled_dialog.html
index 5d54e599c..67071d30a 100644
--- a/src/main/ui/static/dashboard/templates/partner_dashboard_unsettled_dialog.html
+++ b/src/main/ui/static/dashboard/templates/partner_dashboard_unsettled_dialog.html
@@ -8,6 +8,7 @@
 </style>
 <section class="content">
         <div class="box box-primary">
+            <div class="box-header">Select the range of withdrawals </div>
             <div class="box-body">
                 <div class="box-header">
                     <div class="form-inline">
@@ -35,7 +36,6 @@
                  </div>
             </div>
         <div class="box box-default">
-            <div class="box-header">Manual Settle</div>
             <div class="box-body table-responsive">
                 <table class="table table-hover">
                     <thead>
@@ -60,7 +60,7 @@
                 </table>
                 <div class="col-xs-12">
                     <div style="text-align: center">
-                        <a ng-class="{'disabled':settleParams.locked}"; role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope" ng-click="manualSettle()">提现</a>
+                        <a ng-class="{'disabled':settleParams.locked}"; role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope" ng-click="manualSettle()">Submit</a>
                     </div>
                 </div>
             </div>