From 2272e5146b65e7b8299a781c7b28410f6c6c251c Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 11 Jan 2019 15:42:42 +0800
Subject: [PATCH] add store_name

---
 .../partner/templates/add_partner.html        | 28 +++++++++++++++++--
 .../templates/apply_rpay_sub_merchant_id.html | 25 +++++++++++++----
 .../templates/apply_wx_sub_merchant_id.html   | 10 +++----
 .../partner/templates/partner_edit.html       | 22 +++++++++++++--
 4 files changed, 69 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 89a606210..f604935cf 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -77,16 +77,16 @@
                                     <input class="form-control" ng-model="partner.short_name"
                                            type="text"
                                            name="short_name" id="short-name-input" required
-                                           maxlength="15">
+                                           maxlength="50">
                                     <p class="small text-info">short name for WeChat payment display
                                         and partner
                                         name</p>
                                     <div ng-messages="partnerForm.short_name.$error"
-                                         ng-if="partnerForm.company_name.$dirty">
+                                         ng-if="partnerForm.short_name.$dirty">
                                         <p class="small text-danger" ng-message="required">Required
                                             Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 15
+                                            Than 50
                                             Characters(including symbols and spaces)</p>
                                     </div>
                                 </div>
@@ -107,6 +107,28 @@
                                     </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">* Short
+                                    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"
                                  ng-class="{'has-error':partnerForm.business_structure.$invalid && partnerForm.business_structure.$dirty}">
                                 <label class="control-label col-sm-2"
diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index 9a720b6aa..1ca4acc72 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -32,15 +32,28 @@
                             </div>
                             </div>
 
+                            <!--<div class="form-group"-->
+                                 <!--ng-class="{'has-error':subForm.company_shortname.$invalid && subForm.company_shortname.$dirty}">-->
+                                <!--<label class="control-label col-sm-3" for="company_shortname_input">* Company Short Name</label>-->
+                                <!--<div class="col-sm-8">-->
+                                    <!--<input class="form-control" ng-model="subMerchantInfo.short_name"-->
+                                           <!--type="text" name="company_shortname" id="company_shortname_input" required maxlength="15">-->
+                                    <!--<div ng-messages="subForm.company_shortname.$error" ng-if="subForm.company_shortname.$dirty">-->
+                                        <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
+                                        <!--<p class="small text-danger" ng-message="maxlength">Length is more than 15</p>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            <!--</div>-->
+
                             <div class="form-group"
-                                 ng-class="{'has-error':subForm.company_shortname.$invalid && subForm.company_shortname.$dirty}">
-                                <label class="control-label col-sm-3" for="company_shortname_input">* Company Short Name</label>
+                                 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>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="subMerchantInfo.short_name"
-                                           type="text" name="company_shortname" id="company_shortname_input" required maxlength="15">
-                                    <div ng-messages="subForm.company_shortname.$error" ng-if="subForm.company_shortname.$dirty">
+                                    <input class="form-control" ng-model="subMerchantInfo.storename"
+                                           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">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 15</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html
index 58b227e73..66a9105bc 100644
--- a/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html
@@ -39,12 +39,12 @@
                             </div>
 
                             <div class="form-group"
-                                 ng-class="{'has-error':subForm.merchant_shortname.$invalid && subForm.merchant_shortname.$dirty}">
-                                <label class="control-label col-sm-3" for="merchant_shortname_input">* Merchant Short Name</label>
+                                 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>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="subMerchantInfo.short_name"
-                                           type="text" name="merchant_shortname" id="merchant_shortname_input" required maxlength="50">
-                                    <div ng-messages="subForm.merchant_shortname.$error" ng-if="subForm.merchant_shortname.$dirty">
+                                    <input class="form-control" ng-model="subMerchantInfo.storename"
+                                           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">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
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 3c21c5fe7..8acf92830 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -62,13 +62,13 @@
                                     <div class="col-sm-8">
                                         <input class="form-control" ng-model="partner.short_name" type="text"
                                                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
                                             name</p>
                                         <div ng-messages="partnerForm.short_name.$error"
                                              ng-if="partnerForm.company_name.$dirty">
                                             <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>
                                         </div>
                                     </div>
@@ -86,6 +86,24 @@
                                         </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">short 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>
 
                             <div ng-if="!('100'|withRole)">