From 6173d3256f6ba8a0334c9561b3fceba5c63fab16 Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Wed, 4 Sep 2019 16:58:13 +0800
Subject: [PATCH] =?UTF-8?q?royalpay=E6=B3=95=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/add_partner.html        |  6 ++---
 .../templates/add_sub_partner_dialog.html     | 10 ++++----
 .../templates/client_partner_edit.html        | 11 +++------
 .../partner/templates/partner_edit.html       | 23 +++++++++----------
 4 files changed, 22 insertions(+), 28 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 739c3975b..da56df344 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -676,7 +676,7 @@
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.contact_job"
                                            required
-                                           name="legal_representative_job" id="contact_job-id"
+                                           name="contact_job" id="contact_job-id"
                                            maxlength="50">
                                 </div>
                                 <div ng-messages="partnerForm.contact_job.$error"
@@ -718,7 +718,7 @@
                                 </div>
                             </div>
                             <div class="form-group"
-                                 ng-class="{'has-error':partnerForm.contact_phone_p.$invalid && partnerForm.contact_phone_p.$dirty}">
+                                 ng-class="{'has-error':partnerForm.legal_representative_phone_p.$invalid && partnerForm.legal_representative_phone_p.$dirty}">
                                 <label class="control-label col-sm-2" for="legal_representative_phone_p-input">*
                                     Phone</label>
                                 <div class="col-sm-2">
@@ -938,7 +938,7 @@
                     <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
+                                 ng-class="{'has-error':partnerForm.registered_address.$invalid && partnerForm.registered_address.$dirty}">
                                 <label class="control-label col-sm-4" for="registered_address-input">*
                                     Registered Office Address</label>
                                 <div class="col-sm-8">
diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
index fc71f4343..304abd8f7 100644
--- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
@@ -581,7 +581,7 @@
                                         <div class="col-sm-8">
                                             <input class="form-control" ng-model="partner.contact_job"
                                                    required
-                                                   name="legal_representative_job" id="contact_job-id"
+                                                   name="contact_job" id="contact_job-id"
                                                    maxlength="50">
                                         </div>
                                         <div ng-messages="partnerForm.contact_job.$error"
@@ -621,7 +621,7 @@
                                         </div>
                                     </div>
                                     <div class="form-group"
-                                         ng-class="{'has-error':partnerForm.contact_phone_p.$invalid && partnerForm.contact_phone_p.$dirty}">
+                                         ng-class="{'has-error':partnerForm.legal_representative_phone_p.$invalid && partnerForm.legal_representative_phone_p.$dirty}">
                                         <label class="control-label col-sm-2" for="legal_representative_phone_p-input">*
                                             Phone</label>
                                         <div class="col-sm-2">
@@ -697,8 +697,8 @@
                                                    name="legal_representative_job" id="legal_representative_job-id"
                                                    maxlength="50">
                                         </div>
-                                        <div ng-messages="partnerForm.legal_representative_email.$error"
-                                             ng-if="partnerForm.legal_representative_email.$dirty">
+                                        <div ng-messages="partnerForm.legal_representative_job.$error"
+                                             ng-if="partnerForm.legal_representative_job.$dirty">
                                             <p class="small text-danger" ng-message="required">Required
                                                 Field</p>
                                             <p class="small text-danger" ng-message="maxlength">Less Than 50
@@ -810,7 +810,7 @@
                             <div class="panel-body">
                                 <div class="form-horizontal">
                                     <div class="form-group col-sm-6"
-                                         ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
+                                         ng-class="{'has-error':partnerForm.registered_address.$invalid && partnerForm.registered_address.$dirty}">
                                         <label class="control-label col-sm-4" for="registered_address-input">*
                                             Registered Office Address</label>
                                         <div class="col-sm-8">
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_edit.html b/src/main/ui/static/payment/partner/templates/client_partner_edit.html
index ad1b37ce0..8ccfc63fa 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_edit.html
@@ -382,7 +382,6 @@
                                            id="contact_person-input" maxlength="50">
                                     <div ng-messages="partnerForm.contact_person.$error"
                                          ng-if="partnerForm.contact_person.$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>
@@ -397,7 +396,6 @@
                                 </div>
                                 <div ng-messages="partnerForm.contact_phone.$error"
                                      ng-if="partnerForm.contact_phone.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required Field</p>
                                     <p class="small text-danger" ng-message="maxlength">Less Than 20
                                         Characters(including symbols and spaces)</p>
                                 </div>
@@ -411,7 +409,6 @@
                                 </div>
                                 <div ng-messages="partnerForm.contact_email.$error"
                                      ng-if="partnerForm.contact_email.$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>
@@ -423,13 +420,11 @@
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.contact_job"
                                            required
-                                           name="legal_representative_job" id="contact_job-id"
+                                           name="contact_job" id="contact_job-id"
                                            maxlength="50">
                                 </div>
                                 <div ng-messages="partnerForm.contact_job.$error"
                                      ng-if="partnerForm.contact_job.$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>
@@ -508,8 +503,8 @@
                                            name="legal_representative_job" id="legal_representative_job-id"
                                            maxlength="50">
                                 </div>
-                                <div ng-messages="partnerForm.legal_representative_email.$error"
-                                     ng-if="partnerForm.legal_representative_email.$dirty">
+                                <div ng-messages="partnerForm.legal_representative_job.$error"
+                                     ng-if="partnerForm.legal_representative_job.$dirty">
                                     <p class="small text-danger" ng-message="required">Required
                                         Field</p>
                                     <p class="small text-danger" ng-message="maxlength">Less Than 50
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 d22fc8976..8a0e3f14f 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -545,7 +545,6 @@
                                            id="contact_person-input" maxlength="50">
                                     <div ng-messages="partnerForm.contact_person.$error"
                                          ng-if="partnerForm.contact_person.$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>
@@ -560,7 +559,7 @@
                                 </div>
                                 <div ng-messages="partnerForm.contact_phone.$error"
                                      ng-if="partnerForm.contact_phone.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required Field</p>
+
                                     <p class="small text-danger" ng-message="maxlength">Less Than 20
                                         Characters(including symbols and spaces)</p>
                                 </div>
@@ -574,7 +573,7 @@
                                 </div>
                                 <div ng-messages="partnerForm.contact_email.$error"
                                      ng-if="partnerForm.contact_email.$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>
@@ -587,17 +586,17 @@
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.contact_job"
                                            required
-                                           name="legal_representative_job" id="contact_job-id"
+                                           name="contact_job" id="contact_job-id"
                                            maxlength="50">
                                 </div>
                                 <div ng-messages="partnerForm.contact_job.$error"
                                      ng-if="partnerForm.contact_job.$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>
                                 <label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
                             </div>
@@ -672,8 +671,8 @@
                                            name="legal_representative_job" id="legal_representative_job-id"
                                            maxlength="50">
                                 </div>
-                                <div ng-messages="partnerForm.legal_representative_email.$error"
-                                     ng-if="partnerForm.legal_representative_email.$dirty">
+                                <div ng-messages="partnerForm.legal_representative_job.$error"
+                                     ng-if="partnerForm.legal_representative_job.$dirty">
                                     <p class="small text-danger" ng-message="required">Required
                                         Field</p>
                                     <p class="small text-danger" ng-message="maxlength">Less Than 50
@@ -747,8 +746,8 @@
                                        name="legal_representative_job" id="legal_representative_job-id"
                                        maxlength="50">
                             </div>
-                            <div ng-messages="partnerForm.legal_representative_email.$error"
-                                 ng-if="partnerForm.legal_representative_email.$dirty">
+                            <div ng-messages="partnerForm.legal_representative_job.$error"
+                                 ng-if="partnerForm.legal_representative_job.$dirty">
                                 <p class="small text-danger" ng-message="required">Required
                                     Field</p>
                                 <p class="small text-danger" ng-message="maxlength">Less Than 50
@@ -867,7 +866,7 @@
                     <div class="panel-body" ng-if="role !='compliance'">
                         <div class="form-horizontal">
                             <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
+                                 ng-class="{'has-error':partnerForm.registered_address.$invalid && partnerForm.registered_address.$dirty}">
                                 <label class="control-label col-sm-4" for="registered_address-input">*
                                     Registered Office Address</label>
                                 <div class="col-sm-8">
@@ -945,7 +944,7 @@
                     <div class="panel-body" ng-if="role=='compliance'">
                         <div class="form-horizontal">
                             <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
+                                 ng-class="{'has-error':partnerForm.registered_address.$invalid && partnerForm.registered_address.$dirty}">
                                 <label class="control-label col-sm-4" for="registered_address-input">*
                                     Registered Office Address</label>
                                 <div class="col-sm-8">