Merge branch 'develop'

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(cent)</th>
+                    <th>Transaction Fee</th>
                     <th>Active Time</th>
                     <th>Expire Time</th>
                     <th ng-if="bankCtrl.rate_name=='Wechat'">Clean Days</th>
@@ -194,7 +194,7 @@
                     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.transaction_fee + ' c'"></td>
+                    <td ng-bind="'$ '+rate.transaction_fee"></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

@@ -167,8 +167,8 @@
                     <div class="col-sm-6">
                         <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>
+                                   min="0" step="0.1" max="1" id="transaction_fee_input" required>
+                            <div class="input-group-addon">$</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

@@ -42,8 +42,8 @@
                     <div class="col-sm-6">
                         <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>
+                                   min="0" step="0.1" max="1" id="transaction_fee_input" required>
+                            <div class="input-group-addon">$</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">-->