Merge branch 'develop' into develop_client_config

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

@@ -404,10 +404,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 })
             }
-            if(!window.frames['merchant_detail'].merchant_location){
-                alert("Please Locate Merchant's Location");
-                return;
-            }
+            // if(!window.frames['merchant_detail'].merchant_location){
+            //     alert("Please Locate Merchant's Location");
+            //     return;
+            // }
             $http.post('/sys/partners', $scope.partner).then(function (resp) {
                 commonDialog.alert({title: 'Success', content: 'Register new partner successfully', type: 'success'});
                 $scope.updateMerchantLocation();
@@ -960,10 +960,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 if (!origin_referrer_id && $scope.partner.referrer_id) {
                     content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!';
                 }
-                if(!window.frames['merchant_detail'].merchant_location){
-                    alert("Please Locate Merchant Location!");
-                    return;
-                }
+                // if(!window.frames['merchant_detail'].merchant_location){
+                //     alert("Please Locate Merchant Location!");
+                //     return;
+                // }
                 $http.put('/sys/partners/' + $scope.partner.client_moniker, $scope.partner).then(function () {
                     if (content != '') {
                         commonDialog.alert({
@@ -1841,10 +1841,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         return;
                     }
                 }
-                if(!window.frames['merchant_detail'].merchant_location){
-                    alert("Please Locate Merchant Location!");
-                    return;
-                }
+                // if(!window.frames['merchant_detail'].merchant_location){
+                //     alert("Please Locate Merchant Location!");
+                //     return;
+                // }
                 $http.post('/sys/partners/' + clientMoniker + '/sub_clients', $scope.partner).then(function () {
                     $scope.updateMerchantLocation();
                     $scope.$close();