From 3db0c13c7d85c53cf27223b09e7168056fcf5aaa Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 27 Mar 2019 21:59:00 +0800
Subject: [PATCH] =?UTF-8?q?inspiry=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ClientManagerImpl.java         |  2 +-
 .../static/payment/partner/partner-manage.js  |  4 +-
 .../payment/partner/templates/add_device.html | 79 ++++++++++---------
 3 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index aa8b9751c..1e794935b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -2117,7 +2117,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (deviceInfo.getIntValue("client_id") != client.getIntValue("client_id")) {
             throw new NotFoundException("设备不存在");
         }
-        if (StringUtils.equals(InspiryPOSFinder.INSPIRY_DEVICE_TYPE, deviceInfo.getString("dev_type"))) {
+        if (StringUtils.equals(InspiryPOSFinder.INSPIRY_DEVICE_TYPE, deviceInfo.getString("client_type")) && enable) {
             JSONObject inspiryDevice = clientDeviceMapper.findDeviceInfoByDeviceNo(deviceInfo.getString("client_dev_id"), InspiryPOSFinder.INSPIRY_DEVICE_TYPE);
             if (inspiryDevice != null) {
                 throw new ServerErrorException("当前设备已被使用");
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index a00546187..27e8bb534 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2989,9 +2989,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     }]);
 
     app.controller('newDeviceDialogCtrl', ['$scope', '$http', 'clientMoniker', function ($scope, $http,clientMoniker) {
-        $scope.params = {};
-        $scope.manager = {};
-
         $scope.save = function (form) {
             $scope.errmsg = null;
             if (form.$invalid) {
@@ -3002,6 +2999,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
+            alert($scope.device);
             $http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then(function () {
                 $scope.$close();
             }, function (resp) {
diff --git a/src/main/ui/static/payment/partner/templates/add_device.html b/src/main/ui/static/payment/partner/templates/add_device.html
index 2f6a191f7..884d656d4 100644
--- a/src/main/ui/static/payment/partner/templates/add_device.html
+++ b/src/main/ui/static/payment/partner/templates/add_device.html
@@ -2,49 +2,52 @@
     <h4>New Manager Device</h4>
 </div>
 <div class="modal-body">
-    <div class="row">
-        <form novalidate name="deviceForm">
-            <div class="form-group"
-                 ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
-                <label class="control-label" for="client_dev_id-input">* 设备编号</label>
-                <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
-                       ng-model="device.client_dev_id" maxlength="50">
-                <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
-                    <p class="small text-danger" ng-message="required">client_dev_id field is required</p>
-                </div>
+    <form novalidate name="deviceForm">
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
+            <label class="control-label" for="client_dev_id-input">* Device No</label>
+            <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
+                   ng-model="device.client_dev_id" maxlength="25">
+            <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
+                <p class="small text-danger" ng-message="required">Device No Cannot Be Empty</p>
             </div>
-            <div class="form-group"
-                 ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
-                <label class="control-label" for="auth_code-input">* 设备密钥</label>
-                <input required class="form-control" id="auth_code-input" name="auth_code"
-                       ng-model="device.auth_code" maxlength="50">
-                <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
-                    <p class="small text-danger" ng-message="required">设备密钥 field is required</p>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="client_type-input">设备类型</label>
-                <input class="form-control" id="client_type-input" name="client_type"
-                       ng-model="device.client_type" ng-init="inspiry" readonly>
+        </div>
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
+            <label class="control-label" for="auth_code-input">* Device Key</label>
+            <input required class="form-control" id="auth_code-input" name="auth_code"
+                   ng-model="device.auth_code" maxlength="50">
+            <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
+                <p class="small text-danger" ng-message="required">Device Key Cannot Be Empty</p>
             </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label" for="client_type-input">Device Type</label>
+            <input class="form-control" id="client_type-input" name="client_type"
+                   ng-init="device.client_type='inspiry'" placeholder="inspiry"
+                   ng-model="device.client_type" readonly>
+        </div>
 
-            <div class="form-group"
-                 ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
-                <label class="control-label" for="version-input">* version</label>
-                <input required class="form-control" id="version-input" name="version"
-                       ng-model="device.version">
-                <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
-                    <p class="small text-danger" ng-message="required">version field is required</p>
-                </div>
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
+            <label class="control-label" for="version-input">* version</label>
+            <input required class="form-control" id="version-input" name="version"
+                   ng-model="device.version" maxlength="10">
+            <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
+                <p class="small text-danger" ng-message="required">Version No Cannot Be Empty</p>
             </div>
-            <div class="form-group">
-                <label class="control-label" for="remark-input">Remark</label>
-                <input class="form-control" id="remark-input" name="version"
-                       ng-model="device.remark">
+        </div>
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.remark.$invalid && deviceForm.remark.$dirty}">
+            <label class="control-label" for="remark-input">* Remark</label>
+            <input required class="form-control" id="remark-input" name="remark"
+                   ng-model="device.remark" maxlength="50">
+            <div ng-messages="deviceForm.remark.$error" ng-if="deviceForm.remark.$dirty">
+                <p class="small text-danger" ng-message="required">Remark Cannot Be Empty</p>
             </div>
-        </form>
-    </div>
-</div>
+        </div>
+        <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
+    </form>
 </div>
 <div class="modal-footer">
     <div class="btn-group">