From b27014399c83c7043390f31bad91c77d6a44a346 Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Wed, 11 Sep 2019 11:53:33 +0800
Subject: [PATCH] =?UTF-8?q?[Royal=20Pay]=20=E6=B3=95=E4=BA=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/partner_edit.html       | 212 +++++-------------
 1 file changed, 56 insertions(+), 156 deletions(-)

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 8a0e3f14f..3850a93d2 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -605,17 +605,24 @@
 
                     <hr/>
                     <div>&nbsp;&nbsp;Legal Representative</div>
-                    <div class="panel-body" ng-if="role !='compliance'">
+                    <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.legal_representative_person.$invalid && partnerForm.legal_representative_person.$dirty}">
                                 <label class="control-label col-sm-2" for="legal_representative_person-input">*
                                     Representative Name</label>
                                 <div class="col-sm-8">
+                                    <div ng-if="role !='compliance'">
                                     <input class="form-control" ng-model="partner.legal_representative_person"
                                            required
                                            name="legal_representative_person"
                                            id="legal_representative_person-input" maxlength="50">
+                                    </div>
+                                    <div ng-if="role =='compliance'">
+                                        <input class="form-control" ng-model="partner.legal_representative_person"
+                                               name="legal_representative_person"
+                                               id="legal_representative_person-input" maxlength="50">
+                                    </div>
                                     <div ng-messages="partnerForm.legal_representative_person.$error"
                                          ng-if="partnerForm.legal_representative_person.$dirty">
                                         <p class="small text-danger" ng-message="required">Required
@@ -630,10 +637,14 @@
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.legal_representative_phone.$invalid && partnerForm.legal_representative_phone.$dirty}">
                                 <label class="control-label col-sm-2" for="legal_representative_phone-input">* Phone</label>
-                                <div class="col-sm-8">
+                                <div class="col-sm-8" ng-if="role !='compliance'">
                                     <input type="text" class="form-control" ng-model="partner.legal_representative_phone" required
                                            name="legal_representative_phone" id="legal_representative_phone-input" maxlength="20">
                                 </div>
+                                <div class="col-sm-8" ng-if="role =='compliance'">
+                                    <input type="text" class="form-control" ng-model="partner.legal_representative_phone"
+                                           name="legal_representative_phone" id="legal_representative_phone-input" maxlength="20">
+                                </div>
                                 <div ng-messages="partnerForm.legal_representative_phone.$error"
                                      ng-if="partnerForm.legal_representative_phone.$dirty">
                                     <p class="small text-danger" ng-message="required">Required Field</p>
@@ -646,12 +657,17 @@
                                  ng-class="{'has-error':partnerForm.legal_representative_email.$invalid && partnerForm.legal_representative_email.$dirty}">
                                 <label class="control-label col-sm-2" for="legal_representative_email-id">*
                                      E-mail</label>
-                                <div class="col-sm-8">
+                                <div class="col-sm-8" ng-if="role !='compliance'">
                                     <input class="form-control" ng-model="partner.legal_representative_email"
                                            required
                                            name="legal_representative_email" id="legal_representative_email-id"
                                            maxlength="50">
                                 </div>
+                                <div class="col-sm-8" ng-if="role =='compliance'">
+                                    <input class="form-control" ng-model="partner.legal_representative_email"
+                                           name="legal_representative_email" id="legal_representative_email-id"
+                                           maxlength="50">
+                                </div>
                                 <div ng-messages="partnerForm.legal_representative_email.$error"
                                      ng-if="partnerForm.legal_representative_email.$dirty">
                                     <p class="small text-danger" ng-message="required">Required
@@ -665,12 +681,17 @@
                                  ng-class="{'has-error':partnerForm.legal_representative_job.$invalid && partnerForm.legal_representative_job.$dirty}">
                                 <label class="control-label col-sm-2" for="legal_representative_job-id">*
                                     Job title</label>
-                                <div class="col-sm-8">
+                                <div class="col-sm-8" ng-if="role !='compliance'">
                                     <input class="form-control" ng-model="partner.legal_representative_job"
                                            required
                                            name="legal_representative_job" id="legal_representative_job-id"
                                            maxlength="50">
                                 </div>
+                                <div class="col-sm-8" ng-if="role =='compliance'">
+                                    <input class="form-control" ng-model="partner.legal_representative_job"
+                                           name="legal_representative_job" id="legal_representative_job-id"
+                                           maxlength="50">
+                                </div>
                                 <div ng-messages="partnerForm.legal_representative_job.$error"
                                      ng-if="partnerForm.legal_representative_job.$dirty">
                                     <p class="small text-danger" ng-message="required">Required
@@ -683,81 +704,6 @@
                         </div>
                     </div>
 
-                    <div class="panel-body" ng-if="role=='compliance'">
-                    <div class="form-horizontal">
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.legal_representative_person.$invalid && partnerForm.legal_representative_person.$dirty}">
-                            <label class="control-label col-sm-2" for="legal_representative_person-input">*
-                                Representative Name</label>
-                            <div class="col-sm-8">
-                                <input class="form-control" ng-model="partner.legal_representative_person"
-                                       name="legal_representative_person"
-                                       id="legal_representative_person-input" maxlength="50">
-                                <div ng-messages="partnerForm.legal_representative_person.$error"
-                                     ng-if="partnerForm.legal_representative_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>
-                            </div>
-                        </div>
-
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.legal_representative_phone.$invalid && partnerForm.legal_representative_phone.$dirty}">
-                            <label class="control-label col-sm-2" for="legal_representative_phone-input">* Phone</label>
-                            <div class="col-sm-8">
-                                <input type="text" class="form-control" ng-model="partner.legal_representative_phone"
-                                       name="legal_representative_phone" id="legal_representative_phone-input" maxlength="20">
-                            </div>
-                            <div ng-messages="partnerForm.legal_representative_phone.$error"
-                                 ng-if="partnerForm.legal_representative_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>
-                        </div>
-
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.legal_representative_email.$invalid && partnerForm.legal_representative_email.$dirty}">
-                            <label class="control-label col-sm-2" for="legal_representative_email-id">*
-                                E-mail</label>
-                            <div class="col-sm-8">
-                                <input class="form-control" ng-model="partner.legal_representative_email"
-                                       name="legal_representative_email" id="legal_representative_email-id"
-                                       maxlength="50">
-                            </div>
-                            <div ng-messages="partnerForm.legal_representative_email.$error"
-                                 ng-if="partnerForm.legal_representative_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>
-                        </div>
-
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.legal_representative_job.$invalid && partnerForm.legal_representative_job.$dirty}">
-                            <label class="control-label col-sm-2" for="legal_representative_job-id">*
-                                Job title</label>
-                            <div class="col-sm-8">
-                                <input class="form-control" ng-model="partner.legal_representative_job"
-                                       name="legal_representative_job" id="legal_representative_job-id"
-                                       maxlength="50">
-                            </div>
-                            <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
-                                    Characters(including symbols and spaces)</p>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
                 </div>
 
                 <!--end 商户联系资料-->
@@ -863,16 +809,23 @@
                     </div>
                     <hr/>
                     <div>&nbsp;&nbsp;Registered Office Address</div>
-                    <div class="panel-body" ng-if="role !='compliance'">
+                    <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group col-sm-6"
                                  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">
+                                <div class="col-sm-8" >
+                                    <div ng-if="role !='compliance'">
                                         <textarea class="form-control" ng-model="partner.registered_address"
                                                   name="registered_address"
                                                   id="registered_address-input" maxlength="200" required></textarea>
+                                    </div>
+                                    <div ng-if="role =='compliance'">
+                                        <textarea class="form-control" ng-model="partner.registered_address"
+                                                  name="registered_address"
+                                                  id="registered_address-input" maxlength="200"></textarea>
+                                    </div>
                                     <div ng-messages="partnerForm.registered_address.$error"
                                          ng-if="partnerForm.registered_address.$dirty">
                                         <p class="small text-danger" ng-message="maxlength">Less
@@ -888,9 +841,16 @@
                                 <label class="control-label col-sm-4" for="registered_suburb-input">*
                                     Suburb</label>
                                 <div class="col-sm-8">
+                                    <div ng-if="role !='compliance'">
                                     <input class="form-control" ng-model="partner.registered_suburb"
                                            name="registered_suburb"
                                            id="registered_suburb-input" maxlength="50" required>
+                                    </div>
+                                    <div ng-if="role =='compliance'">
+                                        <input class="form-control" ng-model="partner.registered_suburb"
+                                               name="registered_suburb"
+                                               id="registered_suburb-input" maxlength="50">
+                                    </div>
                                     <div ng-messages="partnerForm.registered_suburb.$error"
                                          ng-if="partnerForm.registered_suburb.$dirty">
                                         <p class="small text-danger" ng-message="maxlength">Less
@@ -906,9 +866,16 @@
                                 <label class="control-label col-sm-4" for="registered_postcode-input">*
                                     PostCode</label>
                                 <div class="col-sm-8">
+                                    <div ng-if="role !='compliance'">
                                     <input class="form-control" ng-model="partner.registered_postcode"
                                            name="registered_postcode"
                                            id="registered_postcode-input" maxlength="10" required>
+                                    </div>
+                                    <div ng-if="role =='compliance'">
+                                        <input class="form-control" ng-model="partner.registered_postcode"
+                                               name="registered_postcode"
+                                               id="registered_postcode-input" maxlength="10" >
+                                    </div>
                                     <div ng-messages="partnerForm.registered_postcode.$error"
                                          ng-if="partnerForm.registered_postcode.$dirty">
                                         <p class="small text-danger" ng-message="maxlength">Less
@@ -924,90 +891,23 @@
                                 <label class="control-label col-sm-4" for="registered_state-input">*
                                     State</label>
                                 <div class="col-sm-8">
+                                    <div ng-if="role !='compliance'">
                                     <select class="form-control" name="registered_state" required
                                             ng-model="partner.registered_state"
                                             id="registered_state-input"
                                             ng-options="state.value as state.label for state in states">
                                         <option value="">Please Choose</option>
                                     </select>
-                                    <div ng-messages="partnerForm.registered_state.$error"
-                                         ng-if="partnerForm.registered_state.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
                                     </div>
 
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="panel-body" ng-if="role=='compliance'">
-                        <div class="form-horizontal">
-                            <div class="form-group col-sm-6"
-                                 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">
-                                        <textarea class="form-control" ng-model="partner.registered_address"
-                                                  name="registered_address"
-                                                  id="registered_address-input" maxlength="200" ></textarea>
-                                    <div ng-messages="partnerForm.registered_address.$error"
-                                         ng-if="partnerForm.registered_address.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 200
-                                            Characters(including symbols and spaces)</p>
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
+                                    <div ng-if="role =='compliance'">
+                                        <select class="form-control" name="registered_state"
+                                                ng-model="partner.registered_state"
+                                                id="registered_state-input"
+                                                ng-options="state.value as state.label for state in states">
+                                            <option value="">Please Choose</option>
+                                        </select>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.registered_suburb.$invalid && partnerForm.registered_suburb.$dirty}">
-                                <label class="control-label col-sm-4" for="registered_suburb-input">*
-                                    Suburb</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" ng-model="partner.registered_suburb"
-                                           name="registered_suburb"
-                                           id="registered_suburb-input" maxlength="50">
-                                    <div ng-messages="partnerForm.registered_suburb.$error"
-                                         ng-if="partnerForm.registered_suburb.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 50
-                                            Characters(including symbols and spaces)</p>
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.registered_postcode.$invalid && partnerForm.registered_postcode.$dirty}">
-                                <label class="control-label col-sm-4" for="registered_postcode-input">*
-                                    PostCode</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" ng-model="partner.registered_postcode"
-                                           name="registered_postcode"
-                                           id="registered_postcode-input" maxlength="10">
-                                    <div ng-messages="partnerForm.registered_postcode.$error"
-                                         ng-if="partnerForm.registered_postcode.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 10
-                                            Characters(including symbols and spaces)</p>
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.registered_state.$invalid && partnerForm.registered_state.$dirty}">
-                                <label class="control-label col-sm-4" for="registered_state-input">*
-                                    State</label>
-                                <div class="col-sm-8">
-                                    <select class="form-control" name="registered_state"
-                                            ng-model="partner.registered_state"
-                                            id="registered_state-input"
-                                            ng-options="state.value as state.label for state in states">
-                                        <option value="">Please Choose</option>
-                                    </select>
                                     <div ng-messages="partnerForm.registered_state.$error"
                                          ng-if="partnerForm.registered_state.$dirty">
                                         <p class="small text-danger" ng-message="required">Required