Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

src/main/ui/merchant_application.html

@@ -776,10 +776,13 @@
                                 <p>1. As soon as you create a RoyalPay account, you can use all of RoyalPay's features, including accepting payments from customers.<br>
                                     RoyalPay账号注册成功后，您就可以使用RoyalPay所有的功能，包括接受客户的付款。
                                 </p>
-                                <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>
+                                <p>2. Please use your account (<span class="text-primary">{{partner.contact_phone}}</span>) and password to log on the website <a target="_blank" href="https://mpay.royalpay.com.au/">https://mpay.royalpay.com.au/</a>.<br>
+                                    请使用您的账户(<span class="text-primary">{{partner.contact_phone}}</span>)和密码来登录这个网址<a target="_blank" href="https://mpay.royalpay.com.au/">https://mpay.royalpay.com.au/</a>。
+                                </p>
+                                <p>3. 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>
                                     在您激活账号之前，RoyalPay将不执行清算操作。因此，请您尽快提交合规材料。
                                 </p>
-                                <p>3. If you have any questions, you can contact our customer service.<br>
+                                <p>4. If you have any questions, you can contact our customer service.<br>
                                     若有任何疑问，请联系我们客服。
                                 </p>
                             </div>

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

@@ -230,6 +230,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
     };
 
     $scope.saveStep1 = function (form,index) {
+        alert('Do not forget your login id ('+$scope.partner.contact_phone+') and password');
         $scope.initErrorMsg();
         if (form.$invalid) {
             angular.forEach(form, function (item, key) {