From 5619d21469af46c25b47f259ddcca347d3777e6a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 15 Jan 2019 11:22:48 +0800
Subject: [PATCH] =?UTF-8?q?store=5Fname=20=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/add_partner.html        | 15 ++++++++---
 .../partner/templates/partner_edit.html       | 27 ++++++++++---------
 2 files changed, 26 insertions(+), 16 deletions(-)

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 f901be34f..1492bb698 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -107,17 +107,26 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group">
-                                <label class="control-label col-sm-2" for="store-name-input">Store
+                            <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="store_name" id="store-name-input"
-                                           maxlength="15">
+                                           maxlength="15" required>
                                     <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 40df13166..a9b404705 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -87,19 +87,19 @@
                                     </div>
                                 </div>
                                 <div class="form-group"
-                                     ng-class="{'has-error':partnerForm.company_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">
                                         Store Name</label>
                                     <div class="col-sm-8">
                                         <input class="form-control" ng-model="partner.store_name"
                                                type="text"
                                                id="store-name-input"  name="store_name"
-                                               maxlength="15">
+                                               maxlength="15" required>
                                         <p class="small text-info">store name for WeChat payment display and partner name</p>
-                                        <div ng-messages="partnerForm.company_name.$error"
-                                             ng-if="partnerForm.company_name.$dirty">
-                                            <p class="small text-danger" ng-message="maxlength">Less
-                                                Than 15
+                                        <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 50
                                                 Characters(including symbols and spaces)</p>
                                         </div>
                                     </div>
@@ -156,23 +156,24 @@
                                 </div>
 
                                 <div class="form-group"
-                                     ng-class="{'has-error':partnerForm.company_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">
-                                        Store Name</label>
+                                        * Store Name</label>
                                     <div class="col-sm-8">
                                         <input class="form-control" ng-model="partner.store_name"
                                                type="text"
                                                id="store-name-input"  name="store_name"
-                                               maxlength="15">
+                                               maxlength="15" required>
                                         <p class="small text-info">store name for WeChat payment display and partner name</p>
-                                        <div ng-messages="partnerForm.company_name.$error"
-                                             ng-if="partnerForm.company_name.$dirty">
-                                            <p class="small text-danger" ng-message="maxlength">Less
-                                                Than 15
+                                        <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 50
                                                 Characters(including symbols and spaces)</p>
                                         </div>
                                     </div>
                                 </div>
+
                             </div>
 
                             <div class="form-group"