From a289abd2fa5e75cc8723231a679df4cfb0301069 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 14 Jan 2019 12:02:32 +0800
Subject: [PATCH] fix

---
 .../merchants/beans/ClientRegisterInfo.java   | 10 ++++++
 .../partner/templates/add_partner.html        | 13 ++-----
 .../partner/templates/partner_edit.html       | 35 ++++++-------------
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
index c7ab49079..9f9f4d25e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
@@ -74,6 +74,8 @@ public class ClientRegisterInfo {
     private String merchant_introduction;
     private String merchant_tag;
     private String merchant_video_url;
+    @JSONField(name = "store_name")
+    private String storeName;
 
     public JSONObject insertObject() {
         JSONObject res = (JSONObject) JSON.toJSON(this);
@@ -376,4 +378,12 @@ public class ClientRegisterInfo {
     public void setHfindustry(String hfindustry) {
         this.hfindustry = hfindustry;
     }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
 }
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 bddcbe312..94b38db5c 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -107,26 +107,17 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group"
-                                 ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}">
+                            <div class="form-group">
                                 <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
+                                           name="short_name" id="store-name-input"
                                            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"
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 6f7f3902e..65ff255ae 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -86,21 +86,14 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group"
-                                     ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}">
+                                <div class="form-group">
                                     <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">
+                                               name="store_name"
+                                               id="store-name-input" 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>
 
@@ -153,24 +146,18 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="form-group"
-                                 ng-class="{'has-error':partnerForm.store_name.$invalid && partnerForm.store_name.$dirty}">
+                                <div class="form-group">
                                 <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>
+                                <input class="form-control" ng-model="partner.store_name" type="text"
+                                name="store_name"
+                                id="store-name-input" maxlength="15">
+                                <p class="small text-info">store name for WeChat payment display and partner
+                                name</p>
+                                </div>
                                 </div>
                             </div>
+
                             <div class="form-group"
                                  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>