diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
index e6d7d0dbe..e7764f981 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
@@ -3,7 +3,6 @@ package au.com.royalpay.payment.manage.merchants.beans;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
@@ -115,8 +114,6 @@ public class ClientRegisterInfo {
     private String client_pay_desc;
     @JSONField(name = "it_contact_person_email")
     private String itContactPersonEmail;
-    @JSONField(name = "client_type")
-    private String clientType;
     @JSONField(name = "acceptor_name")
     private String acceptorName;
     @JSONField(name = "expected_card_revenue")
@@ -127,7 +124,10 @@ public class ClientRegisterInfo {
     private String mwIndustry;
     @JSONField(name = "enable_international_card")
     private boolean enableInternaltionCard;
-
+    @JSONField(name = "enable_cross_payment")
+    private boolean enableCrossPayment;
+    @JSONField(name = "enable_card_payment")
+    private boolean enableCardPayment;
 
     public JSONObject insertObject() {
         if (industry == null) {
@@ -140,10 +140,6 @@ public class ClientRegisterInfo {
         return res;
     }
 
-    public boolean enableCardPayment() {
-        return StringUtils.equalsIgnoreCase("card-payment", clientType) || StringUtils.equalsIgnoreCase("all", clientType);
-    }
-
     public JSONObject updateObject() {
         JSONObject obj = insertObject();
         obj.remove("client_moniker");
@@ -622,11 +618,19 @@ public class ClientRegisterInfo {
         this.mwIndustry = mwIndustry;
     }
 
-    public String getClientType() {
-        return clientType;
+    public boolean isEnableCardPayment() {
+        return enableCardPayment;
+    }
+
+    public boolean isEnableCrossPayment() {
+        return enableCrossPayment;
+    }
+
+    public void setEnableCardPayment(boolean enableCardPayment) {
+        this.enableCardPayment = enableCardPayment;
     }
 
-    public void setClientType(String clientType) {
-        this.clientType = clientType;
+    public void setEnableCrossPayment(boolean enableCrossPayment) {
+        this.enableCrossPayment = enableCrossPayment;
     }
 }
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 2c0dda9b0..0a6955bca 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
@@ -836,11 +836,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             clientConfig.put("client_moniker", partner.getString("client_moniker"));
             clientConfig.put("client_pay_type", partner.getString("client_pay_type"));
             clientConfig.put("client_pay_desc", partner.get("client_pay_desc"));
+            clientConfig.put("enable_cross_payment", partner.get("enable_cross_payment"));
+            clientConfig.put("enable_card_payment", partner.get("enable_card_payment"));
 
             clientConfigService.save(clientConfig);
             permissionPartnerManagerImpl.permissionClientModuleSave(partner.getIntValue("client_id"), partner.getString("client_moniker"));
             saveLegalAndMarketingInfo(partner);
-            if (registery.enableCardPayment()) {
+            if (registery.isEnableCardPayment()) {
                 sysClientUpayProfileMapper.save(partner);
             }
         } catch (Exception e) {
@@ -919,7 +921,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             sysClientLegalPersonMapper.save(representativeInfo);
         }
 
-        if (info.enableCardPayment()) {
+        if (info.isEnableCardPayment()) {
             JSONObject upay = sysClientUpayProfileMapper.findInfo(clientId);
             if (upay == null) {
                 sysClientUpayProfileMapper.save(updateInfo);
@@ -944,6 +946,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject clientConfig = new JSONObject();
         clientConfig.put("client_id", clientId);
         clientConfig.put("client_moniker", client.getString("client_moniker"));
+        clientConfig.put("enable_cross_payment", updateInfo.getBooleanValue("enable_cross_payment"));
+        clientConfig.put("enable_card_payment", updateInfo.getBooleanValue("enable_card_payment"));
         if (StringUtils.isNotBlank(updateInfo.getString("client_pay_type")) && StringUtils.isNotBlank(updateInfo.getString("client_pay_desc"))) {
             clientConfig.put("client_pay_type", updateInfo.getString("client_pay_type"));
             clientConfig.put("client_pay_desc", updateInfo.getString("client_pay_desc"));
diff --git a/src/main/ui/static/payment/partner/add-partner.js b/src/main/ui/static/payment/partner/add-partner.js
index 8f2e8ae34..821e49bd0 100644
--- a/src/main/ui/static/payment/partner/add-partner.js
+++ b/src/main/ui/static/payment/partner/add-partner.js
@@ -38,7 +38,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         } else {
             $scope.partner = {timezone: 'Australia/Melbourne'};
         }
-        $scope.partner.client_type = 'cross-border';
+        $scope.partner.enable_cross_payment = true;
+        $scope.partner.enable_cross_payment = false;
         $scope.initMerchantCode = function () {
             $http.get('/sys/partners/init/merchant_code').then(function (response) {
                 $scope.partner.client_moniker = response.data.partner_code;
@@ -61,6 +62,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
         };
         $scope.partner.sameAsContactPerson = false;
+
+        $scope.enablePaymentType = function (type) {
+            $scope.partner[type] = !$scope.partner[type];
+        };
         $scope.checkboxOnclick = function (){
             $scope.partner.sameAsContactPerson = !($scope.partner.sameAsContactPerson);
             if($scope.partner.sameAsContactPerson) {
@@ -490,6 +495,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid;
             }
 
+            $scope.enablePaymentType = function (type) {
+                $scope.partner[type] = !$scope.partner[type];
+            };
+
             function hasRole() {
                 var rolenum;
                 switch (sessionStorage.getItem('role')) {
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 8cdacf735..45deacc9b 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -40,14 +40,11 @@
                 <div class="row">
                     <div class="col-sm-12 analysis-nav">
                         <ul class="nav nav-pills">
-                            <li ng-class="{active:partner.client_type=='cross-border'}" style="cursor: pointer">
-                                <a ng-click="partner.client_type='cross-border';partner.client_pay_type=[]"><span>跨境支付|Cross-border Payment</span></a>
+                            <li ng-class="{active:partner.enable_cross_payment}" style="cursor: pointer">
+                                <a ng-click="enablePaymentType('enable_cross_payment')"><span>跨境支付|Cross-border Payment</span></a>
                             </li>
-                            <li ng-class="{active:partner.client_type=='card-payment'}" style="cursor: pointer">
-                                <a ng-click="partner.client_type='card-payment';partner.client_pay_type=['1']"> <span>卡支付|Card Payment</span></a>
-                            </li>
-                            <li ng-class="{active:partner.client_type=='all'}" style="cursor: pointer">
-                                <a ng-click="partner.client_type='all';partner.client_pay_type=['1']"> <span>同时开通|All Payment</span></a>
+                            <li ng-class="{active:partner.enable_card_payment}" style="cursor: pointer">
+                                <a ng-click="enablePaymentType('enable_card_payment')"> <span>卡支付|Card Payment</span></a>
                             </li>
                         </ul>
                     </div>
@@ -149,7 +146,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type=='card-payment' || partner.client_type=='all'"
+                            <div class="form-group" ng-if="partner.enable_card_payment"
                                  ng-class="{'has-error':partnerForm.acceptor_name.$invalid && partnerForm.acceptor_name.$dirty}">
                                 <label class="control-label col-sm-2" for="card-acceptor-input">* Card Acceptor Name</label>
                                 <div class="col-sm-8">
@@ -166,7 +163,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                            <div class="form-group" ng-if="partner.enable_cross_payment"
                                  ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}">
                                 <label class="control-label col-sm-2" for="store-name-input">* Store
                                     Name</label>
@@ -188,7 +185,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                            <div class="form-group" ng-if="partner.enable_cross_payment"
                                  ng-class="{'has-error':partnerForm.business_structure.$invalid && partnerForm.business_structure.$dirty}">
                                 <label class="control-label col-sm-2"
                                        for="business-structure-input">Business Structure</label>
@@ -218,8 +215,8 @@
                             </div>
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.abn.$invalid && partnerForm.abn.$dirty}"
-                                 ng-if="partner.business_structure != 'Company' || partner.client_type=='card-payment' || partner.client_type=='all'">
-                                <label class="control-label col-sm-2" for="abn-input"><span ng-if="partner.client_type=='card-payment' ||partner.client_type=='all'">*</span>ABN</label>
+                                 ng-if="partner.business_structure != 'Company' || partner.enable_card_payment">
+                                <label class="control-label col-sm-2" for="abn-input"><span ng-if="partner.enable_card_payment">*</span>ABN</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.abn" type="text"
                                            name="abn" required
@@ -237,7 +234,7 @@
                             </div>
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.acn.$invalid && partnerForm.acn.$dirty}"
-                                 ng-if="partner.business_structure == 'Company' && partner.client_type!='card-payment'">
+                                 ng-if="partner.business_structure == 'Company' && partner.enable_cross_payment">
                                 <label class="control-label col-sm-2" for="acn-input">ACN</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.acn" type="text"
@@ -354,7 +351,7 @@
                                             ng-click="toggleClientPayType('1')">
                                         <i class="fa fa-mixcloud"></i>
                                         线上</button>
-                                    <button class="btn btn-default" ng-if="partner.client_type!='card-payment'"
+                                    <button class="btn btn-default" ng-if="partner.enable_cross_payment"
                                             ng-class="{active:partner.client_pay_type.indexOf('2')>=0}"
                                             ng-click="toggleClientPayType('2')">
                                         <i class="fa fa-shopping-basket"></i>
@@ -393,7 +390,7 @@
                                         小程序</button>
                                 </div>
                             </div>
-                            <div ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.client_type!='card-payment'" >
+                            <div ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.enable_cross_payment" >
                                 <div class="form-group"
                                      ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
                                     <label class="control-label col-sm-2">*Offline</label>
@@ -421,7 +418,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div ng-if="partner.client_pay_desc.join(',').indexOf('203')>=0 && partner.client_type!='card-payment'" >
+                            <div ng-if="partner.client_pay_desc.join(',').indexOf('203')>=0 && partner.enable_cross_payment" >
                                 <div class="form-group"
                                      ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
                                     <label class="control-label col-sm-2">* POS</label>
@@ -492,7 +489,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.client_type!='card-payment'">
+                            <div class="form-group" ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.enable_cross_payment">
                                 <label class="control-label col-sm-2">* Shop Photo</label>
                                 <div class="col-sm-4">
                                     <div class="form-control-static"><em>1:</em>&nbsp;
@@ -524,7 +521,7 @@
                                     </a>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type=='card-payment' ||partner.client_type=='all'"
+                            <div class="form-group" ng-if="partner.enable_card_payment"
                                  ng-class="{'has-error':partnerForm.expected_card_revenue.$invalid && partnerForm.expected_card_revenue.$dirty}">
                                 <label class="control-label col-sm-2" for="expected_card_revenue-input">*
                                     Expected credit card monthly revenue ($)</label>
@@ -540,7 +537,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type=='card-payment' ||partner.client_type=='all'"
+                            <div class="form-group" ng-if="partner.enable_card_payment"
                                  ng-class="{'has-error':partnerForm.average_card_transaction.$invalid && partnerForm.average_card_transaction.$dirty}">
                                 <label class="control-label col-sm-2" for="average_card_transaction-input">*
                                     Average credit card transaction value ($)</label>
@@ -560,7 +557,7 @@
                     </div>
                 </div>
 
-                <div class="panel panel-default" ng-if="partner.client_type!='card-payment'">
+                <div class="panel panel-default" ng-if="partner.enable_cross_payment">
                     <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em>
                     </div>
                     <div class="panel-body">
@@ -744,7 +741,7 @@
                                 <div>
                                     <label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
                                 </div>
-                                <div ng-if="partner.client_type!='card-payment'">
+                                <div ng-if="partner.enable_cross_payment">
                                     <label><input type="checkbox" ng-click="checkMarketingSameAsContact(this)">Marketing Person Same As Contact Information</label>
                                 </div>
                             </div>
@@ -869,9 +866,9 @@
 
                         </div>
                     </div>
-                    <hr ng-if="partner.client_type!='card-payment'" />
-                    <div ng-if="partner.client_type!='card-payment'">&nbsp;&nbsp;Marketing Person</div>
-                    <div class="panel-body" ng-if="partner.client_type!='card-payment'">
+                    <hr ng-if="partner.enable_cross_payment" />
+                    <div ng-if="partner.enable_cross_payment">&nbsp;&nbsp;Marketing Person</div>
+                    <div class="panel-body" ng-if="partner.enable_cross_payment">
                         <div class="form-horizontal">
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.marketing_person.$invalid && partnerForm.marketing_person.$dirty}">
@@ -1251,7 +1248,7 @@
                             </div>
                         </div>
 
-                        <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                        <div class="form-group" ng-if="partner.enable_cross_payment"
                              ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
                             <label class="control-label col-sm-2" for="industry-input">
                                 *Wechat Industry</label>
@@ -1270,7 +1267,7 @@
                             </div>
                         </div>
 
-                        <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                        <div class="form-group" ng-if="partner.enable_cross_payment"
                              ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
                             <label class="control-label col-sm-2"
                                    for="alipay_category">*Alipay Category</label>
@@ -1290,7 +1287,7 @@
 
                         </div>
 
-                        <div class="form-group" ng-if="partner.client_type=='card-payment' || partner.client_type=='all'"
+                        <div class="form-group" ng-if="partner.enable_card_payment"
                              ng-class="{'has-error':partnerForm.mw-industry.$invalid && partnerForm.mw-industry.$dirty}">
                             <label class="control-label col-sm-2" for="mw-industry-input">
                                 *Merchant Warrior Industry</label>
@@ -1308,7 +1305,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="form-group" ng-if="partner.client_type=='card-payment' || partner.client_type=='all'">
+                        <div class="form-group" ng-if="partner.enable_card_payment">
                             <label class="control-label col-sm-2" for="mw-industry-input">
                                 *Card Service Selection</label>
                             <div class="col-sm-8">
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html
index b525a376f..b2bd550f7 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -36,14 +36,11 @@
                 <div class="row">
                     <div class="col-sm-12 analysis-nav">
                         <ul class="nav nav-pills">
-                            <li ng-class="{active:partner.client_type=='cross-border'}" style="cursor: pointer">
-                                <a ng-click="partner.client_type='cross-border';partner.client_pay_type=[]"><span>跨境支付|Cross-border Payment</span></a>
+                            <li ng-class="{active:partner.enable_cross_payment}" style="cursor: pointer">
+                                <a ng-click="enablePaymentType('enable_cross_payment')"><span>跨境支付|Cross-border Payment</span></a>
                             </li>
-                            <li ng-class="{active:partner.client_type=='card-payment'}"  style="cursor: pointer">
-                                <a ng-click="partner.client_type='card-payment';partner.client_pay_type=['1']"> <span>卡支付|Card Payment</span></a>
-                            </li>
-                            <li ng-class="{active:partner.client_type=='all'}" style="cursor: pointer">
-                                <a ng-click="partner.client_type='all';partner.client_pay_type=['1']"> <span>同时开通|All Payment</span></a>
+                            <li ng-class="{active:partner.enable_card_payment}" style="cursor: pointer">
+                                <a ng-click="enablePaymentType('enable_card_payment')"> <span>卡支付|Card Payment</span></a>
                             </li>
                         </ul>
                     </div>
@@ -115,7 +112,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                                <div class="form-group" ng-if="partner.enable_cross_payment"
                                      ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}">
                                     <label class="control-label col-sm-2" for="store-name-input">
                                         * Store Name</label>
@@ -182,7 +179,7 @@
                                     </div>
                                 </div>
 
-                                <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                                <div class="form-group" ng-if="partner.enable_cross_payment"
                                      ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}">
                                     <label class="control-label col-sm-2" for="store-name-input">
                                         * Store Name</label>
@@ -201,7 +198,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type=='card-payment' || partner.client_type=='all'"
+                            <div class="form-group" ng-if="partner.enable_card_payment"
                                  ng-class="{'has-error':partnerForm.acceptor_name.$invalid && partnerForm.acceptor_name.$dirty}">
                                 <label class="control-label col-sm-2" for="card-acceptor-input">* Card Acceptor Name</label>
                                 <div class="col-sm-8">
@@ -218,7 +215,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                            <div class="form-group" ng-if="partner.enable_cross_payment"
                                  ng-class="{'has-error':partnerForm.business_structure.$invalid && partnerForm.business_structure.$dirty}">
                                 <label class="control-label col-sm-2" for="business-structure-input">Business Structure</label>
                                 <div class="col-sm-8">
@@ -341,7 +338,7 @@
                                             ng-click="toggleClientPayType('1')">
                                         <i class="fa fa-mixcloud"></i>
                                         线上</button>
-                                    <button class="btn btn-default" ng-if="partner.client_type!='card-payment'"
+                                    <button class="btn btn-default" ng-if="partner.enable_cross_payment"
                                             ng-class="{active:partner.client_pay_type.indexOf('2')>=0}"
                                             ng-click="toggleClientPayType('2')">
                                         <i class="fa fa-shopping-basket"></i>
@@ -380,7 +377,7 @@
                                         小程序</button>
                                 </div>
                             </div>
-                            <div ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.client_type!='card-payment'">
+                            <div ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.enable_cross_payment">
                                 <div class="form-group"
                                      ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
                                     <label class="control-label col-sm-2">*Offline Scene Of Merchants</label>
@@ -408,7 +405,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div ng-if="partner.client_pay_desc.join(',').indexOf('203')>=0 && partner.client_type!='card-payment'">
+                            <div ng-if="partner.client_pay_desc.join(',').indexOf('203')>=0 && partner.enable_cross_payment">
                                 <div class="form-group"
                                      ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
                                     <label class="control-label col-sm-2">* POS</label>
@@ -479,7 +476,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.client_type!='card-payment'">
+                            <div class="form-group" ng-if="partner.client_pay_type.indexOf('2')>=0 && partner.enable_cross_payment">
                                 <label class="control-label col-sm-2">* Shop Photo</label>
                                 <div class="col-sm-4">
                                     <div class="form-control-static"><em>1:</em>&nbsp;
@@ -510,7 +507,7 @@
                                     </a>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type=='card-payment' ||partner.client_type=='all'"
+                            <div class="form-group" ng-if="partner.enable_card_payment"
                                  ng-class="{'has-error':partnerForm.expected_card_revenue.$invalid && partnerForm.expected_card_revenue.$dirty}">
                                 <label class="control-label col-sm-2" for="expected_card_revenue-input">*
                                     Expected credit card monthly revenue ($)</label>
@@ -526,7 +523,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.client_type=='card-payment' ||partner.client_type=='all'"
+                            <div class="form-group" ng-if="partner.enable_card_payment"
                                  ng-class="{'has-error':partnerForm.average_card_transaction.$invalid && partnerForm.average_card_transaction.$dirty}">
                                 <label class="control-label col-sm-2" for="average_card_transaction-input">*
                                     Average credit card transaction value ($)</label>
@@ -546,7 +543,7 @@
                     </div>
                 </div>
 
-                <div class="panel panel-default" ng-if="partner.client_type!='card-payment'">
+                <div class="panel panel-default" ng-if="partner.enable_cross_payment">
                     <div class="panel-heading">Alipay Information &nbsp; <em class="small"><b>(Optional)</b></em></div>
                     <div class="panel-body">
                         <div class="form-horizontal">
@@ -671,7 +668,7 @@
                             <div>
                                 <label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
                             </div>
-                            <div ng-if="partner.client_type!='card-payment'">
+                            <div ng-if="partner.enable_cross_payment">
                                 <label><input type="checkbox" ng-click="checkMarketingSameAsContact(this)">Marketing Person Same As Contact Information</label>
                             </div>
                         </div>
@@ -783,8 +780,8 @@
                         </div>
                     </div>
 
-                    <div ng-if="partner.client_type!='card-payment'">&nbsp;&nbsp;Marketing Person</div>
-                    <div class="panel-body" ng-if="partner.client_type!='card-payment'">
+                    <div ng-if="partner.enable_cross_payment">&nbsp;&nbsp;Marketing Person</div>
+                    <div class="panel-body" ng-if="partner.enable_cross_payment">
                         <div class="form-horizontal">
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.marketing_person.$invalid && partnerForm.marketing_person.$dirty}">
@@ -1157,7 +1154,7 @@
                             </div>
                         </div>
 
-                        <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                        <div class="form-group" ng-if="partner.enable_cross_payment"
                              ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
                             <label class="control-label col-sm-2" for="industry-input">
                                 *Wechat Industry</label>
@@ -1176,7 +1173,7 @@
                             </div>
                         </div>
 
-                        <div class="form-group" ng-if="partner.client_type!='card-payment'"
+                        <div class="form-group" ng-if="partner.enable_cross_payment"
                              ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
                             <label class="control-label col-sm-2"
                                    for="alipay_category">*Alipay Category</label>
@@ -1195,7 +1192,7 @@
                             </div>
 
                         </div>
-                        <div class="form-group" ng-if="partner.client_type=='card-payment' || partner.client_type=='all'"
+                        <div class="form-group" ng-if="partner.enable_card_payment"
                              ng-class="{'has-error':partnerForm.mw-industry.$invalid && partnerForm.mw-industry.$dirty}">
                             <label class="control-label col-sm-2" for="mw-industry-input">
                                 *Merchant Warrior Industry</label>
@@ -1213,7 +1210,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="form-group" ng-if="partner.client_type=='card-payment' || partner.client_type=='all'">
+                        <div class="form-group" ng-if="partner.enable_card_payment">
                             <label class="control-label col-sm-2" for="mw-industry-input">
                                 *Card Service Selection</label>
                             <div class="col-sm-8">
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 6d9aff34c..05445da42 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -205,36 +205,12 @@
                     <input type="checkbox" ng-model="paymentInfo.enable_alipay" bs-switch switch-change="toggleChannel('alipay')">
                 </div>
             </div>
-            <div class="form-group col-sm-4">
-                <label class="col-xs-6 control-label">Bestpay|翼支付</label>
-                <div class="col-xs-6">
-                    <input type="checkbox" ng-model="paymentInfo.enable_bestpay" bs-switch switch-change="toggleChannel('bestpay')">
-                </div>
-            </div>
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">WeChat|微信</label>
                 <div class="col-xs-6">
                     <input type="checkbox" ng-model="paymentInfo.enable_wechat" bs-switch switch-change="toggleChannel('wechat')">
                 </div>
             </div>
-            <div class="form-group col-sm-4">
-                <label class="col-xs-6 control-label">JD|京东</label>
-                <div class="col-xs-6">
-                    <input type="checkbox" ng-model="paymentInfo.enable_jd" bs-switch switch-change="toggleChannel('jd')">
-                </div>
-            </div>
-            <!--<div class="form-group col-sm-4">
-                <label class="col-xs-6 control-label">HF|汇付</label>
-                <div class="col-xs-6">
-                    <input type="checkbox" ng-model="paymentInfo.enable_hf" bs-switch switch-change="toggleChannel('hf')">
-                </div>
-            </div>
-            <div class="form-group col-sm-4">
-                <label class="col-xs-6 control-label">Yeepay|易宝支付</label>
-                <div class="col-xs-6">
-                    <input type="checkbox" ng-model="paymentInfo.enable_yeepay" bs-switch switch-change="toggleChannel('yeepay')">
-                </div>
-            </div>-->
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">CB BankPay|快捷支付</label>
                 <div class="col-xs-6">