Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -1599,8 +1599,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configNewClientRate(config, clientId, "jd", "jd_rate_value", org, "min_jd_rate");
         configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
         configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
-
+        //todo 暂不更新Rpay+ 费率信息
-        rpayApi.modifySurchargeConfig(client);
+//        rpayApi.modifySurchargeConfig(client);
 
     }
 

src/main/ui/static/payment/partner/templates/partner_bankaccounts.html

@@ -179,7 +179,7 @@
                 <tr>
                     <th>Rate Name</th>
                     <th>Rate Value</th>
-                    <th>Transaction Fee</th>
+                    <th>Transaction Fee(cent)</th>
                     <th>Active Time</th>
                     <th>Expire Time</th>
                     <th ng-if="bankCtrl.rate_name=='Wechat'">Clean Days</th>
@@ -193,8 +193,8 @@
                 <tr ng-repeat="rate in rates|filter:{rate_name:bankCtrl.rate_name}:true"
                     ng-class="{'text-bold':rate.current,'success':rate.active}">
                     <td ng-bind="rate.rate_name"></td>
-                    <td ng-bind="rate.rate_value"></td>
+                    <td ng-bind="rate.rate_value + ' %'"></td>
-                    <td ng-bind="rate.transaction_fee"></td>
+                    <td ng-bind="rate.transaction_fee + ' c'"></td>
                     <td ng-bind="rate.active_time|date:'yyyy-MM-dd'"></td>
                     <td ng-bind="rate.expiry_time|date:'yyyy-MM-dd'"></td>
                     <td ng-if="rate.rate_name=='Wechat'">T+{{rate.clean_days}}</td>

src/main/ui/static/payment/partner/templates/partner_new_rate.html

@@ -168,7 +168,7 @@
                         <div class="input-group">
                             <input type="number" name="Transaction_fee_value" stringToNumber2 class="form-control" ng-model="rate.transaction_fee"
                                    min="0" step="0.1" id="transaction_fee_input" required>
-
+                            <div class="input-group-addon">c</div>
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <div class="small text-danger" ng-message="min">

src/main/ui/static/payment/partner/templates/rate_config_dialog.html

@@ -43,7 +43,7 @@
                         <div class="input-group">
                             <input type="number" name="transaction_fee" class="form-control" ng-model="rate.transaction_fee"
                                    min="0" step="0.1" id="transaction_fee_input" required>
-
+                            <div class="input-group-addon">c</div>
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <!--<div class="small text-danger" ng-message="max">-->