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

src/main/ui/merchant_application.html

@@ -272,7 +272,7 @@
 
                         <div class="form-group has-feedback"
                              ng-class="{'has-error':accountForm.contact_email.$invalid && accountForm.contact_email.$dirty}">
-                            <input class="form-control" ng-model="partner.contact_email" placeholder="Email address"
+                            <input type="email" class="form-control" ng-model="partner.contact_email" placeholder="Email address"
                                    required maxlength="50" name="contact_email" ng-mouseleave="checkParams()" ng-mousedown="trueEmail =false">
                             <div style="text-align: left" ng-if="trueEmail">
                                 <p style="text-align: left;font-size: 12px;color: red">The mailbox is incorrect</p>
@@ -284,9 +284,9 @@
                                  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="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">
+                                    <input type="text" name="contact_phone" required ng-model="partner.contact_phone"
+                                           class="form-control" style="display: inline" onKeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
+                                           placeholder="Your Phone"  maxlength="11" 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"
                                             title="发送验证码" ng-click="sendVerificationCode()"
                                             ng-bind="description" ng-disabled="canClick"></button>
@@ -302,8 +302,9 @@
 
                         <div class="form-group has-feedback"
                              ng-class="{'has-error':accountForm.code.$invalid && accountForm.code.$dirty}">
-                            <input class="form-control" type="number" ng-model="partner.phoneCodeKey" placeholder="Verification Code"
-                                   required maxlength="10" name="code" ng-click="checkParams()">
+                            <input class="form-control" type="text" ng-model="partner.phoneCodeKey" placeholder="Verification Code"
+                                   onKeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
+                                   required maxlength="6" name="code" ng-click="checkParams()">
                         </div>
 
                         <div class="form-group has-feedback"
@@ -423,8 +424,8 @@
                     <form novalidate name="bankForm" action="" method="post" ng-show="chooseArray[2]">
                         <div class="form-group has-feedback"
                              ng-class="{'has-error':bankForm.account_no.$invalid && bankForm.account_no.$dirty}">
-                            <input type="number" class="form-control" ng-model="partner.bank_no" placeholder="Account No"
-                                   required maxlength="20"
+                            <input type="text" class="form-control" ng-model="partner.bank_no" placeholder="Account No"
+                                   required maxlength="20" onKeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
                                    name="account_no">
                         </div>
 
@@ -455,23 +456,23 @@
                             </div>
                             <div class="form-group has-feedback"
                                  ng-class="{'has-error':bankForm.address.$invalid && bankForm.address.$dirty}">
-                                <p class="form-control-static">&nbsp; Address: <em>{{bankaccount.address}}</em></p>
+                                <p class="form-control-static">&nbsp; <small>Address: &nbsp;<em>{{bankaccount.address}}</em></small></p>
                             </div>
                             <div class="form-group has-feedback"
                                  ng-class="{'has-error':bankForm.system.$invalid && bankForm.bank_system.$dirty}">
-                                <p class="form-control-static">&nbsp; system: <em>{{bankaccount.system}}</em></p>
+                                <p class="form-control-static">&nbsp; <small>system: &nbsp;<em>{{bankaccount.system}}</em></small></p>
                             </div>
                             <div class="form-group has-feedback"
                                  ng-class="{'has-error':bankForm.postcode.$invalid && bankForm.bank_postcode.$dirty}">
-                                <p class="form-control-static">&nbsp; postcode: <em>{{bankaccount.postcode}}</em></p>
+                                <p class="form-control-static">&nbsp; <small>postcode: &nbsp;<em>{{bankaccount.postcode}}</em></small></p>
                             </div>
                             <div class="form-group has-feedback"
                                  ng-class="{'has-error':bankForm.state.$invalid && bankForm.bank_state.$dirty}">
-                                <p class="form-control-static">&nbsp; state: <em>{{bankaccount.state}}</em></p>
+                                <p class="form-control-static">&nbsp; <small>state:&nbsp; <em>{{bankaccount.state}}</em></small></p>
                             </div>
                             <div class="form-group has-feedback"
                                  ng-class="{'has-error':bankForm.branch.$invalid && bankForm.branch.$dirty}">
-                                <p class="form-control-static">&nbsp; branch: <em>{{bankaccount.branch}}</em></p>
+                                <p class="form-control-static">&nbsp; <small>branch: &nbsp;<em>{{bankaccount.branch}}</em></small></p>
                             </div>
                         </div>
                         <div class="row">