From d2cfdaf9ed492589bc23e2aead3bb56a7f7a5747 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 29 Apr 2020 14:14:49 +0800
Subject: [PATCH] fix add card payment rates

---
 pom.xml                                                    | 2 +-
 .../manage/merchants/core/impls/ClientManagerImpl.java     | 7 +++----
 .../payment/partner/templates/partner_bankaccounts.html    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 528756fac..9e39e2e15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.12</version>
+    <version>2.2.13</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 75f188080..2a3918fbe 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
@@ -466,11 +466,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 client.put("show_all_permission", checkBDPermission > 0);
                 if (checkBDPermission > 0) {
                     JSONObject org = orgMapper.findOne(manager.getIntValue("org_id"));
-                    boolean bdRateEditable = client.getIntValue("approve_result") != 1 || org.getBooleanValue("rate_editable") ||
-                            //开起信用卡支付申请，并且申请结果不是：null.新建 1.通过 4.BD已提交资料状态
-                   ( !clientConfig.getBoolean("enable_card_payment") && !client.containsKey("upay_approve_result") && client.getIntValue("upay_approve_result") !=1 && client.getIntValue("upay_approve_result") !=4);
+                    boolean bdRateEditable = client.getIntValue("approve_result") != 1 || org.getBooleanValue("rate_editable");
                     client.put("rate_editable", bdRateEditable);
-                } else {
+                    boolean bdCardRateEditable = (clientConfig.getBoolean("enable_card_payment") && !client.containsKey("upay_approve_result");
+
                     client.put("company_phone", "******");
                     client.put("contact_person", "******");
                     client.put("contact_phone", "******");
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 36ef11d4d..be3c145e9 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -214,7 +214,7 @@
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='CB_BankPay'}"><a role="button" ng-click="bankCtrl.rate_name='CB_BankPay'" ng-if="sysconfig.active_channels.indexOf('CB_BankPay')!=-1">CB_BankPay</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_card'}"><a role="button" ng-click="bankCtrl.rate_name='rpaypmt_card'">Card Payment</a></li>
             <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-warning" style="float: right" type="button" ng-click="newCardPaymentRates()" ng-if="partner.rate_editable && (('11'|withRole)||((!partner.upay_approve_result||partner.upay_approve_result>4) && ('111'|withRole)))" >
+            <a  id="addCardPaymentRate" class="btn btn-warning" style="float: right" type="button" ng-click="newCardPaymentRates()" ng-if="partner.card_rate_editable && (('11'|withRole)||((!partner.upay_approve_result) && ('111'|withRole)))" >
                 Add Card Payment Rates
             </a>
         </ul>