|
|
|
|
@ -370,8 +370,52 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
}
|
|
|
|
|
$scope.partner.company_phone_c = 61;
|
|
|
|
|
$scope.partner.contact_phone_c = 61;
|
|
|
|
|
$scope.partner.client_pay_type = [];
|
|
|
|
|
$scope.partner.client_pay_desc = [];
|
|
|
|
|
var resetClientPayDescByTpey = function (type) {
|
|
|
|
|
type = parseInt(type);
|
|
|
|
|
if (type == 1) {
|
|
|
|
|
while (parseInt($scope.partner.client_pay_desc[0]) < 6) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice(0, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (type == 2) {
|
|
|
|
|
while (parseInt($scope.partner.client_pay_desc[$scope.partner.client_pay_desc.length-1]) > 5) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice($scope.partner.client_pay_desc.length-1, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var compare = function (x, y) {
|
|
|
|
|
x = parseInt(x);
|
|
|
|
|
y = parseInt(y);
|
|
|
|
|
if (x < y) {
|
|
|
|
|
return -1;
|
|
|
|
|
} else if (x > y) {
|
|
|
|
|
return 1;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$scope.toggleClientPayType = function (type) {
|
|
|
|
|
var $idx = $scope.partner.client_pay_type.indexOf(type);
|
|
|
|
|
if ($idx >= 0) {
|
|
|
|
|
$scope.partner.client_pay_type.splice($idx, 1);
|
|
|
|
|
resetClientPayDescByTpey(type);
|
|
|
|
|
} else {
|
|
|
|
|
$scope.partner.client_pay_type.push(type);
|
|
|
|
|
$scope.partner.client_pay_type.sort(compare);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
$scope.toggleClientPayDesc = function (type) {
|
|
|
|
|
var $idx = $scope.partner.client_pay_desc.indexOf(type);
|
|
|
|
|
if ($idx >= 0) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice($idx, 1);
|
|
|
|
|
} else {
|
|
|
|
|
$scope.partner.client_pay_desc.push(type);
|
|
|
|
|
$scope.partner.client_pay_desc.sort(compare);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
$scope.pagination = {};
|
|
|
|
|
$scope.industries = industryMap.configs();
|
|
|
|
|
$scope.states = stateMap.configs();
|
|
|
|
|
@ -382,12 +426,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
$scope.bd_citys = angular.copy(bd_city_map);
|
|
|
|
|
$scope.params = {textType: 'all', org_name: 'ALL'};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$scope.onOfflineDescSelect = function (selectedItem) {
|
|
|
|
|
$scope.partner.offline_label = selectedItem.label;
|
|
|
|
|
$scope.partner.client_offline_desc = selectedItem.value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
function remove(arr, val) {
|
|
|
|
|
if (angular.isArray(arr)) {
|
|
|
|
|
for (var i = arr.length; i--;) {
|
|
|
|
|
@ -400,13 +438,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
return arr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$scope.loadOfflineDesc = function () {
|
|
|
|
|
$http.get('/static/data/client_offline_desc.json').then(function (resp) {
|
|
|
|
|
$scope.client_offline_select = resp.data;
|
|
|
|
|
})
|
|
|
|
|
};
|
|
|
|
|
$scope.loadOfflineDesc();
|
|
|
|
|
|
|
|
|
|
var industries = angular.copy($scope.industries);
|
|
|
|
|
$scope.industries = remove(industries, 331);
|
|
|
|
|
|
|
|
|
|
@ -538,7 +569,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
alert("Logo is necessary!");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.partner_type == 'photo') {
|
|
|
|
|
if ($scope.partner.client_pay_type.indexOf('2')>=0) {
|
|
|
|
|
if (!$scope.partner.company_photo) {
|
|
|
|
|
alert('Shop Photo1 is necessary');
|
|
|
|
|
return;
|
|
|
|
|
@ -557,20 +588,32 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
// if ($scope.partner.client_pay_type =='online' || $scope.partner.client_pay_type =='all') {
|
|
|
|
|
// if (!$scope.partner.online_website && !$scope.partner.online_public_account && !$scope.partner.online_mini_program && !$scope.partner.online_app) {
|
|
|
|
|
// alert('线上支付场景至少填写一种方式');
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if(!window.frames['merchant_detail'].merchant_location){
|
|
|
|
|
// alert("Please Locate Merchant's Location");
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
if ($scope.params.client_pay_type == '') {
|
|
|
|
|
|
|
|
|
|
if ($scope.partner.client_pay_type.length==0) {
|
|
|
|
|
alert('请选择商户支付场景')
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($scope.partner.client_pay_desc.length==0) {
|
|
|
|
|
alert('请选择商户支付方式')
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_type.indexOf('1') >= 0 && $scope.partner.client_pay_type.indexOf('2') >= 0) {
|
|
|
|
|
var fristDesc = $scope.partner.client_pay_desc[0];
|
|
|
|
|
var lastDesc = $scope.partner.client_pay_desc[($scope.partner.client_pay_desc.length - 1)];
|
|
|
|
|
if (parseInt(fristDesc) > 5 || parseInt(lastDesc) < 6) {
|
|
|
|
|
alert("请检查线上/线下支付场景是否已选择支付方式")
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_desc.indexOf('8') >= 0) {
|
|
|
|
|
var lastDesc = $scope.partner.client_pay_desc[($scope.partner.client_pay_desc.length - 1)];
|
|
|
|
|
if (parseInt(lastDesc) < 10) {
|
|
|
|
|
alert("请检查线下支付是否已选择收银系统类型")
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',');
|
|
|
|
|
$scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',');
|
|
|
|
|
$http.post('/sys/partners', $scope.partner).then(function (resp) {
|
|
|
|
|
commonDialog.alert({title: 'Success', content: 'Register new partner successfully', type: 'success'});
|
|
|
|
|
$scope.updateMerchantLocation();
|
|
|
|
|
@ -1130,18 +1173,48 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
$scope.timezones = timezone.configs();
|
|
|
|
|
$scope.partner = partner.data;
|
|
|
|
|
var origin_referrer_id = angular.copy($scope.partner.referrer_id);
|
|
|
|
|
$scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo';
|
|
|
|
|
|
|
|
|
|
$scope.loadOfflineDesc = function () {
|
|
|
|
|
$http.get('/static/data/client_offline_desc.json').then(function (resp) {
|
|
|
|
|
$scope.client_offline_select = resp.data;
|
|
|
|
|
})
|
|
|
|
|
var resetClientPayDescByTpey = function (type) {
|
|
|
|
|
type = parseInt(type);
|
|
|
|
|
if (type == 1) {
|
|
|
|
|
while (parseInt($scope.partner.client_pay_desc[0]) < 6) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice(0, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (type == 2) {
|
|
|
|
|
while (parseInt($scope.partner.client_pay_desc[$scope.partner.client_pay_desc.length-1]) > 5) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice($scope.partner.client_pay_desc.length-1, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
$scope.loadOfflineDesc();
|
|
|
|
|
|
|
|
|
|
$scope.onOfflineDescSelect = function (selectedItem) {
|
|
|
|
|
$scope.partner.offline_label = selectedItem.label;
|
|
|
|
|
$scope.partner.client_offline_desc = selectedItem.value;
|
|
|
|
|
var compare = function (x, y) {
|
|
|
|
|
x = parseInt(x);
|
|
|
|
|
y = parseInt(y);
|
|
|
|
|
if (x < y) {
|
|
|
|
|
return -1;
|
|
|
|
|
} else if (x > y) {
|
|
|
|
|
return 1;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$scope.toggleClientPayType = function (type) {
|
|
|
|
|
var $idx = $scope.partner.client_pay_type.indexOf(type);
|
|
|
|
|
if ($idx >= 0) {
|
|
|
|
|
$scope.partner.client_pay_type.splice($idx, 1);
|
|
|
|
|
resetClientPayDescByTpey(type);
|
|
|
|
|
} else {
|
|
|
|
|
$scope.partner.client_pay_type.push(type);
|
|
|
|
|
$scope.partner.client_pay_type.sort(compare);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
$scope.toggleClientPayDesc = function (type) {
|
|
|
|
|
var $idx = $scope.partner.client_pay_desc.indexOf(type);
|
|
|
|
|
if ($idx >= 0) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice($idx, 1);
|
|
|
|
|
} else {
|
|
|
|
|
$scope.partner.client_pay_desc.push(type);
|
|
|
|
|
$scope.partner.client_pay_desc.sort(compare);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
$scope.listReferrers = function () {
|
|
|
|
|
@ -1239,7 +1312,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
alert('suburb can not contain two and more continuous space characters');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.partner_type == 'photo') {
|
|
|
|
|
if ($scope.partner.client_pay_type.indexOf('2') >= 0) {
|
|
|
|
|
if (!$scope.partner.company_photo) {
|
|
|
|
|
alert('Shop Photo1 is necessary');
|
|
|
|
|
return;
|
|
|
|
|
@ -1277,9 +1350,31 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
// alert("Please Locate Merchant Location!");
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
if ($scope.params.client_pay_type == '') {
|
|
|
|
|
if ($scope.partner.client_pay_type.length == 0) {
|
|
|
|
|
alert('请选择商户支付场景')
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_desc.length == 0) {
|
|
|
|
|
alert('请选择商户支付方式')
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_type.indexOf('1') >= 0 && $scope.partner.client_pay_type.indexOf('2') >= 0) {
|
|
|
|
|
var fristDesc = $scope.partner.client_pay_desc[0];
|
|
|
|
|
var lastDesc = $scope.partner.client_pay_desc[($scope.partner.client_pay_desc.length - 1)];
|
|
|
|
|
if (parseInt(fristDesc) > 5 || parseInt(lastDesc) < 6) {
|
|
|
|
|
alert("请检查线上/线下支付场景是否已选择支付方式")
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_desc.indexOf('8') >= 0) {
|
|
|
|
|
var lastDesc = $scope.partner.client_pay_desc[($scope.partner.client_pay_desc.length - 1)];
|
|
|
|
|
if (parseInt(lastDesc) < 10) {
|
|
|
|
|
alert("请检查线下支付是否已选择收银系统类型")
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',');
|
|
|
|
|
$scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',');
|
|
|
|
|
$http.put('/sys/partners/' + $scope.partner.client_moniker, $scope.partner).then(function () {
|
|
|
|
|
if (content != '') {
|
|
|
|
|
commonDialog.alert({
|
|
|
|
|
@ -2624,6 +2719,52 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
}
|
|
|
|
|
$scope.partner.company_phone_c = 61;
|
|
|
|
|
$scope.partner.contact_phone_c = 61;
|
|
|
|
|
$scope.partner.client_pay_type = [];
|
|
|
|
|
$scope.partner.client_pay_desc = [];
|
|
|
|
|
var resetClientPayDescByTpey = function (type) {
|
|
|
|
|
type = parseInt(type);
|
|
|
|
|
if (type == 1) {
|
|
|
|
|
while (parseInt($scope.partner.client_pay_desc[0]) < 6) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice(0, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (type == 2) {
|
|
|
|
|
while (parseInt($scope.partner.client_pay_desc[$scope.partner.client_pay_desc.length-1]) > 5) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice($scope.partner.client_pay_desc.length-1, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var compare = function (x, y) {
|
|
|
|
|
x = parseInt(x);
|
|
|
|
|
y = parseInt(y);
|
|
|
|
|
if (x < y) {
|
|
|
|
|
return -1;
|
|
|
|
|
} else if (x > y) {
|
|
|
|
|
return 1;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$scope.toggleClientPayType = function (type) {
|
|
|
|
|
var $idx = $scope.partner.client_pay_type.indexOf(type);
|
|
|
|
|
if ($idx >= 0) {
|
|
|
|
|
$scope.partner.client_pay_type.splice($idx, 1);
|
|
|
|
|
resetClientPayDescByTpey(type);
|
|
|
|
|
} else {
|
|
|
|
|
$scope.partner.client_pay_type.push(type);
|
|
|
|
|
$scope.partner.client_pay_type.sort(compare);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
$scope.toggleClientPayDesc = function (type) {
|
|
|
|
|
var $idx = $scope.partner.client_pay_desc.indexOf(type);
|
|
|
|
|
if ($idx >= 0) {
|
|
|
|
|
$scope.partner.client_pay_desc.splice($idx, 1);
|
|
|
|
|
} else {
|
|
|
|
|
$scope.partner.client_pay_desc.push(type);
|
|
|
|
|
$scope.partner.client_pay_desc.sort(compare);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
$scope.business_structures = businessStructuresMap.configs();
|
|
|
|
|
$scope.industries = industryMap.configs();
|
|
|
|
|
|
|
|
|
|
@ -2762,7 +2903,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
alert("Logo is necessary!");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.partner_type == 'photo') {
|
|
|
|
|
if ($scope.partner.client_pay_type.indexOf('2')>=0) {
|
|
|
|
|
if (!$scope.partner.company_photo) {
|
|
|
|
|
alert('Shop Photo1 is necessary');
|
|
|
|
|
return;
|
|
|
|
|
@ -2776,9 +2917,31 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
|
|
|
|
|
// alert("Please Locate Merchant Location!");
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
if ($scope.partner.client_pay_type == '') {
|
|
|
|
|
if ($scope.partner.client_pay_type.length==0) {
|
|
|
|
|
alert('请选择商户支付场景')
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_desc.length==0) {
|
|
|
|
|
alert('请选择商户支付方式')
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_type.indexOf('1') >= 0 && $scope.partner.client_pay_type.indexOf('2') >= 0) {
|
|
|
|
|
var fristDesc = $scope.partner.client_pay_desc[0];
|
|
|
|
|
var lastDesc = $scope.partner.client_pay_desc[($scope.partner.client_pay_desc.length - 1)];
|
|
|
|
|
if (parseInt(fristDesc) > 5 || parseInt(lastDesc) < 6) {
|
|
|
|
|
alert("请检查线上/线下支付场景是否已选择支付方式")
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ($scope.partner.client_pay_desc.indexOf('8') >= 0) {
|
|
|
|
|
var lastDesc = $scope.partner.client_pay_desc[($scope.partner.client_pay_desc.length - 1)];
|
|
|
|
|
if (parseInt(lastDesc) < 10) {
|
|
|
|
|
alert("请检查线下支付是否已选择收银系统类型")
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',');
|
|
|
|
|
$scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',');
|
|
|
|
|
$http.post('/sys/partners/' + clientMoniker + '/sub_clients', $scope.partner).then(function () {
|
|
|
|
|
$scope.updateMerchantLocation();
|
|
|
|
|
$scope.$close();
|
|
|
|
|
|