diff --git a/pom.xml b/pom.xml index 1e9190c3b..3b1cfe504 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 2.3.6 + 2.3.7 4.0.0 manage - 2.4.10 + 2.4.11 UTF-8 2.4.0 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 @@ -
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 @@
-
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 @@
-
@@ -227,7 +227,7 @@
-
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 @@
-
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 @@
-
@@ -255,7 +255,7 @@ -