add 55%

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java

@@ -564,8 +564,8 @@ public class PartnerManageController {
     }
 
     @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
-    public String subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+    public void subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        return clientManager.subRpayMerchantApplication(clientMoniker, manager);
+        clientManager.subRpayMerchantApplication(clientMoniker, manager);
     }
 
 

src/main/ui/static/payment/partner/partner-manage.js

@@ -3199,7 +3199,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
 
         $scope.saveRpayAppliy = function (form) {
-            $scope.merchantInfo = angular.copy(form);
+            var merchantInfo = {};
                 $scope.errmsg = null;
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {
@@ -3212,28 +3212,30 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
              angular.forEach(form, function (item, key) {
                  if(item !=null) {
-                     console.log("++++" + key + item.$name)
+                     if(item.$name !=null) {
-
+                         var name = item.$name;
+                         merchantInfo.name = item.$modelValue;
+                         console.log("++++" + item.$name + "++++" + item.$modelValue);
+                     }
                  }
              });
+             // var str = angular.toJson(form, true);
+             // console.log("----------" + str);
 
-            // var str = angular.toJson(form, true);
+            $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then(function (resp) {
-            // console.log("----------" + str);
+                $scope.apply_sub_merchant_id = resp.data;
-
+                $scope.$close();
-            // $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', $scope.merchantInfo).then(function (resp) {
+                if (subMerchantInfo.sub_merchant_id != null) {
-            //     $scope.apply_sub_merchant_id = resp.data;
+                    commonDialog.alert({
-            //     $scope.$close();
+                        title: 'Success',
-            //     if (subMerchantInfo.sub_merchant_id != null) {
+                        content: 'Modify Rpay+ Sub Merchant ID successfully',
-            //         commonDialog.alert({
+                        type: 'success'
-            //             title: 'Success',
+                    });
-            //             content: 'Modify Rpay+ Sub Merchant ID successfully',
+                    $state.reload();
-            //             type: 'success'
+                }
-            //         });
+            }, function (resp) {
-            //         $state.reload();
+                $scope.errmsg = resp.data.message;
-            //     }
+            })
-            // }, function (resp) {
-            //     $scope.errmsg = resp.data.message;
-            // })
         }
     }]);
 

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

@@ -214,7 +214,7 @@
                                 <div class="col-sm-8">
                                     <select class="form-control" name="timezone"  ng-model="subMerchantInfo.timezone"
                                             id="timezone-input"
-                                            ng-options="structure.value as structure.label for structure in timezone">
+                                            ng-options="tz.key as tz.detail for tz in timezone">
                                         <option value="">Please Choose</option>
                                     </select>
                                 </div>