From c2cc5a9bba3c436832522ad2c73cb932703d3f2c Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Fri, 11 Mar 2022 10:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8A=A5=E5=A4=87=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B9=9F=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F=E5=92=8C?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            |  4 ++--
 .../ui/static/payment/partner/partner-manage.js    | 14 +++++++-------
 .../payment/partner/templates/add_partner.html     |  2 +-
 .../partner/templates/add_sub_partner_dialog.html  |  2 +-
 .../templates/new_apply_wx_sub_merchant_id.html    |  4 ++--
 .../payment/partner/templates/partner_edit.html    |  2 +-
 .../templates/update_apply_wx_sub_merchant_id.html |  4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1e9190c3b..3b1cfe504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.3.6</version>
+        <version>2.3.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.4.10</version>
+    <version>2.4.11</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 2c9e5aa1e..ee5562f0f 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -7143,7 +7143,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     params.company_website = null
                 }
 
-                if (params.merchant_type == 'ENTERPRISE') {
+                // if (params.merchant_type == 'ENTERPRISE') {
                     params.director_name = $scope.subMerchantInfo.director_name
                     params.director_id_number = $scope.subMerchantInfo.director_id_number
                     params.company_register_no = $scope.subMerchantInfo.company_register_no
@@ -7159,10 +7159,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         alert('Certificate expiration time is required')
                         return
                     }
-                } else {
-                    params.principal_name = $scope.subMerchantInfo.principal_name
-                    params.principal_id_number = $scope.subMerchantInfo.principal_id_number
-                }
+                // } else {
+                //     params.principal_name = $scope.subMerchantInfo.principal_name
+                //     params.principal_id_number = $scope.subMerchantInfo.principal_id_number
+                // }
 
                 $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/new_sub_apply', params).then(
                     function (resp) {
@@ -7334,7 +7334,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 //     params.principal_name = $scope.subMerchantInfo.principal_name;
                 //     params.principal_id_number = $scope.subMerchantInfo.principal_id_number;
                 // }
-                if (params.merchant_type == 'ENTERPRISE') {
+                // if (params.merchant_type == 'ENTERPRISE') {
                     params.company_register_no = $scope.subMerchantInfo.company_register_no
                     params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date
                     if ($scope.subMerchantInfo.certificat_expire_date_d) {
@@ -7347,7 +7347,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         alert('Certificate expiration time is required')
                         return
                     }
-                }
+                // }
                 $http.put('/sys/partners/' + $scope.merchantInfo.client_moniker + '/get_merchant_ids/' + $scope.subMerchantInfo.merchant_app_id, params).then(
                     function (resp) {
                         $scope.apply_sub_merchant_id = resp.data
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 720d630d4..0bff4f0c3 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -309,7 +309,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
+                            <div class="form-group"
                                  ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
                                 <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
                                 <div class="col-sm-8">
diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
index 350ef9e59..79bf783f4 100644
--- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
@@ -233,7 +233,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
+                                    <div class="form-group"
                                          ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
                                         <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
                                         <div class="col-sm-8">
diff --git a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
index 8db9d696a..792d1860e 100644
--- a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
@@ -213,7 +213,7 @@
                                 </div>
                             </div>
                             <!-- 公司注册号 -->
-                            <div class="form-group"  ng-if="subMerchantInfo.merchant_type == 'ENTERPRISE'"
+                            <div class="form-group"
                                  ng-class="{'has-error':subForm.company_register_no.$invalid && subForm.company_register_no.$dirty}">
                                 <label class="control-label col-sm-3" for="company_register_no_input">* Company registration document No</label>
                                 <div class="col-sm-8">
@@ -227,7 +227,7 @@
                             </div>
 
                             <!-- 注册证书过期时间 -->
-                            <div class="form-group"  ng-if="subMerchantInfo.merchant_type == 'ENTERPRISE'"
+                            <div class="form-group"
                                  ng-class="{'has-error':subForm.certificat_expire_date.$invalid && subForm.certificat_expire_date.$dirty}">
                                 <label class="control-label col-sm-3" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</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 588de9045..755c05b7d 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -330,7 +330,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
+                            <div class="form-group"
                                  ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
                                 <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
                                 <div class="col-sm-8">
diff --git a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
index 13a41048d..da11ac457 100644
--- a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
@@ -223,7 +223,7 @@
                                 </div>
                             </div>
                             <!-- 公司注册号 -->
-                            <div class="form-group"  ng-if="subMerchantInfo.merchant_type == 'ENTERPRISE'"
+                            <div class="form-group"
                                  ng-class="{'has-error':subForm.company_register_no.$invalid && subForm.company_register_no.$dirty}">
                                 <label class="control-label col-sm-3" for="company_register_no_input">* Company registration document No </label>
                                 <div class="col-sm-8">
@@ -255,7 +255,7 @@
                             <!--</div>-->
                             <!--</div>-->
                             <!-- 注册证书过期时间 -->
-                            <div class="form-group"  ng-if="subMerchantInfo.merchant_type == 'ENTERPRISE'"
+                            <div class="form-group"
                                  ng-class="{'has-error':subForm.certificat_expire_date.$invalid && subForm.certificat_expire_date.$dirty}">
                                 <label class="control-label col-sm-3" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
                                 <div class="col-sm-8">