Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

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"));
     }
 }

src/main/ui/merchant_application.html

@@ -284,7 +284,7 @@
                                  ng-class="{'has-error':accountForm.contact_phone.$invalid && accountForm.contact_phone.$dirty || name_exist}">
                                 <div class="input-group">
                                     <span class="input-group-addon">+61</span>
-                                    <input type="text" name="contact_phone" required ng-model="partner.contact_phone"
+                                    <input type="number" name="contact_phone" required ng-model="partner.contact_phone"
                                            class="form-control" style="display: inline"
                                            placeholder="Your Phone"  maxlength="15" ng-mouseleave="checkParams()" ng-mousedown="name_exist =false">
                                     <button type="button"  class="btn btn-success button_width" style="display:inline;height: 34px;float: right;border-radius: 0px"
@@ -518,7 +518,7 @@
 
                         <div class="form-group has-feedback">
                             <div class="checkbox agree_left agree-text">
-                                <label><input type="checkbox" ng-model="partner.agree" value="1">Agree to Terms & Conditions</label>
+                                <label><input type="checkbox" ng-model="partner.agree" value="1"><a href="https://file.royalpay.com.au/open/2018/03/07/merchant_service20180307.pdf" target="_blank">Agree to Terms & Conditions</a></label>
                             </div>
                         </div>
                         <div class="row">

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){
+        $scope.checkEmail = function () {
-                alert("邮箱已验证，请勿重复点击！");
+            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'});
             })
         }
     }]);

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 @@
                             <i class="fa fa-check-circle" ng-if="mail_confirm"></i>
                             <i class="fa fa-dot-circle-o"  ng-if="!mail_confirm"></i>
                         </div>
-                        <div class="start_text">
+                        <div class="start_text" style="cursor: default">
-                            <p><a href="" class="text-primary" role="button" title="Send">
+                            <p><a  class="text-primary" ng-if="sendMailCount == 0">
-                                <span  ng-class="{'text-gray':mail_confirm,'text-primary':!mail_confirm}">&nbsp;Verify your email address <em>{{currentUser.client.contact_email}}</em></span>
+                                <span ng-class="{'text-gray':mail_confirm,'text-primary':!mail_confirm}">&nbsp;Verify your email address <em>{{currentUser.client.contact_email}}</em></span>
-                                <i class="fa fa-paper-plane-o" ng-if="!mail_confirm" ng-click="checkEmail(mail_confirm)"></i>
+                                <i role="button" class="fa fa-paper-plane-o" ng-if="!mail_confirm" ng-click="checkEmail()"></i>
+                            </a>
+                            <a  class="text-primary"  ng-if="sendMailCount > 0">
+                                <span ng-class="{'text-gray':mail_confirm,'text-primary':!mail_confirm}">&nbsp;Send to <em>{{currentUser.client.contact_email}}</em></span>
+                                <i role="button" class="fa fa-paper-plane-o" ng-if="!mail_confirm" ng-click="checkEmail()"></i>
                             </a>
                             </p>
+
                         </div>
                     </div>
 

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) {

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}}</small>)</span>
                 【目前状态】-
                 <b ng-if="partner.source==4">
-                    <span ng-if="partner.approve_result">(自助申请)资料完善中</span>
+                    <span ng-if="!partner.approve_result">(自助申请)资料完善中</span>
                     <span ng-if="partner.approve_result==1">(自助申请)已开通</span>
                     <span ng-if="partner.approve_result==2">(自助申请)快速开通等待提交合规材料</span>
                     <span ng-if="partner.approve_result==3">(自助申请)待审核（材料已提交）</span>

src/main/ui/static/payment/partner/templates/partner_detail.html

@@ -62,9 +62,9 @@
                 【目前状态】-
                 <b ng-if="partner.source==4">
                    <span ng-if="!partner.approve_result">(自助申请)资料完善中</span>
-                   <span ng-if="!partner.approve_result==1">(自助申请)已开通</span>
+                   <span ng-if="partner.approve_result==1">(自助申请)已开通</span>
-                   <span ng-if="!partner.approve_result==2">(自助申请)快速开通等待提交合规材料</span>
+                   <span ng-if="partner.approve_result==2">(自助申请)快速开通等待提交合规材料</span>
-                   <span ng-if="!partner.approve_result==3">(自助申请)待审核（材料已提交）</span>
+                   <span ng-if="partner.approve_result==3">(自助申请)待审核（材料已提交）</span>
                 </b>
                 <b ng-if="partner.source!=4">
                 <span ng-if="!partner.open_status">资料完善中</span>