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

add store_name

Browse Source
master
luoyang 6 years ago
parent 352efe1f7f
commit 45deeca762
6 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java
Unescape View File

@ -22,8 +22,8 @@ public class SubMerchantIdApply {
private String merchant_id; private String merchant_id;
@NotBlank(message = "error.payment.valid.param_missing") @NotBlank(message = "error.payment.valid.param_missing")
@Length(max = 20) @Length(max = 20)
@JSONField(name = "short_name") @JSONField(name = "store_name")
private String merchant_shortname; private String merchant_storename;
@NotBlank(message = "error.payment.valid.param_missing") @NotBlank(message = "error.payment.valid.param_missing")
@Length(max = 20) @Length(max = 20)
@JSONField(name = "company_phone") @JSONField(name = "company_phone")
@ -51,8 +51,8 @@ public class SubMerchantIdApply {
if(StringUtils.isNotEmpty(merchant_name)){ if(StringUtils.isNotEmpty(merchant_name)){
params.put("merchant_name",merchant_name); params.put("merchant_name",merchant_name);
} }
if(StringUtils.isNotEmpty(merchant_shortname)){ if(StringUtils.isNotEmpty(merchant_storename)){
params.put("merchant_shortname",merchant_shortname); params.put("merchant_shortname",merchant_storename);
} }
if(StringUtils.isNotEmpty(office_phone)){ if(StringUtils.isNotEmpty(office_phone)){
params.put("office_phone",office_phone); params.put("office_phone",office_phone);
@ -101,11 +101,11 @@ public class SubMerchantIdApply {
} }
public String getMerchant_shortname() { public String getMerchant_shortname() {
return this.merchant_shortname; return this.merchant_storename;
} }
public void setMerchant_shortname(String merchant_shortname) { public void setMerchant_shortname(String merchant_shortname) {
this.merchant_shortname = merchant_shortname; this.merchant_storename = merchant_shortname;
} }
public String getOffice_phone() { public String getOffice_phone() {

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

@ -109,7 +109,7 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}"> ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}">
<label class="control-label col-sm-2" for="store-name-input">* Short <label class="control-label col-sm-2" for="store-name-input">Store
Name</label> Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.store_name" <input class="form-control" ng-model="partner.store_name"

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

@ -49,7 +49,7 @@
ng-class="{'has-error':subForm.merchant_storename.$invalid && subForm.merchant_storename.$dirty}"> ng-class="{'has-error':subForm.merchant_storename.$invalid && subForm.merchant_storename.$dirty}">
<label class="control-label col-sm-3" for="merchant_storename_input">* Company Store Name</label> <label class="control-label col-sm-3" for="merchant_storename_input">* Company Store Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.storename" <input class="form-control" ng-model="subMerchantInfo.store_name"
type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="50"> type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="50">
<div ng-messages="subForm.merchant_storename.$error" ng-if="subForm.merchant_storename.$dirty"> <div ng-messages="subForm.merchant_storename.$error" ng-if="subForm.merchant_storename.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>

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

@ -42,7 +42,7 @@
ng-class="{'has-error':subForm.merchant_storename.$invalid && subForm.merchant_storename.$dirty}"> ng-class="{'has-error':subForm.merchant_storename.$invalid && subForm.merchant_storename.$dirty}">
<label class="control-label col-sm-3" for="merchant_storename_input">* Merchant Store Name</label> <label class="control-label col-sm-3" for="merchant_storename_input">* Merchant Store Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.storename" <input class="form-control" ng-model="subMerchantInfo.store_name"
type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="50"> type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="50">
<div ng-messages="subForm.merchant_storename.$error" ng-if="subForm.merchant_storename.$dirty"> <div ng-messages="subForm.merchant_storename.$error" ng-if="subForm.merchant_storename.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>

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

@ -326,6 +326,8 @@
<p class="form-control-static" ng-bind="partner.business_name"></p> <p class="form-control-static" ng-bind="partner.business_name"></p>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-sm-2">Store Name</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static pull-left" ng-bind="partner.store_name"></p> <p class="form-control-static pull-left" ng-bind="partner.store_name"></p>
<p class="form-control-static pull-left" ng-if="isComplianceOfShortName && partner.open_status" <p class="form-control-static pull-left" ng-if="isComplianceOfShortName && partner.open_status"
@ -333,6 +335,7 @@
注意:（微信渠道可能不合规） 注意:（微信渠道可能不合规）
</p> </p>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Business Structure</label> <label class="control-label col-sm-2">Business Structure</label>

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

@ -93,7 +93,7 @@
<input class="form-control" ng-model="partner.store_name" type="text" <input class="form-control" ng-model="partner.store_name" type="text"
name="short_name" name="short_name"
id="store-name-input" required maxlength="15"> id="store-name-input" required maxlength="15">
<p class="small text-info">short name for WeChat payment display and partner <p class="small text-info">store name for WeChat payment display and partner
name</p> name</p>
<div ng-messages="partnerForm.store_name.$error" <div ng-messages="partnerForm.store_name.$error"
ng-if="partnerForm.store_name.$dirty"> ng-if="partnerForm.store_name.$dirty">
@ -129,13 +129,13 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.short_name" type="text" <input class="form-control" ng-model="partner.short_name" type="text"
name="short_name" name="short_name"
id="short-name-input" required maxlength="15"> id="short-name-input" required maxlength="50">
<p class="small text-info">short name for WeChat payment display and partner <p class="small text-info">short name for WeChat payment display and partner
name</p> name</p>
<div ng-messages="partnerForm.short_name.$error" <div ng-messages="partnerForm.short_name.$error"
ng-if="partnerForm.company_name.$dirty"> ng-if="partnerForm.company_name.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 15 <p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>
</div> </div>
</div> </div>
@ -154,6 +154,23 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"
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>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.store_name" type="text"
name="short_name"
id="store-name-input" required maxlength="15">
<p class="small text-info">store name for WeChat payment display and partner
name</p>
<div ng-messages="partnerForm.store_name.$error"
ng-if="partnerForm.store_name.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 15
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.business_structure.$invalid && partnerForm.business_structure.$dirty}"> 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> <label class="control-label col-sm-2" for="business-structure-input">Business Structure</label>

Write Preview
Loading…
Cancel
Save