msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop_client_config

Browse Source
master
wangning 7 years ago
parent fe26434e11 9b1f6fa399
commit 4c5ffc129f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

24
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save