From cb13558735c3690c78ede6ef8c5181bb9123b75b Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Fri, 6 Apr 2018 08:22:49 +0800 Subject: [PATCH 1/4] fix --- src/main/ui/static/templates/payment/success.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/ui/static/templates/payment/success.js b/src/main/ui/static/templates/payment/success.js index 85c7020b3..8bb8587a3 100644 --- a/src/main/ui/static/templates/payment/success.js +++ b/src/main/ui/static/templates/payment/success.js @@ -55,10 +55,10 @@ $(function () { method: 'GET', dataType: 'text', success: function (data) { - if (data > 0) { - $('.points-dialog .points-value').html('+ ' + data); - $('.points-dialog').removeClass('hide'); - } + // if (data > 0) { + // $('.points-dialog .points-value').html('+ ' + data); + // $('.points-dialog').removeClass('hide'); + // } }, error: function () { } From b9efe148ecaf9a8b0dbb66cafdbbc4c6fbb998a2 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Fri, 6 Apr 2018 08:32:07 +0800 Subject: [PATCH 2/4] fix --- src/main/ui/static/boot/indexMainApp.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index db120c1d8..6cb90b5d0 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/src/main/ui/static/boot/indexMainApp.js @@ -131,9 +131,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo }); }; - if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) { - $scope.getAgStatus(); - } + // if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) { + // $scope.getAgStatus(); + // } $scope.refundNotice = {counts: 0}; $scope.openRefundNotice = false; $scope.showRefundNotice = function () { From 4fbb104b7ecee866deaaf3a65ba465e919b88fe3 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Fri, 6 Apr 2018 08:43:28 +0800 Subject: [PATCH 3/4] fix --- src/main/ui/static/boot/indexMainApp.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index 6cb90b5d0..3edbbe8bf 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/src/main/ui/static/boot/indexMainApp.js @@ -42,6 +42,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo }) } connectWebSocket(); + if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) { + $scope.getAgStatus(); + } }, function (resp) { if (resp.status == 403) { location.href = 'login.html?f=' + encodeURIComponent(location.href); @@ -131,9 +134,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo }); }; - // if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) { - // $scope.getAgStatus(); - // } + $scope.refundNotice = {counts: 0}; $scope.openRefundNotice = false; $scope.showRefundNotice = function () { From a0e2115033edf624eb05371de9fb3f105366fa9b Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Sat, 7 Apr 2018 21:56:17 +0800 Subject: [PATCH 4/4] fixbug --- .../manage/system/core/impl/ClientContractServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java index 779ee9587..5d6d6c470 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java @@ -93,6 +93,7 @@ public class ClientContractServiceImpl implements ClientContractService { record.put("expiry_date", DateUtils.addYears(now, 1)); record.put("sign_channel", channel); record.put("signatory", account.getString("display_name")); + contract = record; clientsContractMapper.save(record); }