msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into production

Browse Source
master
dalong306 3 years ago
parent eef4c9b136 c2cc5a9bba
commit 5ab3b9bb6d
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

4
pom.xml
Unescape View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>au.com.royalpay.payment</groupId> <groupId>au.com.royalpay.payment</groupId>
<artifactId>payment-parent</artifactId> <artifactId>payment-parent</artifactId>
<version>2.3.6</version> <version>2.3.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.4.10</version> <version>2.4.11</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

14
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -7143,7 +7143,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
params.company_website = null params.company_website = null
} }
if (params.merchant_type == 'ENTERPRISE') { // if (params.merchant_type == 'ENTERPRISE') {
params.director_name = $scope.subMerchantInfo.director_name params.director_name = $scope.subMerchantInfo.director_name
params.director_id_number = $scope.subMerchantInfo.director_id_number params.director_id_number = $scope.subMerchantInfo.director_id_number
params.company_register_no = $scope.subMerchantInfo.company_register_no 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') alert('Certificate expiration time is required')
return return
} }
} else { // } else {
params.principal_name = $scope.subMerchantInfo.principal_name // params.principal_name = $scope.subMerchantInfo.principal_name
params.principal_id_number = $scope.subMerchantInfo.principal_id_number // params.principal_id_number = $scope.subMerchantInfo.principal_id_number
} // }
$http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/new_sub_apply', params).then( $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/new_sub_apply', params).then(
function (resp) { function (resp) {
@ -7334,7 +7334,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
// params.principal_name = $scope.subMerchantInfo.principal_name; // params.principal_name = $scope.subMerchantInfo.principal_name;
// params.principal_id_number = $scope.subMerchantInfo.principal_id_number; // 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.company_register_no = $scope.subMerchantInfo.company_register_no
params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date
if ($scope.subMerchantInfo.certificat_expire_date_d) { 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') alert('Certificate expiration time is required')
return return
} }
} // }
$http.put('/sys/partners/' + $scope.merchantInfo.client_moniker + '/get_merchant_ids/' + $scope.subMerchantInfo.merchant_app_id, params).then( $http.put('/sys/partners/' + $scope.merchantInfo.client_moniker + '/get_merchant_ids/' + $scope.subMerchantInfo.merchant_app_id, params).then(
function (resp) { function (resp) {
$scope.apply_sub_merchant_id = resp.data $scope.apply_sub_merchant_id = resp.data

2
src/main/ui/static/payment/partner/templates/add_partner.html
Unescape View File

@ -309,7 +309,7 @@
</div> </div>
</div> </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}"> 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> <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">

2
src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
Unescape View File

@ -233,7 +233,7 @@
</div> </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}"> 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> <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">

4
src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
Unescape View File

@ -213,7 +213,7 @@
</div> </div>
</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}"> 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> <label class="control-label col-sm-3" for="company_register_no_input">* Company registration document No</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -227,7 +227,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}"> 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> <label class="control-label col-sm-3" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">

2
src/main/ui/static/payment/partner/templates/partner_edit.html
Unescape View File

@ -330,7 +330,7 @@
</div> </div>
</div> </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}"> 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> <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">

4
src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
Unescape View File

@ -223,7 +223,7 @@
</div> </div>
</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}"> 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> <label class="control-label col-sm-3" for="company_register_no_input">* Company registration document No </label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -255,7 +255,7 @@
<!--</div>--> <!--</div>-->
<!--</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}"> 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> <label class="control-label col-sm-3" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">

Write Preview
Loading…
Cancel
Save