From 5ad8024c8dcd0d27d4e30e489d0410ae14cda060 Mon Sep 17 00:00:00 2001
From: Todking <tod.wu@geekforbest.com>
Date: Sun, 26 Sep 2021 18:20:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=20aps=E5=95=86=E6=88=B7=E8=B4=B9=E7=8E=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ClientManagerImpl.java         |  7 +++-
 .../organizations/templates/org_detail.html   |  4 +-
 .../templates/org_detail_parent.html          |  4 +-
 .../templates/partner_bankaccounts.html       | 40 +++++++++----------
 .../partner/templates/rate_config_dialog.html |  8 ++--
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 8235414a4..57ad85576 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -2096,8 +2096,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 if (newConfig.getBigDecimal("cb_bankpay_rate_value") != null) {
                     clientRateMapper.saveRate(newConfig);
                 }
-            } else if ("AlipayAps".equalsIgnoreCase(channel)) {
-                newConfig.put("transaction_fee", newConfig.getFloatValue("service_fee_value"));
+            } else if ("ApsInStore".equalsIgnoreCase(channel)) {
+                newConfig.put("transaction_fee", newConfig.getFloatValue("retail_service_fee_value"));
+                clientRateMapper.saveRate(newConfig);
+            } else if ("ApsCashier".equalsIgnoreCase(channel)) {
+                newConfig.put("transaction_fee", newConfig.getFloatValue("online_service_fee_value"));
                 clientRateMapper.saveRate(newConfig);
             } else {
                 clientRateMapper.saveRate(newConfig);
diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html
index 346fe2832..1de510682 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail.html
@@ -182,7 +182,7 @@
 
                             <div ng-if="org.type == 0">
                                 <div class="panel panel-default">
-                                    <div class="panel-heading">China Wallet</div>
+                                    <div class="panel-heading">China Wallets Rate</div>
                                     <div class="panel-body">
                                         <div class="col-sm-6" ng-if="org.commission_type == 1">
                                             <div class="form-group"
@@ -523,7 +523,7 @@
                                 </div>
 
                                 <div class="panel panel-default">
-                                    <div class="panel-heading">A+ Rate</div>
+                                    <div class="panel-heading">Alipay+ Rate</div>
                                     <div class="panel-body">
                                         <div class="col-sm-6" ng-if="org.commission_type == 1">
                                             <div class="form-group"
diff --git a/src/main/ui/static/config/organizations/templates/org_detail_parent.html b/src/main/ui/static/config/organizations/templates/org_detail_parent.html
index ad9598ace..eb6ece584 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail_parent.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail_parent.html
@@ -180,7 +180,7 @@
 
                             <div ng-if="org.type == 0">
                                 <div class="panel panel-default">
-                                    <div class="panel-heading">China Wallet</div>
+                                    <div class="panel-heading">China Wallets Rate</div>
                                     <div class="panel-body">
                                         <div class="col-sm-6" ng-if="org.commission_type == 1">
                                             <div class="form-group"
@@ -521,7 +521,7 @@
                                 </div>
 
                                 <div class="panel panel-default">
-                                    <div class="panel-heading">A+ Rate</div>
+                                    <div class="panel-heading">Alipay+ Rate</div>
                                     <div class="panel-body">
                                         <div class="col-sm-6" ng-if="org.commission_type == 1">
                                             <div class="form-group"
diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index 058ca5f7a..696f4d033 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -235,8 +235,13 @@
     </div>
 </div>
 <div class="panel panel-info">
-    <div class="panel-heading">
-        <h3>China Wallet</h3>
+    <div class="panel-heading" style="display: flex;justify-content: space-between">
+        <h3>China Wallets Rate</h3>
+        <a id="addRate" class="btn btn-info" style="margin-bottom: 10px;margin-top: 20px" type="button"
+           ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))"
+           ng-click="newRate()">
+            Add Rate
+        </a>
     </div>
     <div class="panel-body">
         <div class="row">
@@ -266,11 +271,6 @@
                                                                                                     ng-click="bankCtrl.rate_name='CB_BankPay'"
                                                                                                     ng-if="sysconfig.active_channels.indexOf('CB_BankPay')!=-1">CB_BankPay</a>
                     </li>
-                    <a id="addRate" class="btn btn-info" style="float: right;margin-right: 10px" type="button"
-                       ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))"
-                       ng-click="newRate()">
-                        Add Rate
-                    </a>
                 </ul>
                 <div class="table-responsive">
                     <table class="table table-bordered">
@@ -385,8 +385,13 @@
     </div>
 
     <!-- card payment -->
-    <div class="panel-heading">
+    <div class="panel-heading" style="display: flex;justify-content: space-between">
         <h3>Card Payment Rate</h3>
+        <a id="addCardPaymentRate" class="btn btn-info" style="margin-top: 20px;margin-bottom: 10px" type="button"
+           ng-click="newCardPaymentRates()"
+           ng-if="((partner.card_rate_editable && ('100'|withRole)) || ('11'|withRole))">
+            Add Card Payment Rates
+        </a>
     </div>
     <div class="panel-body">
         <div class="row">
@@ -398,11 +403,6 @@
                     <!--                    <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_dd'}"><a role="button"-->
                     <!--                                                                                                    ng-click="bankCtrl.rate_name='rpaypmt_dd'">Direct-->
                     <!--                        Debit</a></li>-->
-                    <a id="addCardPaymentRate" class="btn btn-info" style="float: right" type="button"
-                       ng-click="newCardPaymentRates()"
-                       ng-if="((partner.card_rate_editable && ('100'|withRole)) || ('11'|withRole))">
-                        Add Card Payment Rates
-                    </a>
                 </ul>
                 <div class="table-responsive">
                     <table class="table table-bordered">
@@ -453,8 +453,13 @@
     </div>
 
     <!-- APS -->
-    <div class="panel-heading">
-        <h3>A+</h3>
+    <div class="panel-heading" style="display: flex;justify-content: space-between">
+        <h3>Alipay+ Rate</h3>
+        <a id="addAlipayApsInStoreRate" class="btn btn-info" style="margin-bottom: 10px;margin-top: 20px"
+           type="button"
+           ng-click="newAlipayApsRate(apsBankCtrl.rate_name)">
+            Add A+(APS) Rate
+        </a>
     </div>
     <div class="panel-body">
         <div class="row">
@@ -468,11 +473,6 @@
                             role="button"
                             ng-click="apsBankCtrl.rate_name='ApsCashier'">A+(Online)</a>
                     </li>
-                    <a id="addAlipayApsInStoreRate" class="btn btn-info" style="float: right;margin-right: 10px"
-                       type="button"
-                       ng-click="newAlipayApsRate(apsBankCtrl.rate_name)">
-                        Add A+(APS) Rate
-                    </a>
                 </ul>
                 <div class="table-responsive">
                     <table class="table table-bordered">
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
index 5bb048de0..586607cba 100644
--- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
@@ -14,10 +14,10 @@
                 </div>
                 <div class="form-group"
                      ng-class="{'has-error':rate_form.rate_value.$invalid && rate_form.rate_value.$dirty}">
-                    <label ng-if="rate.rate_name != 'AlipayAps'" class="control-label col-sm-4" for="rate_value_input">
+                    <label ng-if="rate.rate_name != 'ApsInStore' && rate.rate_name != 'ApsCashier'" class="control-label col-sm-4" for="rate_value_input">
                         <span ng-if="rate.rate_name=='rpaypmt_card'">Domestic </span>
                         Rate Value</label>
-                    <label ng-if="rate.rate_name == 'AlipayAps'" class="control-label col-sm-4" for="rate_value_input">
+                    <label ng-if="rate.rate_name == 'ApsCashier' || rate.rate_name == 'ApsInStore'" class="control-label col-sm-4" for="rate_value_input">
                         Interchange Fee</label>
                     <div class="col-sm-6">
                         <div class="input-group">
@@ -65,8 +65,8 @@
                 <!-- 新增transaction_fee字段 -->
                 <div class="form-group"
                      ng-class="{'has-error':rate_form.transaction_fee.$invalid && rate_form.transaction_fee.$dirty}">
-                    <label ng-if="rate.rate_name != 'AlipayAps'" class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label>
-                    <label ng-if="rate.rate_name == 'AlipayAps'" class="control-label col-sm-4" for="transaction_fee_input">Service Fee</label>
+                    <label ng-if="rate.rate_name != 'ApsInStore' && rate.rate_name != 'ApsCashier'" class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label>
+                    <label ng-if="rate.rate_name == 'ApsInStore' || rate.rate_name == 'ApsCashier'" class="control-label col-sm-4" for="transaction_fee_input">Service Fee</label>
                     <div class="col-sm-6">
                         <div class="input-group">
                             <input type="number" name="transaction_fee" class="form-control"