From 7d0f04cb4e866e4a505261b45ed70ed3d13841fe Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 4 Apr 2019 12:02:16 +0800
Subject: [PATCH] fix add_sub_partner

---
 .../static/payment/partner/partner-manage.js  |   3 +
 .../partner/templates/add_partner.html        |   3 +-
 .../templates/add_sub_partner_dialog.html     | 105 ++++++++++++++++++
 3 files changed, 110 insertions(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index e1a328b7c..bc32e68d6 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2708,6 +2708,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 //     alert("Please Locate Merchant Location!");
                 //     return;
                 // }
+                if ($scope.partner.client_pay_type==''){
+                    alert('请选择商户支付场景')
+                }
                 $http.post('/sys/partners/' + clientMoniker + '/sub_clients', $scope.partner).then(function () {
                     $scope.updateMerchantLocation();
                     $scope.$close();
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 d55bb9ffc..bfc64215e 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -495,6 +495,7 @@
                             </div>
                         </div>
                     </div>
+                </div>
 
                     <div class="panel panel-default">
                         <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em>
@@ -1046,7 +1047,7 @@
                 <button class="btn btn-success" type="button" ng-click="save(partnerForm)">Save
                 </button>
             </div>
-        </div>
+
 </div>
 </form>
 </div>
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 e3a4650d3..95b7aa9d0 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
@@ -317,6 +317,111 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Merchant Payment Scenario</div>
+                            <div class="panel-body">
+                                <div class="form-horizontal">
+                                    <div class="form-group"
+                                         ng-class="{'has-error':partnerForm.client_pay_type.$invalid && partnerForm.client_pay_type.$dirty}">
+                                        <label class="control-label col-sm-2" for="client-pay-type-select">*
+                                            Merchant Payment Scenario Type</label>
+                                        <div class="col-sm-8">
+                                            <select class="form-control" ng-model="partner.client_pay_type"
+                                                    id="client-pay-type-select"
+                                                    name="client_pay_type">
+                                                <option value="">Please Choose</option>
+                                                <option value="all">All</option>
+                                                <option value="online">线上</option>
+                                                <option value="offline">线下</option>
+                                            </select>
+                                            <div ng-messages="partnerForm.client_pay_type.$error"
+                                                 ng-if="partnerForm.client_pay_type.$dirty">
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--<div ng-if="partner.client_pay_type=='online' || partner.client_pay_type=='all'">-->
+                                    <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                    <!--Website</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                    <!--<input type="text" class="form-control"-->
+                                    <!--ng-model="partner.online_website">-->
+                                    <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                    <!--公众号名称</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                    <!--<input type="text" class="form-control"-->
+                                    <!--ng-model="partner.online_public_account">-->
+                                    <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                    <!--Mini Program Name</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                    <!--<input type="text" class="form-control"-->
+                                    <!--ng-model="partner.online_mini_program">-->
+                                    <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                    <!--APP Name</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                    <!--<input type="text" class="form-control"-->
+                                    <!--ng-model="partner.online_app">-->
+                                    <!--<p class="small text-info">-->
+                                    <!--<i class="fa fa-info"></i> 线上支付场景至少选择填一项</p>-->
+                                    <!--</div>-->
+
+                                    <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div ng-if="partner.client_pay_type=='offline' || partner.client_pay_type=='all'">-->
+                                    <!--<div class="form-group"-->
+                                    <!--ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">-->
+                                    <!--<label class="control-label col-sm-2"-->
+                                    <!--for="client-offline-desc">*Offline Scene Of Merchants</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                    <!--<input class="form-control" id="client-offline-desc" required-->
+                                    <!--name="client_offline" readonly-->
+                                    <!--ng-model="partner.client_offline_desc | partner_offline_desc"-->
+                                    <!--multi-level-select-popup="client_offline_select"-->
+                                    <!--on-select="onOfflineDescSelect($selected)">-->
+                                    <!--<div ng-messages="partnerForm.client_offline.$error"-->
+                                    <!--ng-if="partnerForm.client_offline.$dirty">-->
+                                    <!--<p class="small text-danger" ng-message="required">Required-->
+                                    <!--Field</p>-->
+                                    <!--</div>-->
+                                    <!--</div>-->
+                                    <!--</div>-->
+                                    <!--</div>-->
+                                    <div class="form-group"
+                                         ng-class="{'has-error':partnerForm.client_pay_desc.$invalid && partnerForm.client_pay_desc.$dirty}">
+                                        <label class="control-label col-sm-2" for="client-pay-desc-input">*
+                                            Merchant Payment Scenario Description</label>
+                                        <div class="col-sm-8">
+                                <textarea class="form-control" required
+                                          ng-model="partner.client_pay_desc"
+                                          name="client_pay_desc" id="client-pay-desc-input"
+                                          maxlength="200"></textarea>
+                                            <p class="small text-info">
+                                                <i class="fa fa-info"></i> 例如：线下场景：门店（立牌、POS）、收银系统（选择品牌名称【ipos、银豹、aupos、其他】）、无门店</p>
+                                            <div ng-messages="partnerForm.client_pay_desc.$error"
+                                                 ng-if="partnerForm.client_pay_desc.$dirty">
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 200
+                                                    Characters(including symbols and spaces)</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
                         <!--end 商户基本资料-->
                         <div class="panel panel-default">
                             <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em></div>