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

【R】 商户详情新增对接人信息

Browse Source
master
liuxinxin 5 years ago
parent e26ca469fd
commit a415340f32
11 changed files with 945 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.3.75</version>
<version>1.3.76</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

72
src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
Unescape View File

@ -67,6 +67,14 @@ public class ClientRegisterInfo {
private String representativeEmail;
@JSONField(name = "legal_representative_job")
private String representativeJobTitle;
@JSONField(name = "marketing_person")
private String marketingPerson ;
@JSONField(name = "marketing_phone")
private String marketingPhone;
@JSONField(name = "marketing_email")
private String marketingEmail;
@JSONField(name = "marketing_job")
private String marketingJobTitle;
@JSONField(name = "registered_address")
private String registeredAddress;
@JSONField(name = "registered_suburb")
@ -75,6 +83,14 @@ public class ClientRegisterInfo {
private String registeredPostcode;
@JSONField(name = "registered_state")
private String registeredState;
@JSONField(name = "contact_wechatid")
private String contactWechatId;
@JSONField(name = "legal_representative_wechatid")
private String representativeWechatId;
@JSONField(name = "marketing_wechatid")
private String marketingWechatId;
@NotEmpty(message = "error.payment.valid.param_missing")
private String country;
@Pattern(regexp = "^((Australia/West)|(Australia/Eucla)|(Australia/North)|(Australia/South)|(Australia/Brisbane)|(Australia/Melbourne)|(Australia/LHI))$", message = "error.payment.valid.invalid_timezone")
@ -523,4 +539,60 @@ public class ClientRegisterInfo {
public void setContactJob(String contactJob) {
this.contactJob = contactJob;
}
public String getMarketingPerson() {
return marketingPerson;
}
public void setMarketingPerson(String marketingPerson) {
this.marketingPerson = marketingPerson;
}
public String getMarketingPhone() {
return marketingPhone;
}
public void setMarketingPhone(String marketingPhone) {
this.marketingPhone = marketingPhone;
}
public String getMarketingEmail() {
return marketingEmail;
}
public void setMarketingEmail(String marketingEmail) {
this.marketingEmail = marketingEmail;
}
public String getMarketingJobTitle() {
return marketingJobTitle;
}
public void setMarketingJobTitle(String marketingJobTitle) {
this.marketingJobTitle = marketingJobTitle;
}
public String getContactWechatId() {
return contactWechatId;
}
public void setContactWechatId(String contactWechatId) {
this.contactWechatId = contactWechatId;
}
public String getRepresentativeWechatId() {
return representativeWechatId;
}
public void setRepresentativeWechatId(String representativeWechatId) {
this.representativeWechatId = representativeWechatId;
}
public String getMarketingWechatId() {
return marketingWechatId;
}
public void setMarketingWechatId(String marketingWechatId) {
this.marketingWechatId = marketingWechatId;
}
}

14
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -801,6 +801,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
representativeInfo.put("suburb", partner.getString("registered_suburb"));
representativeInfo.put("postcode", partner.getString("registered_postcode"));
representativeInfo.put("state", partner.getString("registered_state"));
representativeInfo.put("wechatid", partner.getString("legal_representative_wechatid"));
// marking联系人
representativeInfo.put("marketing_person", partner.getString("marketing_person"));
representativeInfo.put("marketing_phone", partner.getString("marketing_phone"));
representativeInfo.put("marketing_email", partner.getString("marketing_email"));
representativeInfo.put("marketing_job_title", partner.getString("marketing_job"));
representativeInfo.put("marketing_wechatid", partner.getString("marketing_wechatid"));
sysClientLegalPersonMapper.save(representativeInfo);
} catch (Exception e) {
throw new BadRequestException("error.partner.valid.dumplicate_client_moniker");
@ -865,6 +872,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
representativeInfo.put("suburb", info.getRegisteredSuburb());
representativeInfo.put("postcode", info.getRegisteredPostcode());
representativeInfo.put("state", info.getRegisteredState());
representativeInfo.put("wechatid", info.getRepresentativeWechatId());
// marketing 联系人
representativeInfo.put("marketing_person", info.getMarketingPerson());
representativeInfo.put("marketing_phone", info.getMarketingPhone());
representativeInfo.put("marketing_email", info.getMarketingEmail());
representativeInfo.put("marketing_job_title", info.getMarketingJobTitle());
representativeInfo.put("marketing_wechatid", info.getMarketingWechatId());
if (sysClientLegalPersonMapper.findRepresentativeInfo(clientId) != null) {
sysClientLegalPersonMapper.update(representativeInfo);

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

@ -437,6 +437,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p;
$scope.partner.legal_representative_email = $scope.partner.contact_email;
$scope.partner.legal_representative_job = $scope.partner.contact_job;
$scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid;
}
}
$scope.partner.marketingSameAsContact = false;
$scope.checkMarketingSameAsContact = function (){
$scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact);
if($scope.partner.marketingSameAsContact) {
$scope.partner.marketing_person = $scope.partner.contact_person;
$scope.partner.marketing_phone_a = $scope.partner.contact_phone_a;
$scope.partner.marketing_phone_c = $scope.partner.contact_phone_c;
$scope.partner.marketing_phone_p = $scope.partner.contact_phone_p;
$scope.partner.marketing_email = $scope.partner.contact_email;
$scope.partner.marketing_job = $scope.partner.contact_job;
$scope.partner.marketing_wechatid = $scope.partner.contact_wechatid;
}
}
@ -630,7 +645,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p;
$scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p;
$scope.partner.legal_representative_phone = '+' + $scope.partner.legal_representative_phone_c + ( $scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p;
$scope.partner.marketing_phone = '+' + $scope.partner.marketing_phone_c + ( $scope.partner.marketing_phone_a || '') + $scope.partner.marketing_phone_p;
if ($scope.partner.company_phone.indexOf(' ') != -1) {
alert('Company Phone can not contain space character');
return;
@ -643,6 +658,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('Representative phone can not contain space character');
return;
}
if ($scope.partner.marketing_phone.indexOf(' ') != -1) {
alert('Marketing phone can not contain space character');
return;
}
if ($scope.partner.contact_email.indexOf(' ') != -1) {
alert('Contact email Phone can not contain space character');
return;
@ -651,6 +670,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('Representative email Phone can not contain space character');
return;
}
if ($scope.partner.marketing_email.indexOf(' ') != -1) {
alert('Marketing email Phone can not contain space character');
return;
}
if ($scope.partner.suburb.indexOf(' ') != -1) {
alert('suburb can not contain two and more continuous space characters');
return;
@ -1290,6 +1313,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone;
$scope.partner.legal_representative_email = $scope.partner.representativeInfo.email;
$scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title;
$scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person;
$scope.partner.marketing_phone = $scope.partner.representativeInfo.marketing_phone;
$scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email;
$scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title;
$scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.wechatid;
$scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid;
}
function hasRole() {
@ -1401,6 +1432,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.legal_representative_phone = $scope.partner.contact_phone;
$scope.partner.legal_representative_email = $scope.partner.contact_email;
$scope.partner.legal_representative_job = $scope.partner.contact_job;
$scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid;
}
}
$scope.partner.marketingSameAsContact = false;
$scope.checkMarketingSameAsContact = function (){
$scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact);
if($scope.partner.marketingSameAsContact) {
$scope.partner.marketing_person = $scope.partner.contact_person;
$scope.partner.marketing_phone = $scope.partner.contact_phone;
$scope.partner.marketing_email = $scope.partner.contact_email;
$scope.partner.marketing_job = $scope.partner.contact_job;
$scope.partner.marketing_wechatid = $scope.partner.contact_wechatid;
}
}
@ -3107,6 +3151,22 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p;
$scope.partner.legal_representative_email = $scope.partner.contact_email;
$scope.partner.legal_representative_job = $scope.partner.contact_job;
$scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid;
}
}
$scope.partner.marketingSameAsContact = false;
$scope.checkMarketingSameAsContact = function (){
$scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact);
if($scope.partner.marketingSameAsContact) {
$scope.partner.marketing_person = $scope.partner.contact_person;
$scope.partner.marketing_phone_a = $scope.partner.contact_phone_a;
$scope.partner.marketing_phone_c = $scope.partner.contact_phone_c;
$scope.partner.marketing_phone_p = $scope.partner.contact_phone_p;
$scope.partner.marketing_email = $scope.partner.contact_email;
$scope.partner.marketing_job = $scope.partner.contact_job;
$scope.partner.marketing_wechatid = $scope.partner.contact_wechatid;
}
}
@ -3165,6 +3225,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p;
$scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p;
$scope.partner.legal_representative_phone = '+' + $scope.partner.legal_representative_phone_c + ( $scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p;
$scope.partner.marketing_phone = '+' + $scope.partner.marketing_phone_c + ( $scope.partner.marketing_phone_a || '') + $scope.partner.marketing_phone_p;
if ($scope.partner.company_phone.indexOf(' ') != -1) {
alert('Company Phone can not contain space character');

21
src/main/ui/static/payment/partner/partner.js
Unescape View File

@ -416,6 +416,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
$scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone;
$scope.partner.legal_representative_email = $scope.partner.representativeInfo.email;
$scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title;
$scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person;
$scope.partner.marketing_phone = $scope.partner.representativeInfo.marketing_phone;
$scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email;
$scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title;
$scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.wechatid;
$scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid;
}
$scope.uploadLogo = function (file) {
@ -542,9 +550,22 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
$scope.partner.legal_representative_phone = $scope.partner.contact_phone;
$scope.partner.legal_representative_email = $scope.partner.contact_email;
$scope.partner.legal_representative_job = $scope.partner.contact_job;
$scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid;
}
};
$scope.partner.marketingSameAsContact = false;
$scope.checkMarketingSameAsContact = function (){
$scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact);
if($scope.partner.marketingSameAsContact) {
$scope.partner.marketing_person = $scope.partner.contact_person;
$scope.partner.marketing_phone = $scope.partner.contact_phone;
$scope.partner.marketing_email = $scope.partner.contact_email;
$scope.partner.marketing_job = $scope.partner.contact_job;
$scope.partner.marketing_wechatid = $scope.partner.contact_wechatid;
}
}
$scope.partner.sameAsAddress=false;
$scope.sameAddress = function (){
$scope.partner.sameAsAddress=!($scope.partner.sameAsAddress);

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

@ -688,10 +688,32 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="from-group">
<div>
<label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
</div>
<div>
<label><input type="checkbox" ng-click="checkMarketingSameAsContact(this)">Marketing Person Same As Contact Information</label>
</div>
</div>
</div><hr/>
</div>
@ -802,6 +824,153 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>
<hr/>
<div>&nbsp;&nbsp;Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_person.$invalid && partnerForm.marketing_person.$dirty}">
<label class="control-label col-sm-2" for="marketing_person-input">*
Marketing Person Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_person"
required
name="marketing_person"
id="marketing_person-input" maxlength="50">
<div ng-messages="partnerForm.marketing_person.$error"
ng-if="partnerForm.marketing_person.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_phone_p.$invalid && partnerForm.marketing_phone_p.$dirty}">
<label class="control-label col-sm-2" for="marketing_phone_p-input">*
Phone</label>
<div class="col-sm-2">
<div class="input-group">
<div class="input-group-addon">+</div>
<input class="form-control" required type="text"
ng-model="partner.marketing_phone_c"
name="marketing_phone_c" id="marketing_phone_c-input"
maxlength="3" minlength="1"
placeholder="country code">
</div>
<div ng-messages="partnerForm.marketing_phone_c.$error"
ng-if="partnerForm.marketing_phone_c.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 20 Characters</p>
</div>
</div>
<div class="col-sm-2">
<input class="form-control" type="text"
ng-model="partner.marketing_phone_a"
title="eg:3,当为手机号、服务电话时，可以不填"
name="marketing_phone_a" id="marketing_phone_a-input"
maxlength="2" placeholder="area code">
<div ng-messages="partnerForm.marketing_phone_a.$error"
ng-if="partnerForm.marketing_phone_a.$dirty">
<p class="small text-danger" ng-message="maxlength">Less
Than 2 Characters</p>
</div>
</div>
<div class="col-sm-4">
<input class="form-control" required type="text"
ng-model="partner.marketing_phone_p"
name="marketing_phone_p" id="marketing_phone_p-input"
maxlength="11" placeholder="phone number">
<div ng-messages="partnerForm.marketing_phone_p.$error"
ng-if="partnerForm.marketing_phone_p.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 11 Characters</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_email.$invalid && partnerForm.marketing_email.$dirty}">
<label class="control-label col-sm-2" for="marketing_email-id">*
E-mail</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_email"
required
name="marketing_email" id="marketing_email-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_email.$error"
ng-if="partnerForm.marketing_email.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_job.$invalid && partnerForm.marketing_job.$dirty}">
<label class="control-label col-sm-2" for="marketing_job-id">*
Job title</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_job"
required
name="marketing_job" id="marketing_job-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_job.$error"
ng-if="partnerForm.marketing_job.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>

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

@ -592,10 +592,31 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div>
<label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
</div>
<div>
<label><input type="checkbox" ng-click="checkMarketingSameAsContact(this)">Marketing Person Same As Contact Information</label>
</div>
</div>
<hr/>
<div>&nbsp;&nbsp;Legal Representative</div>
@ -686,7 +707,6 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_job.$invalid && partnerForm.legal_representative_job.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_job-id">*
@ -705,6 +725,153 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>
<hr/>
<div>&nbsp;&nbsp;Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_person.$invalid && partnerForm.marketing_person.$dirty}">
<label class="control-label col-sm-2" for="marketing_person-input">*
Marketing Person Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_person"
required
name="marketing_person"
id="marketing_person-input" maxlength="50">
<div ng-messages="partnerForm.marketing_person.$error"
ng-if="partnerForm.marketing_person.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_phone_p.$invalid && partnerForm.marketing_phone_p.$dirty}">
<label class="control-label col-sm-2" for="marketing_phone_p-input">*
Phone</label>
<div class="col-sm-2">
<div class="input-group">
<div class="input-group-addon">+</div>
<input class="form-control" required type="text"
ng-model="partner.marketing_phone_c"
name="marketing_phone_c" id="marketing_phone_c-input"
maxlength="3" minlength="1"
placeholder="country code">
</div>
<div ng-messages="partnerForm.marketing_phone_c.$error"
ng-if="partnerForm.marketing_phone_c.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 20 Characters</p>
</div>
</div>
<div class="col-sm-2">
<input class="form-control" type="text"
ng-model="partner.marketing_phone_a"
title="eg:3,当为手机号、服务电话时，可以不填"
name="marketing_phone_a" id="marketing_phone_a-input"
maxlength="2" placeholder="area code">
<div ng-messages="partnerForm.marketing_phone_a.$error"
ng-if="partnerForm.marketing_phone_a.$dirty">
<p class="small text-danger" ng-message="maxlength">Less
Than 2 Characters</p>
</div>
</div>
<div class="col-sm-4">
<input class="form-control" required type="text"
ng-model="partner.marketing_phone_p"
name="marketing_phone_p" id="marketing_phone_p-input"
maxlength="11" placeholder="phone number">
<div ng-messages="partnerForm.marketing_phone_p.$error"
ng-if="partnerForm.marketing_phone_p.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 11 Characters</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_email.$invalid && partnerForm.marketing_email.$dirty}">
<label class="control-label col-sm-2" for="marketing_email-id">*
E-mail</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_email"
required
name="marketing_email" id="marketing_email-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_email.$error"
ng-if="partnerForm.marketing_email.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_job.$invalid && partnerForm.marketing_job.$dirty}">
<label class="control-label col-sm-2" for="marketing_job-id">*
Job title</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_job"
required
name="marketing_job" id="marketing_job-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_job.$error"
ng-if="partnerForm.marketing_job.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>

73
src/main/ui/static/payment/partner/templates/client_partner_detail.html
Unescape View File

@ -343,13 +343,20 @@
<div class="panel-heading">Partner Contact Information</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">Contact Person</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Contact Person</label>
<div class="col-sm-10">
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.contact_person"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.contact_wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
@ -399,13 +406,20 @@
<div class="panel-heading">Legal Representative</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">Representative Name</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Representative Name</label>
<div class="col-sm-10">
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.representative_person"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
@ -434,6 +448,53 @@
</div>
</div>
</div>
<div ng-if="partner.representativeInfo && partner.representativeInfo.marketing_person"><hr/>
<div class="panel-heading">Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Name</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_person"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_phone"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">E-mail</label>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.marketing_email"></span>
</p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Job Title</label>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.marketing_job_title"></span>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">

139
src/main/ui/static/payment/partner/templates/client_partner_edit.html
Unescape View File

@ -408,9 +408,30 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div>
<label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
</div>
<div>
<label><input type="checkbox" ng-click="checkMarketingSameAsContact(this)">Marketing Person Same As Contact Information</label>
</div>
</div>
</div>
@ -491,6 +512,124 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>
<hr/>
<div>&nbsp;&nbsp;Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_person.$invalid && partnerForm.marketing_person.$dirty}">
<label class="control-label col-sm-2" for="marketing_person-input">*
Marketing Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_person"
required
name="marketing_person"
id="marketing_person-input" maxlength="50">
<div ng-messages="partnerForm.marketing_person.$error"
ng-if="partnerForm.marketing_person.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_phone.$invalid && partnerForm.marketing_phone.$dirty}">
<label class="control-label col-sm-2" for="marketing_phone-input">* Phone</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="partner.marketing_phone" required
name="marketing_phone" id="marketing_phone-input" maxlength="20">
</div>
<div ng-messages="partnerForm.marketing_phone.$error"
ng-if="partnerForm.marketing_phone.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 20
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_email.$invalid && partnerForm.marketing_email.$dirty}">
<label class="control-label col-sm-2" for="marketing_email-id">*
E-mail</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_email"
required
name="marketing_email" id="marketing_email-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_email.$error"
ng-if="partnerForm.marketing_email.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_job.$invalid && partnerForm.marketing_job.$dirty}">
<label class="control-label col-sm-2" for="marketing_job-id">*
Job title</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_job"
required
name="marketing_job" id="marketing_job-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_job.$error"
ng-if="partnerForm.marketing_job.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>
</div>

74
src/main/ui/static/payment/partner/templates/partner_detail.html
Unescape View File

@ -700,13 +700,21 @@
<div class="panel-heading">Partner Contact Information</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">Contact Person Name</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Contact Person Name</label>
<div class="col-sm-10">
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.contact_person"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.contact_wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
@ -753,13 +761,20 @@
<div class="panel-heading">Legal Representative</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">Representative Name</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Representative Name</label>
<div class="col-sm-10">
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.representative_person "></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
@ -788,6 +803,53 @@
</div>
</div>
</div>
<div ng-if="partner.representativeInfo && partner.representativeInfo.marketing_person"><hr/>
<div class="panel-heading">Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Marketing Name</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_person"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_phone"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">E-mail</label>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.marketing_email"></span>
</p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Job Title</label>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.marketing_job_title"></span>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">

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

@ -595,11 +595,30 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div>
<label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
</div>
<div>
<label><input type="checkbox" ng-click="checkMarketingSameAsContact(this)">Marketing Person Same As Contact Information</label>
</div>
</div>
</div>
@ -633,7 +652,6 @@
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_phone.$invalid && partnerForm.legal_representative_phone.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_phone-input">* Phone</label>
@ -652,7 +670,6 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_email.$invalid && partnerForm.legal_representative_email.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_email-id">*
@ -676,7 +693,6 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_job.$invalid && partnerForm.legal_representative_job.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_job-id">*
@ -700,6 +716,149 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8" ng-if="role !='compliance'">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div class="col-sm-8" ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>
<div>&nbsp;&nbsp;Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_person.$invalid && partnerForm.marketing_person.$dirty}">
<label class="control-label col-sm-2" for="marketing_person-input">*
Representative Name</label>
<div class="col-sm-8">
<div ng-if="role !='compliance'">
<input class="form-control" ng-model="partner.marketing_person"
required
name="marketing_person"
id="marketing_person-input" maxlength="50">
</div>
<div ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.marketing_person"
name="marketing_person"
id="marketing_person-input" maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_person.$error"
ng-if="partnerForm.marketing_person.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_phone.$invalid && partnerForm.marketing_phone.$dirty}">
<label class="control-label col-sm-2" for="marketing_phone-input">* Phone</label>
<div class="col-sm-8" ng-if="role !='compliance'">
<input type="text" class="form-control" ng-model="partner.marketing_phone" required
name="marketing_phone" id="marketing_phone-input" maxlength="20">
</div>
<div class="col-sm-8" ng-if="role =='compliance'">
<input type="text" class="form-control" ng-model="partner.marketing_phone"
name="marketing_phone" id="marketing_phone-input" maxlength="20">
</div>
<div ng-messages="partnerForm.marketing_phone.$error"
ng-if="partnerForm.marketing_phone.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 20
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_email.$invalid && partnerForm.marketing_email.$dirty}">
<label class="control-label col-sm-2" for="marketing_email-id">*
E-mail</label>
<div class="col-sm-8" ng-if="role !='compliance'">
<input class="form-control" ng-model="partner.marketing_email"
required
name="marketing_email" id="marketing_email-id"
maxlength="50">
</div>
<div class="col-sm-8" ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.marketing_email"
name="marketing_email" id="marketing_email-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_email.$error"
ng-if="partnerForm.marketing_email.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_job.$invalid && partnerForm.marketing_job.$dirty}">
<label class="control-label col-sm-2" for="marketing_job-id">*
Job title</label>
<div class="col-sm-8" ng-if="role !='compliance'">
<input class="form-control" ng-model="partner.marketing_job"
required
name="marketing_job" id="marketing_job-id"
maxlength="50">
</div>
<div class="col-sm-8" ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.marketing_job"
name="marketing_job" id="marketing_job-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_job.$error"
ng-if="partnerForm.marketing_job.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
Wechat ID</label>
<div class="col-sm-8" ng-if="role !='compliance'">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div class="col-sm-8" ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.marketing_wechatid"
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save