From 13d09ddf72a76aa1afd8c9b0b4b160dc6fb3396b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 5 Jul 2019 16:53:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=20subpartner=20=E5=90=8C=E6=AD=A5=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E7=BC=96=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/payment/partner/partner-manage.js  | 21 +++++++++++++++++++
 .../templates/add_sub_partner_dialog.html     |  8 ++++++-
 2 files changed, 28 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 1f2684509..8ecf5793a 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2784,10 +2784,20 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             } else {
                 $scope.partner = {timezone: 'Australia/Melbourne'};
             }
+            $scope.initMerchantCode = function () {
+                $http.get('/sys/partners/init/merchant_code').then(function (response) {
+                    $scope.partner.client_moniker = response.data;
+                    $scope.merchantCodeChecked = true;
+                    $scope.merchantIsValid = true;
+                });
+            };
+            $scope.initMerchantCode();
             $scope.partner.company_phone_c = 61;
             $scope.partner.contact_phone_c = 61;
             $scope.partner.client_pay_type = [];
             $scope.partner.client_pay_desc = [];
+            $scope.merchantIsValid = false;
+            $scope.merchantCodeChecked = false;
             var resetClientPayDescByTpey = function (type) {
                 type = parseInt(type);
                 if (type == 1) {
@@ -2914,6 +2924,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $scope.timezones = timezone.configs();
             $scope.states = stateMap.configs();
             $scope.countries = countryMap.configs();
+            $scope.checkMerchantCodeIsValid = function (code) {
+                if (code.length != 4) {
+                    $scope.merchantCodeChecked = false;
+                    $scope.merchantIsValid = false;
+                    return;
+                }
+                $http.get('/sys/partners/init/check_code_isvalid',{params:{clientMoniker:code}}).then(function (response) {
+                    $scope.merchantIsValid = response.data;
+                    $scope.merchantCodeChecked = true;
+                });
+            };
             $scope.saveSubPartner = function (form) {
                 if (form.$invalid) {
                     angular.forEach(form, function (item, key) {
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 537a23227..17bb61475 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
@@ -25,8 +25,14 @@
                                         <div class="col-sm-8">
                                             <input class="form-control text-uppercase" ng-model="partner.client_moniker"
                                                    type="text"
+                                                   style="display:inline;width:20%"
                                                    name="client_moniker"
-                                                   id="short-id-input" required maxlength="4" ng-pattern="/^[a-zA-Z0-9]+$/">
+                                                   id="short-id-input" required maxlength="4" ng-pattern="/^[a-zA-Z0-9]+$/" ng-change="checkMerchantCodeIsValid(partner.client_moniker)">
+                                            <a style="display: inline-block" role="button" ng-click="initMerchantCode()"><i class="fa fa-refresh" title="Refreshes the partner code"></i></a>
+                                            <span ng-if="merchantCodeChecked">
+                                                <i ng-if="merchantIsValid" class="fa fa-check-square-o check-i" aria-hidden="true" style="float: none;padding-left: 20px"></i>
+                                                <i ng-if="!merchantIsValid" class="text-danger fa fa-close" style="float: none;padding-left: 20px"></i>
+                                            </span>
                                             <p class="small text-info">No further changeable!</p>
                                             <div ng-messages="partnerForm.client_moniker.$error"
                                                  ng-if="partnerForm.client_moniker.$dirty">