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 781ff933f..a6f3411eb 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 @@ -3449,10 +3449,5 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject clientAccount = clientAccountMapper.findById(accountId); Assert.notNull(clientAccount); simpleClientApplyService.sendVerifyEmail(client.getString("contact_email"),client.getIntValue("client_id"),clientAccount.getString("username")); - JSONObject params = new JSONObject(); - params.put("mail_confirm",1); - params.put("client_id",client.getIntValue("client_id")); - clientMapper.update(params); - clientInfoCacheSupport.clearClientCache(client.getIntValue("client_id")); } } diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html index 4907f499b..40171ea05 100644 --- a/src/main/ui/merchant_application.html +++ b/src/main/ui/merchant_application.html @@ -284,7 +284,7 @@ ng-class="{'has-error':accountForm.contact_phone.$invalid && accountForm.contact_phone.$dirty || name_exist}">
+61 -
diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js index 4b52d9c5d..52fddef83 100644 --- a/src/main/ui/static/dashboard/partner-dashboard.js +++ b/src/main/ui/static/dashboard/partner-dashboard.js @@ -568,7 +568,8 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct } }]);*/ - app.controller('partnerDashboardCtrl', ['$scope', '$http', '$filter', '$uibModal','$timeout', 'chartParser','clearingDetailService', function ($scope, $http, $filter, $uibModal,$timeout, chartParser,clearingDetailService) { + app.controller('partnerDashboardCtrl', ['$scope', '$http', '$filter', '$uibModal','$timeout', 'chartParser','clearingDetailService','commonDialog', function ($scope, $http, $filter, $uibModal,$timeout, chartParser,clearingDetailService,commonDialog) { + $scope.sendMailCount = 0; $scope.scales = [ { key: 'today', @@ -946,13 +947,19 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct if($scope.currentUser.client.source == 4 && $scope.currentUser.client.approve_result != 1){ $scope.checkStartGuidance(); } - $scope.checkEmail = function (mail_confirm) { - if (mail_confirm){ - alert("邮箱已验证，请勿重复点击！"); + + $scope.checkEmail = function () { + if($scope.mail_confirm){ + commonDialog.alert({title: 'Message', content: '邮件已验证，请勿重复发送', type: 'info'}); + return; + } + if($scope.sendMailCount >=1){ + commonDialog.alert({title: 'Message', content: '邮件已发送，请勿重复点击', type: 'info'}); return; } $http.put('/client/partner_info/verify/email').then(function (resp) { - $scope.getCurrentPartner(); + $scope.sendMailCount = $scope.sendMailCount +1; + commonDialog.alert({title: 'Message', content: 'Verify that the message has been sent to your mailbox. Please complete the validation as soon as possible', type: 'info'}); }) } }]); diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html index b1d45c58b..ab68d1b24 100644 --- a/src/main/ui/static/dashboard/templates/partner_dashboard.html +++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html @@ -195,9 +195,6 @@ display: inline-block; vertical-align: baseline; } - .start_email{ - font-size: 15px; - } .text-gray{ color: grey !important; } @@ -234,12 +231,17 @@
-
-

-  Verify your email address {{currentUser.client.contact_email}} - +

+

+  Verify your email address {{currentUser.client.contact_email}} + + + +  Send to {{currentUser.client.contact_email}} +

+
diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js index 20f9a3392..6bf1abc62 100644 --- a/src/main/ui/static/merchantapplication/merchant_application.js +++ b/src/main/ui/static/merchantapplication/merchant_application.js @@ -156,7 +156,6 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', }; $scope.sendVerificationCode = function () { $scope.initErrorMsg(); - $scope.checkUserName($scope.partner.contact_phone,$scope.partner.nation_code) $scope.sendPhoneCodeTime(); $http.post('/register/info/phone/'+ $scope.partner.contact_phone +'/verify?nation_code='+$scope.partner.nation_code).then(function (resp) { }, function (resp) { diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 112cdd9d0..0dfd9e30d 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -17,7 +17,7 @@ ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}) 【目前状态】- - (自助申请)资料完善中 + (自助申请)资料完善中 (自助申请)已开通 (自助申请)快速开通等待提交合规材料 (自助申请)待审核（材料已提交） diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index a15f92f2f..cb9d65998 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -62,9 +62,9 @@ 【目前状态】- (自助申请)资料完善中 - (自助申请)已开通 - (自助申请)快速开通等待提交合规材料 - (自助申请)待审核（材料已提交） + (自助申请)已开通 + (自助申请)快速开通等待提交合规材料 + (自助申请)待审核（材料已提交） 资料完善中