diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java index 4d1a843a4..5929151c5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java @@ -22,8 +22,8 @@ public class SubMerchantIdApply { private String merchant_id; @NotBlank(message = "error.payment.valid.param_missing") @Length(max = 20) - @JSONField(name = "short_name") - private String merchant_shortname; + @JSONField(name = "store_name") + private String merchant_storename; @NotBlank(message = "error.payment.valid.param_missing") @Length(max = 20) @JSONField(name = "company_phone") @@ -51,8 +51,8 @@ public class SubMerchantIdApply { if(StringUtils.isNotEmpty(merchant_name)){ params.put("merchant_name",merchant_name); } - if(StringUtils.isNotEmpty(merchant_shortname)){ - params.put("merchant_shortname",merchant_shortname); + if(StringUtils.isNotEmpty(merchant_storename)){ + params.put("merchant_shortname",merchant_storename); } if(StringUtils.isNotEmpty(office_phone)){ params.put("office_phone",office_phone); @@ -101,11 +101,11 @@ public class SubMerchantIdApply { } public String getMerchant_shortname() { - return this.merchant_shortname; + return this.merchant_storename; } public void setMerchant_shortname(String merchant_shortname) { - this.merchant_shortname = merchant_shortname; + this.merchant_storename = merchant_shortname; } public String getOffice_phone() { 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 f604935cf..bddcbe312 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -109,7 +109,7 @@
-