Merge remote-tracking branch 'origin/clientApply' into clientApply

# Conflicts:
#	src/main/ui/merchant_application.html

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -248,7 +248,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysClient.put("suburb",apply.getString("suburb"));
         sysClient.put("state",apply.getString("state"));
         sysClient.put("postcode",apply.getString("postcode"));
-        sysClient.put("industry",apply.getString("industry"));
+        sysClient.put("royalpayindustry",apply.getString("industry"));
         sysClient.put("contact_person",apply.getString("contact_person"));
         sysClient.put("contact_email",apply.getString("contact_email"));
         sysClient.put("contact_phone",apply.getString("contact_phone"));

src/main/ui/merchant_application.html

@@ -284,7 +284,7 @@
                                            class="form-control" style="width: 80%;display: inline"
                                            placeholder="Your Phone">
                                     <button type="button"  class="btn btn-success" style="width:20%;display:inline;height: 34px;float: right;border-radius: 0px"
-                                            title="发送验证码" ng-click="sendVerificationCode(partner.contact_phone)"
+                                            title="发送验证码" ng-click="sendVerificationCode()"
                                             ng-bind="description" ng-disabled="canClick"></button>
                                 </div>
 
@@ -355,15 +355,33 @@
                             <input class="form-control" ng-model="partner.postcode" placeholder="Postcode" required
                                    maxlength="50" name="postcode">
                         </div>
-                        <div class="form-group has-feedback"
+                        <div class="row">
-                             ng-class="{'has-error':companyForm.industry.$invalid && companyForm.industry.$dirty}">
+                            <div class="col-xs-12 margin-bottom">
-                            <select class="form-control" name="industry"
+                                <div class="form-group has-feedback" ng-class="{'has-error':companyForm.royalpayindustry.$invalid && companyForm.royalpayindustry.$dirty}">
-                                    ng-model="partner.industry"
+                                    <div class="dropdown">
-                                    id="industry-input" required
+                                        <input id="dLabel" data-toggle="dropdown" data-target="#" class="form-control"
-                                    ng-options="industry.value as industry.label for industry in industries">
+                                               ng-model="industryLable" placeholder="Industry" required
-                                <option value="">Industry</option>
+                                               maxlength="50" name="royalpayindustry">
-                            </select>
+                                        <ul class="dropdown-menu multi-level" role="menu" aria-labelledby="dropdownMenu">
+                                            <li class="dropdown-submenu" ng-repeat="industry in royalpayindustry">
+                                                <a tabindex="-1" ng-model="industry.mccCode">{{industry.label}}</a>
+                                                <ul class="dropdown-menu">
+                                                    <li><a tabindex="-1" href="javascript:;" ng-repeat="child in industry.children" ng-click="chooseIndustry(child)">{{child.label}}</a></li>
+                                                </ul>
+                                            </li>
+                                        </ul>
+                                    </div>
                                 </div>
+                            </div>
+                        </div>
+                       <!-- <div class="form-group has-feedback"
+                             ng-class="{'has-error':companyForm.royalpayindustry.$invalid && companyForm.royalpayindustry.$dirty}">
+                            <input class="form-control" id="royalpayindustry" required
+                                   name="royalpayindustry" readonly
+                                   ng-model="partner.royalpayindustry"
+                                   multi-level-select-popup="royalpayindustry"
+                                   on-select="onRoyalPayIndustrySelect($selected)">
+                        </div>-->
 
                         <div class="row">
                             <div class="col-xs-12 margin-bottom">

src/main/ui/static/css/merchant_application.css

@@ -419,6 +419,47 @@ body .dis_before:nth-child(5):before {
     color: white;
      background: #1ea4ec;
  }
+.dropdown-submenu {
+    position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+    top: 0;
+    left: 100%;
+    margin-top: -6px;
+    margin-left: -1px;
+    -webkit-border-radius: 0 6px 6px 6px;
+    -moz-border-radius: 0 6px 6px;
+    border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu:hover > .dropdown-menu {
+    display: block;
+}
+.dropdown-submenu > a:after {
+    display: block;
+    content: " ";
+    float: right;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+    border-width: 5px 0 5px 5px;
+    border-left-color: #ccc;
+    margin-top: 5px;
+    margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+    border-left-color: #fff;
+}
+.dropdown-submenu.pull-left {
+    float: none;
+}
+.dropdown-submenu.pull-left > .dropdown-menu {
+    left: -100%;
+    margin-left: 10px;
+    -webkit-border-radius: 6px 0 6px 6px;
+    -moz-border-radius: 6px 0 6px 6px;
+    border-radius: 6px 0 6px 6px;
+}
 /*.progress_inner__step:before{
     background: #1ea4ec;
 }

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

@@ -70,7 +70,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
         }
     };
     $scope.disabledArray = new Array(true, false, false, false, false);
-    $scope.chooseArray = new Array(true, false, false, false, false);
+    $scope.chooseArray = new Array(false, true, false, false, false);
     $scope.changeChoose = function (index) {
         angular.forEach($scope.partner, function(key, value) {
             if(value.trim()==''){
@@ -120,6 +120,10 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
             $scope.resError = resp.data.message;
         });
     };
+    $scope.chooseIndustry = function (industry) {
+       $scope.partner.industry = industry.mccCode;
+       $scope.industryLable = industry.label;
+    };
     $scope.searchBankInfo = function (bsb_no) {
         if (bsb_no != null && bsb_no != "") {
             $http.get('/register/info/bank/' + bsb_no).then(function (resp) {
@@ -203,6 +207,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
                 $scope.goToLogin();
             }
             $scope.changeChoose(index);
+            $scope.resError = '';
         }, function (resp) {
             $scope.resError = resp.data.message;
         });