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

src/main/ui/merchant_application.html

@@ -773,15 +773,21 @@
                         <div class="success_content">
                             <div class="content_align">
                                 <div>Notice：</div>
-                                <p>1. As soon as you create a RoyalPay account, you can use all of RoyalPay's features, including accepting payments from customers.</p>
+                                <p>1. As soon as you create a RoyalPay account, you can use all of RoyalPay's features, including accepting payments from customers.<br>
-                                <p>2. Before you activate your account, RoyalPay will not  execute settlement.Therefore, it is recommended that you submit your compliance materials as soon as possible.</p>
+                                    RoyalPay账号注册成功后，您就可以使用RoyalPay所有的功能，包括接受客户的付款。
-                                <p>3. If you have any questions, you can contact our customer service.</p>
+                                </p>
-                            </div>
+                                <p>2. Before you activate your account, RoyalPay will not  execute settlement.Therefore, it is recommended that you submit your compliance materials as soon as possible. <br>
-                            <div class="row" style="   margin-left: 100px; margin-right: 100px;">
+                                    在您激活账号之前，RoyalPay将不执行清算操作。因此，请您尽快提交合规材料。
+                                </p>
+                                <p>3. If you have any questions, you can contact our customer service.<br>
+                                    若有任何疑问，请联系我们客服。
+                                </p>
+                            </div>
+                            <div class="row" style="   margin-left: 70px; margin-right: 70px;">
                                 <div class="col-xs-12">
                                     <button type="button" id="login-btn7" class="btn btn-success btn-block btn-flat"
                                             onclick="window.location.href='/login.html'">
-                                       After {{seconds}} seconds, the system will automatically jump to the login page.
+                                        I know,and go to the login page
                                     </button>
                                     <div>
                                         <p ng-if="resError" style="padding: 6px 12px;font-size: 14px;"

src/main/ui/static/merchantapplication/merchant_application.js

@@ -55,7 +55,6 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
     $scope.states = angular.copy(stateMap);
     $scope.countries = angular.copy(countryMap);
     $scope.cleanDays = angular.copy(cleanDays);
-    $scope.seconds = 10;
     $scope.canClick=false;
     $scope.description = "Send Code";
     $scope.partner = {nation_code:"+61"};
@@ -135,14 +134,14 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
         }, 1000);
     };
 
-    $scope.goToLogin = function () {
+/*    $scope.goToLogin = function () {
         var timer = $interval(function(){
             $scope.seconds = $scope.seconds -1;
             if ($scope.seconds == 0) {
                 location.href = '/login.html';
             }
         },1000)
-    };
+    };*/
     $scope.checkEmail = function () {
         $scope.trueEmail = false;
         if($scope.partner.contact_email){
@@ -266,9 +265,6 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
             if (index == 3) {
                 $scope.getRateConfig();
             }
-            if (index == 4) {
-                $scope.goToLogin();
-            }
             $scope.changeChoose(index);
         }, function (resp) {
             $scope.resError = resp.data.message;

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

@@ -34,6 +34,17 @@
                            switch-change="skipClearing(partner.skip_clearing)">
                 </div>
             </div>
+
+            <div class="form-group">
+                <label class="col-sm-4">Manual Settle</label>
+                <div class="col-sm-6">
+                    <p>
+                        <span ng-if="partner.manual_settle">Y</span>
+                        <span ng-if="!partner.manual_settle">N</span>
+                    </p>
+                </div>
+            </div>
+
             <div class="form-group" ng-if="'modify_settle_hour'|withFunc">
                 <label class="col-sm-4">Settle Hour</label>
                 <div class="col-sm-6">