-
-
+
+
+
@@ -40,38 +43,39 @@
-
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index b3ad7aded..16a873dd7 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -2,427 +2,532 @@
* Created by yixian on 2017-02-08.
*/
define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
- 'use strict';
- var app = angular.module('bdprize', ['ui.router']);
- app.config(['$stateProvider', function ($stateProvider) {
- $stateProvider.state('analysis_bd.bd_prizes', {
- url: '/bd_prizes',
- templateUrl: '/static/config/bdprize/templates/bd_prize_root.html',
- controller: 'bdPrizeRootCtrl'
- }).state('analysis_bd.bd_prizes.month_report', {
- url: '/{month}',
- templateUrl: '/static/config/bdprize/templates/bd_prize_month_report.html',
- controller: 'bdPrizeMonthReportCtrl',
- resolve: {
- report: ['$http', '$stateParams', function ($http, $stateParams) {
- return $http.get('/sys/bd_prize/records/' + $stateParams.month);
- }]
- }
- }).state('analysis_bd.bd_prizes.month_report.detail', {
- url: '/bd_user/{bdId}',
- templateUrl: '/static/config/bdprize/templates/bd_prize_detail.html',
- controller: 'bdPrizeDetailCtrl',
- resolve: {
- detail: ['$http', '$stateParams', function ($http, $stateParams) {
- return $http.get('/sys/bd_prize/records/' + $stateParams.month + '/bd_users/' + $stateParams.bdId);
- }]
- }
- }).state('analysis_bd.bd_prizes.bd_detail', {
- url: '/{month}/my_report',
- templateUrl: '/static/config/bdprize/templates/bd_prize_detail.html',
- controller: 'bdPrizeDetailCtrl',
- resolve: {
- detail: ['$http', '$stateParams', function ($http, $stateParams) {
- return $http.get('/sys/bd_prize/records/' + $stateParams.month + '/bd_user_detail')
- }]
- }
+ 'use strict'
+ var app = angular.module('bdprize', ['ui.router'])
+ app.config([
+ '$stateProvider',
+ function ($stateProvider) {
+ $stateProvider
+ .state('analysis_bd.bd_prizes', {
+ url: '/bd_prizes',
+ templateUrl: '/static/config/bdprize/templates/bd_prize_root.html',
+ controller: 'bdPrizeRootCtrl',
+ })
+ .state('analysis_bd.bd_prizes.month_report', {
+ url: '/{month}',
+ templateUrl: '/static/config/bdprize/templates/bd_prize_month_report.html',
+ controller: 'bdPrizeMonthReportCtrl',
+ resolve: {
+ report: [
+ '$http',
+ '$stateParams',
+ function ($http, $stateParams) {
+ return $http.get('/sys/bd_prize/records/' + $stateParams.month)
+ },
+ ],
+ },
+ })
+ .state('analysis_bd.bd_prizes.month_report.detail', {
+ url: '/bd_user/{bdId}',
+ templateUrl: '/static/config/bdprize/templates/bd_prize_detail.html',
+ controller: 'bdPrizeDetailCtrl',
+ resolve: {
+ detail: [
+ '$http',
+ '$stateParams',
+ function ($http, $stateParams) {
+ return $http.get('/sys/bd_prize/records/' + $stateParams.month + '/bd_users/' + $stateParams.bdId)
+ },
+ ],
+ },
})
- }]);
+ .state('analysis_bd.bd_prizes.bd_detail', {
+ url: '/{month}/my_report',
+ templateUrl: '/static/config/bdprize/templates/bd_prize_detail.html',
+ controller: 'bdPrizeDetailCtrl',
+ resolve: {
+ detail: [
+ '$http',
+ '$stateParams',
+ function ($http, $stateParams) {
+ return $http.get('/sys/bd_prize/records/' + $stateParams.month + '/bd_user_detail')
+ },
+ ],
+ },
+ })
+ },
+ ])
- app.controller('bdPrizeRootCtrl', ['$scope', '$http', '$uibModal', 'commonDialog','$filter', function ($scope, $http, $uibModal, commonDialog,$filter) {
- $scope.params = {year: new Date().getFullYear()};
- $scope.generate = {};
- $scope.availableYears = [new Date().getFullYear() - 1, new Date().getFullYear()];
- $scope.kpiRanges = [{value: 1, label: '0-50%'}, {value: 2, label: '50%~80%'}, {value: 3, label: '80%~100%'},
- {value: 4, label: '100%-120%'}, {value: 5, label: '>=120%'}];
- $scope.initMonth = function (year) {
- $scope.params.year = year;
- $scope.months = [];
- for (var i = 1; i < 13; i++) {
- var mon = '00' + i;
- mon = mon.substr(mon.length - 2, 2);
- $scope.months.push(year + '-' + mon);
- }
- };
- $scope.hasReport = function (mon) {
- if ($scope.reportMonths != null) {
- var have = false;
- angular.forEach($scope.reportMonths, function (month) {
- if (mon == month.month) {
- have = true;
- }
- });
- return have;
- } else {
- return false;
- }
- };
- $scope.getYearReports = function (year) {
- $scope.initMonth(year);
- $http.get('/sys/bd_prize/records', {params: {year: year}}).then(function (resp) {
- $scope.reportMonths = resp.data.data;
- })
- };
- $scope.getYearReports(new Date().getFullYear());
- $scope.generateReport = function () {
- if (!$scope.generate.month) {
- commonDialog.alert({
- type: 'error', title: 'Error', content: 'Select a month first!'
- });
- return;
+ app.controller('bdPrizeRootCtrl', [
+ '$scope',
+ '$http',
+ '$uibModal',
+ 'commonDialog',
+ '$filter',
+ function ($scope, $http, $uibModal, commonDialog, $filter) {
+ $scope.params = { year: new Date() }
+ $scope.generate = {}
+ $scope.kpiRanges = [
+ { value: 1, label: '0-50%' },
+ { value: 2, label: '50%~80%' },
+ { value: 3, label: '80%~100%' },
+ { value: 4, label: '100%-120%' },
+ { value: 5, label: '>=120%' },
+ ]
+ $scope.initMonth = function () {
+ const year = $scope.params.year.getFullYear()
+ $scope.months = []
+ for (var i = 1; i < 13; i++) {
+ var mon = '00' + i
+ mon = mon.substr(mon.length - 2, 2)
+ $scope.months.push(year + '-' + mon)
+ }
+ }
+ $scope.hasReport = function (mon) {
+ if ($scope.reportMonths != null) {
+ var have = false
+ angular.forEach($scope.reportMonths, function (month) {
+ if (mon == month.month) {
+ have = true
}
- commonDialog.confirm({
- title: 'Warning',
- content: 'This operation will clear the result of last month generated before. Are you sure?'
- }).then(function () {
- $scope.generate.status = {};
- var params = {month: $filter('date')($scope.generate.month, 'yyyy-MM')};
- $http.post('/sys/bd_prize/generate_record/'+params.month, null, {timeout: 60000}).then(function (resp) {
- $scope.generate.status = null;
- commonDialog.alert({title: 'Success', content: 'Generate Finished', type: 'success'});
- $scope.getYearReports($scope.params.year);
- }, function (resp) {
- commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
- $scope.generate.status = null;
- })
- })
- };
- $scope.loadRateConfigs = function () {
- $http.get('/sys/bd_prize/config/rates').then(function (resp) {
- $scope.bd_rate_configs = resp.data;
- $scope.kpi_ranges = [];
- var kpiStart = [];
- angular.forEach($scope.bd_rate_configs, function (cfg) {
- if (kpiStart.indexOf(cfg.kpi_range) < 0) {
- kpiStart.push(cfg.kpi_range);
- $scope.kpi_ranges.push(cfg);
- }
- })
- })
- };
- $scope.loadRateConfigs();
- $scope.editRateConfig = function () {
- $uibModal.open({
- backdrop: 'static', keyboard: false,
- templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html',
- controller: 'bdRateConfigCtrl',
- resolve: {
- rates: function () {
- return angular.copy($scope.bd_rate_configs);
- }
- }
- }).result.then(function () {
- $scope.loadRateConfigs();
- })
- };
- $scope.editBDLevels = function () {
- $uibModal.open({
- backdrop: 'static', keyboard: false,
- templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html',
- size: 'lg',
- controller: 'bdLevelConfigCtrl'
- })
- };
- $scope.editCommissionConfig = function (monModal) {
- $uibModal.open({
- backdrop: 'static', keyboard: false,
- templateUrl: '/static/config/bdprize/templates/bd_commission_config_dialog.html',
- controller: 'bdCommissionConfigCtrl',
- size: 'lg',
- resolve: {
- monModal: function () {
- return angular.copy(monModal);
- }
- }
- })
- };
- $scope.exportCommission = function (monModal) {
- location.href = '/sys/bd_prize/commission/export/' + monModal;
- };
-
- $scope.loadPersonalCommission = function () {
- if (($scope.currentUser.role & parseInt('100', 2)) > 0 && $scope.currentUser.org_id === 1) {
- $http.get('/sys/bd_prize/commission/personal/bd_user').then(function (resp) {
- $scope.personalCommission = resp.data;
- })
+ })
+ return have
+ } else {
+ return false
+ }
+ }
+ $scope.getYearReports = function () {
+ const year = $scope.params.year.getFullYear()
+ $scope.initMonth()
+ $http.get('/sys/bd_prize/records', { params: { year: year } }).then(function (resp) {
+ $scope.reportMonths = resp.data.data
+ })
+ }
+ $scope.getYearReports()
+ $scope.generateReport = function () {
+ if (!$scope.generate.month) {
+ commonDialog.alert({
+ type: 'error',
+ title: 'Error',
+ content: 'Select a month first!',
+ })
+ return
+ }
+ commonDialog
+ .confirm({
+ title: 'Warning',
+ content: 'This operation will clear the result of last month generated before. Are you sure?',
+ })
+ .then(function () {
+ $scope.generate.status = {}
+ var params = { month: $filter('date')($scope.generate.month, 'yyyy-MM') }
+ $http.post('/sys/bd_prize/generate_record/' + params.month, null, { timeout: 60000 }).then(
+ function (resp) {
+ $scope.generate.status = null
+ commonDialog.alert({ title: 'Success', content: 'Generate Finished', type: 'success' })
+ $scope.getYearReports()
+ },
+ function (resp) {
+ commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+ $scope.generate.status = null
+ }
+ )
+ })
+ }
+ $scope.loadRateConfigs = function () {
+ $http.get('/sys/bd_prize/config/rates').then(function (resp) {
+ $scope.bd_rate_configs = resp.data
+ $scope.kpi_ranges = []
+ var kpiStart = []
+ angular.forEach($scope.bd_rate_configs, function (cfg) {
+ if (kpiStart.indexOf(cfg.kpi_range) < 0) {
+ kpiStart.push(cfg.kpi_range)
+ $scope.kpi_ranges.push(cfg)
}
+ })
+ })
+ }
+ $scope.loadRateConfigs()
+ $scope.editRateConfig = function () {
+ $uibModal
+ .open({
+ backdrop: 'static',
+ keyboard: false,
+ templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html',
+ controller: 'bdRateConfigCtrl',
+ resolve: {
+ rates: function () {
+ return angular.copy($scope.bd_rate_configs)
+ },
+ },
+ })
+ .result.then(function () {
+ $scope.loadRateConfigs()
+ })
+ }
+ $scope.editBDLevels = function () {
+ $uibModal.open({
+ backdrop: 'static',
+ keyboard: false,
+ templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html',
+ size: 'lg',
+ controller: 'bdLevelConfigCtrl',
+ })
+ }
+ $scope.editCommissionConfig = function (monModal) {
+ $uibModal.open({
+ backdrop: 'static',
+ keyboard: false,
+ templateUrl: '/static/config/bdprize/templates/bd_commission_config_dialog.html',
+ controller: 'bdCommissionConfigCtrl',
+ size: 'lg',
+ resolve: {
+ monModal: function () {
+ return angular.copy(monModal)
+ },
+ },
+ })
+ }
+ $scope.exportCommission = function (monModal) {
+ location.href = '/sys/bd_prize/commission/export/' + monModal
+ }
- };
- $scope.loadPersonalCommission();
- }]);
- app.controller('bdRateConfigCtrl', ['$scope', '$http', 'rates', function ($scope, $http, rates) {
- $scope.bdLevels = [{value: 1, label: 'Junior'}, {value: 2, label: 'Intermediate'}, {value: 3, label: 'Senior'}];
- $scope.months = [{value: 1, label: '1-3 Months'}, {value: 2, label: '4-6 Months'}, {
- value: 3,
- label: '>=7 Months'
- }];
- $scope.kpiRanges = [{value: 1, label: '0-50%'}, {value: 2, label: '50%~80%'}, {value: 3, label: '80%~100%'},
- {value: 4, label: '100%-120%'}, {value: 5, label: '>=120%'}];
- $scope.clientRate = [{value: 0.6, label: '0.6-0.79'}, {value: 0.8, label: '0.8-2.0'}];
- $scope.filter = {bd_level: 1,rate_from:0.6};
- $scope.rates = rates;
- $scope.submitRates = function () {
- var validation = null;
- $scope.errmsg = null;
- angular.forEach($scope.rates, function (rate) {
- if (isNaN(rate.prize_rate)) {
- validation = {months: rate.time_range, bd_level: rate.bd_level};
- $scope.errmsg = 'Rate Value is NaN';
- }
- if (rate.prize_rate > 1) {
- validation = {months: rate.time_range, bd_level: rate.bd_level};
- $scope.errmsg = 'Rate value shall no more than 1%';
- }
- if (rate.prize_rate < 0) {
- validation = {months: rate.time_range, bd_level: rate.bd_level};
- $scope.errmsg = 'Rate value shall be a positive value';
- }
- });
- if (!validation) {
- $http.put('/sys/bd_prize/config/rates', $scope.rates).then(function () {
- $scope.$close();
- }, function (resp) {
- $scope.errmsg = resp.data.message;
- })
- }
+ $scope.loadPersonalCommission = function () {
+ if (($scope.currentUser.role & parseInt('100', 2)) > 0 && $scope.currentUser.org_id === 1) {
+ $http.get('/sys/bd_prize/commission/personal/bd_user').then(function (resp) {
+ $scope.personalCommission = resp.data
+ })
}
- }]);
- app.controller('bdLevelConfigCtrl', ['$scope', '$http', function ($scope, $http) {
- $scope.bdtypes = [{id: 1, label: 'BD Manager(Sydney)'}, {id: 2, label: 'KA Manager(Sydney)'},{id: 6, label: 'BD Manager(Melbourne)'}, {id: 7, label: 'KA Manager(Melbourne)'}];
- $scope.getBDGroups = function () {
- $http.get('/sys/manager_accounts/roles/bd_leader').then(function (resp) {
- $scope.bdgroups = resp.data;
- $scope.getBDLevels();
- })
- };
- $scope.getBDGroups();
- $scope.getBDLevels = function () {
- $http.get('/sys/bd_prize/config/bd_levels').then(function (resp) {
- $scope.bds = resp.data;
- })
- };
-
- $scope.bdLevels = [{value: 1, label: 'Junior'}, {value: 2, label: 'Intermediate'}, {value: 3, label: 'Senior'}];
- $scope.updateBDLevel = function (bdInfo) {
- $http.put('/sys/bd_prize/config/bd_levels/' + bdInfo.manager_id, bdInfo).then(function () {
- $scope.getBDGroups();
- }, function (resp) {
- $scope.errmsg = resp.data.message;
- })
- };
- }]);
- app.controller('bdCommissionConfigCtrl', ['$scope', '$state', '$http', '$filter', 'monModal', function ($scope, $state, $http, $filter, monModal) {
- $scope.monModal = monModal;
- $scope.params = {year: new Date().getFullYear()};
- $scope.bdtypes = [{id: 1, label: 'BD Manager(Sydney)'}, {id: 2, label: 'KA Manager(Sydney)'}, {id: 6, label: 'BD Manager(Melbourne)'}, {id: 7, label: 'KA Manager(Melbourne)'}];//, {id: 3, label: 'Sydney GM'},{id: 4, label: 'COO'},{id: 5, label: 'NJ Department'}];
- // $scope.bdmon;
- // $scope.newSwitch;
- $scope.initMonth = function (year) {
- $scope.params.year = year;
- $scope.months = [];
- for (var i = 1; i < 13; i++) {
- var mon = '00' + i;
- mon = mon.substr(mon.length - 2, 2);
- $scope.months.push(year + '-' + mon);
- }
- };
- $scope.initMonth(new Date().getFullYear());
- $scope.hasReport = function (mon) {
- var start = '2017-01';//todo change for different country
- var end = $filter('date')(new Date(), 'yyyy-MM');
- return start <= mon && end >= mon
- };
- $scope.getBDLevels = function () {
- $http.get('/sys/bd_prize/config/bd_levels').then(function (resp) {
- $scope.bds = resp.data;
- })
- };
- $scope.getBDLevels();
- $scope.chooseLastConfig = function (mon) {
- let year = new Date(mon).getFullYear();
- let month = new Date(mon).getMonth();
- if(month == 0){
- year--;
- month = year + '-12';
- }else if(month <= 9){
- month = year + '-0' + month;
- }else {
- month = year + '-' + month;
+ }
+ $scope.loadPersonalCommission()
+ },
+ ])
+ app.controller('bdRateConfigCtrl', [
+ '$scope',
+ '$http',
+ 'rates',
+ function ($scope, $http, rates) {
+ $scope.bdLevels = [
+ { value: 1, label: 'Junior' },
+ { value: 2, label: 'Intermediate' },
+ { value: 3, label: 'Senior' },
+ ]
+ $scope.months = [
+ { value: 1, label: '1-3 Months' },
+ { value: 2, label: '4-6 Months' },
+ {
+ value: 3,
+ label: '>=7 Months',
+ },
+ ]
+ $scope.kpiRanges = [
+ { value: 1, label: '0-50%' },
+ { value: 2, label: '50%~80%' },
+ { value: 3, label: '80%~100%' },
+ { value: 4, label: '100%-120%' },
+ { value: 5, label: '>=120%' },
+ ]
+ $scope.clientRate = [
+ { value: 0.6, label: '0.6-0.79' },
+ { value: 0.8, label: '0.8-2.0' },
+ ]
+ $scope.filter = { bd_level: 1, rate_from: 0.6 }
+ $scope.rates = rates
+ $scope.submitRates = function () {
+ var validation = null
+ $scope.errmsg = null
+ angular.forEach($scope.rates, function (rate) {
+ if (isNaN(rate.prize_rate)) {
+ validation = { months: rate.time_range, bd_level: rate.bd_level }
+ $scope.errmsg = 'Rate Value is NaN'
+ }
+ if (rate.prize_rate > 1) {
+ validation = { months: rate.time_range, bd_level: rate.bd_level }
+ $scope.errmsg = 'Rate value shall no more than 1%'
+ }
+ if (rate.prize_rate < 0) {
+ validation = { months: rate.time_range, bd_level: rate.bd_level }
+ $scope.errmsg = 'Rate value shall be a positive value'
+ }
+ })
+ if (!validation) {
+ $http.put('/sys/bd_prize/config/rates', $scope.rates).then(
+ function () {
+ $scope.$close()
+ },
+ function (resp) {
+ $scope.errmsg = resp.data.message
}
- $http.get('/sys/bd_prize/commission/le_ma/' + month).then(function (resp) {
- $scope.bdlm = [];
- angular.forEach(resp.data,function (e) {
- var bdC = {};
- bdC.commission_start_amount = e.commission_start_amount;
- bdC.commission_end_amount = e.commission_end_amount;
- bdC.bd_commission_rate = e.bd_commission_rate;
- bdC.bd_type = e.bd_type;
- $scope.bdlm.push(bdC);
- });
- $scope.listConfig = true;
- })
- };
- $scope.listCurrentMonBDCommission = function (mon) {
- $http.get('/sys/bd_prize/commission/le_ma/' + mon).then(function (resp) {
- $scope.bdlm = resp.data;
- $scope.bdmon = mon;
- $scope.listConfig = true;
- })
- };
- $scope.listCurrentMonBDCommission($scope.monModal);
- $scope.deleteCommission = function (config) {
- $http.delete('sys/bd_prize/commission/delete/' + config)
- $scope.listCurrentMonBDCommission($scope.monModal);
- $state.reload();
+ )
}
- $scope.submitCommmissionConfig = function (mon, bdlm) {
- $scope.check = true;
- angular.forEach(bdlm, function (data, index) {
- $scope.errmsg = null;
- if (!data.bd_type) {
- $scope.errmsg = "BD Type not be null";
- $scope.check = false;
- return;
- }
- if (!data.bd_commission_rate) {
- $scope.errmsg = "BD Rate not be null";
- $scope.check = false;
- return;
- }
- if (data.bd_commission_rate) {
- if (data.bd_commission_rate > 10) {
- $scope.errmsg = "BD Rate is too big";
- $scope.check = false;
- return;
- }
- }
- if (!data.commission_start_amount && data.commission_start_amount != 0) {
- $scope.errmsg = "Commission Amount not be null";
- $scope.check = false;
- return;
- }
- if (data.commission_end_amount || data.commission_end_amount == 0) {
- if (data.commission_start_amount >= data.commission_end_amount) {
- $scope.errmsg = "Commission Start Amount should less than End Amount";
- $scope.check = false;
- return;
- }
- }
- });
- if ($scope.check) {
- $http.post('/sys/bd_prize/commission/le_ma/update/' + mon, bdlm).then(function (resp) {
- $scope.$close();
- // $scope.bdlm = null;
- // $scope.bdmon;
- // $scope.listConfig = false;
- // $scope.listCurrentMonBDCommission(mon);
- })
- }
+ }
+ },
+ ])
+ app.controller('bdLevelConfigCtrl', [
+ '$scope',
+ '$http',
+ function ($scope, $http) {
+ $scope.bdtypes = [
+ { id: 1, label: 'BD Manager(Sydney)' },
+ { id: 2, label: 'KA Manager(Sydney)' },
+ { id: 6, label: 'BD Manager(Melbourne)' },
+ { id: 7, label: 'KA Manager(Melbourne)' },
+ ]
+ $scope.getBDGroups = function () {
+ $http.get('/sys/manager_accounts/roles/bd_leader').then(function (resp) {
+ $scope.bdgroups = resp.data
+ $scope.getBDLevels()
+ })
+ }
+ $scope.getBDGroups()
+ $scope.getBDLevels = function () {
+ $http.get('/sys/bd_prize/config/bd_levels').then(function (resp) {
+ $scope.bds = resp.data
+ })
+ }
+
+ $scope.bdLevels = [
+ { value: 1, label: 'Junior' },
+ { value: 2, label: 'Intermediate' },
+ { value: 3, label: 'Senior' },
+ ]
+ $scope.updateBDLevel = function (bdInfo) {
+ $http.put('/sys/bd_prize/config/bd_levels/' + bdInfo.manager_id, bdInfo).then(
+ function () {
+ $scope.getBDGroups()
+ },
+ function (resp) {
+ $scope.errmsg = resp.data.message
+ }
+ )
+ }
+ },
+ ])
+ app.controller('bdCommissionConfigCtrl', [
+ '$scope',
+ '$state',
+ '$http',
+ '$filter',
+ 'monModal',
+ function ($scope, $state, $http, $filter, monModal) {
+ $scope.monModal = monModal
+ $scope.params = { year: new Date().getFullYear() }
+ $scope.bdtypes = [
+ { id: 1, label: 'BD Manager(Sydney)' },
+ { id: 2, label: 'KA Manager(Sydney)' },
+ { id: 6, label: 'BD Manager(Melbourne)' },
+ { id: 7, label: 'KA Manager(Melbourne)' },
+ ] //, {id: 3, label: 'Sydney GM'},{id: 4, label: 'COO'},{id: 5, label: 'NJ Department'}];
+ // $scope.bdmon;
+ // $scope.newSwitch;
+ $scope.initMonth = function (year) {
+ $scope.params.year = year
+ $scope.months = []
+ for (var i = 1; i < 13; i++) {
+ var mon = '00' + i
+ mon = mon.substr(mon.length - 2, 2)
+ $scope.months.push(year + '-' + mon)
}
- $scope.submitBdCommmissionConfig = function (mon, bds) {
- $scope.check = true;
- $scope.errmsg = null;
- angular.forEach(bds, function (data, index) {
- if(data.get_prize){
- if (!data.kpi_amount) {
- $scope.errmsg = "BD kpi Amount not be null";
- $scope.check = false;
- return;
- }
- }
- });
- if ($scope.check) {
- $http.post('/sys/bd_prize/commission/kpi/update/' + mon, bds).then(function (resp) {
- $scope.$close();
- })
- }
+ }
+ $scope.initMonth(new Date().getFullYear())
+ $scope.hasReport = function (mon) {
+ var start = '2017-01' //todo change for different country
+ var end = $filter('date')(new Date(), 'yyyy-MM')
+ return start <= mon && end >= mon
+ }
+ $scope.getBDLevels = function () {
+ $http.get('/sys/bd_prize/config/bd_levels').then(function (resp) {
+ $scope.bds = resp.data
+ })
+ }
+ $scope.getBDLevels()
+ $scope.chooseLastConfig = function (mon) {
+ let year = new Date(mon).getFullYear()
+ let month = new Date(mon).getMonth()
+ if (month == 0) {
+ year--
+ month = year + '-12'
+ } else if (month <= 9) {
+ month = year + '-0' + month
+ } else {
+ month = year + '-' + month
}
- }]);
- app.controller('bdPrizeMonthReportCtrl', ['$scope', '$http', 'report', function ($scope, $http, report) {
- $scope.report = report.data;
- }]);
- app.controller('bdPrizeDetailCtrl', ['$scope', 'detail', function ($scope, detail) {
- $scope.detail = detail.data;
- }]);
- app.filter('financialBdLevel', function () {
- return function (level) {
- switch (level) {
- case 0:
- return 'Leader';
- case 1:
- return 'Junior';
- case 2:
- return 'Intermediate';
- case 3:
- return 'Senior';
- default:
- return 'Unknown';
+ $http.get('/sys/bd_prize/commission/le_ma/' + month).then(function (resp) {
+ $scope.bdlm = []
+ angular.forEach(resp.data, function (e) {
+ var bdC = {}
+ bdC.commission_start_amount = e.commission_start_amount
+ bdC.commission_end_amount = e.commission_end_amount
+ bdC.bd_commission_rate = e.bd_commission_rate
+ bdC.bd_type = e.bd_type
+ $scope.bdlm.push(bdC)
+ })
+ $scope.listConfig = true
+ })
+ }
+ $scope.listCurrentMonBDCommission = function (mon) {
+ $http.get('/sys/bd_prize/commission/le_ma/' + mon).then(function (resp) {
+ $scope.bdlm = resp.data
+ $scope.bdmon = mon
+ $scope.listConfig = true
+ })
+ }
+ $scope.listCurrentMonBDCommission($scope.monModal)
+ $scope.deleteCommission = function (config) {
+ $http.delete('sys/bd_prize/commission/delete/' + config)
+ $scope.listCurrentMonBDCommission($scope.monModal)
+ $state.reload()
+ }
+ $scope.submitCommmissionConfig = function (mon, bdlm) {
+ $scope.check = true
+ angular.forEach(bdlm, function (data, index) {
+ $scope.errmsg = null
+ if (!data.bd_type) {
+ $scope.errmsg = 'BD Type not be null'
+ $scope.check = false
+ return
+ }
+ if (!data.bd_commission_rate) {
+ $scope.errmsg = 'BD Rate not be null'
+ $scope.check = false
+ return
+ }
+ if (data.bd_commission_rate) {
+ if (data.bd_commission_rate > 10) {
+ $scope.errmsg = 'BD Rate is too big'
+ $scope.check = false
+ return
}
- }
- });
- app.filter('financialClientSource', function () {
- return function (source) {
- switch (source) {
- case 1:
- return 'BD';
- case 2:
- return 'Apply';
- case 3:
- return 'Distribute';
- default:
- return 'Unknown';
+ }
+ if (!data.commission_start_amount && data.commission_start_amount != 0) {
+ $scope.errmsg = 'Commission Amount not be null'
+ $scope.check = false
+ return
+ }
+ if (data.commission_end_amount || data.commission_end_amount == 0) {
+ if (data.commission_start_amount >= data.commission_end_amount) {
+ $scope.errmsg = 'Commission Start Amount should less than End Amount'
+ $scope.check = false
+ return
}
+ }
+ })
+ if ($scope.check) {
+ $http.post('/sys/bd_prize/commission/le_ma/update/' + mon, bdlm).then(function (resp) {
+ $scope.$close()
+ // $scope.bdlm = null;
+ // $scope.bdmon;
+ // $scope.listConfig = false;
+ // $scope.listCurrentMonBDCommission(mon);
+ })
}
- });
- app.filter('prizeLogsFilter', [function () {
- return function (arr, filterObj) {
- if (arr == null || filterObj == null) {
- return arr;
+ }
+ $scope.submitBdCommmissionConfig = function (mon, bds) {
+ $scope.check = true
+ $scope.errmsg = null
+ angular.forEach(bds, function (data, index) {
+ if (data.get_prize) {
+ if (!data.kpi_amount) {
+ $scope.errmsg = 'BD kpi Amount not be null'
+ $scope.check = false
+ return
}
- return arr.filter(function (item) {
- return item.prize_type == filterObj
- })
+ }
+ })
+ if ($scope.check) {
+ $http.post('/sys/bd_prize/commission/kpi/update/' + mon, bds).then(function (resp) {
+ $scope.$close()
+ })
}
- }]);
- app.filter('channel_image', function () {
- return function (channel) {
- switch (channel) {
- case 'Alipay':
- return '/static/images/alipay_sign_lg.png';
- case 'AlipayOnline':
- return '/static/images/alipay_online.png';
- case 'System':
- return '/static/images/royalpay_sign.png';
- case 'Bestpay':
- return '/static/images/bestpay_sign_lg.png';
- case 'Wechat':
- return '/static/images/wechatpay_sign_lg.png';
- case 'jd':
- return '/static/images/jd_sign_lg.png';
- case 'hf':
- return '/static/images/hf_sign_lg.png';
- case 'Rpay':
- return '/static/images/rpayplus_sign_lg.png';
- case 'Yeepay':
- return '/static/images/yeepay_sign_lg.png';
- case 'LakalaPay':
- return '/static/images/lakalapay_sign_lg.png';
- case 'rpaypmt_card':
- return '/static/images/card_payment_sign_lg.png';
- case 'rpaypmt_dd':
- return '/static/images/direct_debit_sign_lg.png';
- }
+ }
+ },
+ ])
+ app.controller('bdPrizeMonthReportCtrl', [
+ '$scope',
+ '$http',
+ 'report',
+ function ($scope, $http, report) {
+ $scope.report = report.data
+ },
+ ])
+ app.controller('bdPrizeDetailCtrl', [
+ '$scope',
+ 'detail',
+ function ($scope, detail) {
+ $scope.detail = detail.data
+ },
+ ])
+ app.filter('financialBdLevel', function () {
+ return function (level) {
+ switch (level) {
+ case 0:
+ return 'Leader'
+ case 1:
+ return 'Junior'
+ case 2:
+ return 'Intermediate'
+ case 3:
+ return 'Senior'
+ default:
+ return 'Unknown'
+ }
+ }
+ })
+ app.filter('financialClientSource', function () {
+ return function (source) {
+ switch (source) {
+ case 1:
+ return 'BD'
+ case 2:
+ return 'Apply'
+ case 3:
+ return 'Distribute'
+ default:
+ return 'Unknown'
+ }
+ }
+ })
+ app.filter('prizeLogsFilter', [
+ function () {
+ return function (arr, filterObj) {
+ if (arr == null || filterObj == null) {
+ return arr
}
- });
- return app;
-});
+ return arr.filter(function (item) {
+ return item.prize_type == filterObj
+ })
+ }
+ },
+ ])
+ app.filter('channel_image', function () {
+ return function (channel) {
+ switch (channel) {
+ case 'Alipay':
+ return '/static/images/alipay_sign_lg.png'
+ case 'AlipayOnline':
+ return '/static/images/alipay_online.png'
+ case 'System':
+ return '/static/images/royalpay_sign.png'
+ case 'Bestpay':
+ return '/static/images/bestpay_sign_lg.png'
+ case 'Wechat':
+ return '/static/images/wechatpay_sign_lg.png'
+ case 'jd':
+ return '/static/images/jd_sign_lg.png'
+ case 'hf':
+ return '/static/images/hf_sign_lg.png'
+ case 'Rpay':
+ return '/static/images/rpayplus_sign_lg.png'
+ case 'Yeepay':
+ return '/static/images/yeepay_sign_lg.png'
+ case 'LakalaPay':
+ return '/static/images/lakalapay_sign_lg.png'
+ case 'rpaypmt_card':
+ return '/static/images/card_payment_sign_lg.png'
+ case 'rpaypmt_dd':
+ return '/static/images/direct_debit_sign_lg.png'
+ }
+ }
+ })
+ return app
+})
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index dc4b7f769..f7dd99284 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -13,15 +13,17 @@
@@ -33,30 +35,29 @@
| 清算日期 | -净交易额(扣除退款) | -清算总额 | -清算给商户总额 | -RoyalPay手续费 | -
|---|---|---|---|---|
| 清算日期 | +净交易额(扣除退款) | +清算总额 | +清算给商户总额 | +RoyalPay手续费 | +
| - | - | - | - | - |
| + | + | + | + | + |
| Total | -- | - | - | - |
| Total | ++ | + | + | + |
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
-
+
+
-
+
-
+
@@ -73,43 +74,44 @@
-
@@ -121,32 +123,34 @@
-
@@ -155,11 +159,13 @@
按月度发放
每月发放总提成额度的60%，剩余40%按照“年度考评分数比例”于每年年底即12 月25 日圣诞前发放
提前离职者，40%提成不予发放
- 年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放40%的占比部分，扣下部分如果第二年考评超出一定评分110%可以补发；同样，如果年度考评分数超过100 分按照同比例发放
+ 年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放40%的占比部分，扣下部分如果第二年考评超出一定评分110%可以补发；同样，如果年度考评分数超过100 分按照同比例发放
+
商户开通后连续 1 个月未产生流水的，上交主管，由主管重新分配
连续 2 个月不产生流水的商户，由销管部统一收回，重新分配
分配后的商户流水客户专员只能占一半
- 离职及调岗人员商户统一上交销管中心，由销管中心 leader 及跨境事业部总监相互协商及相互监督，按照公平公正的原则， 做出分配方案，并由总监确认后统一分配。调岗人员移交的商户，在移交后 1 个月内移交人员和接收人员平分该商家产生的提成，移交人员需配合接收人员做好商户对接和短期内的商户维护；
+ 离职及调岗人员商户统一上交销管中心，由销管中心 leader 及跨境事业部总监相互协商及相互监督，按照公平公正的原则， 做出分配方案，并由总监确认后统一分配。调岗人员移交的商户，在移交后 1
+ 个月内移交人员和接收人员平分该商家产生的提成，移交人员需配合接收人员做好商户对接和短期内的商户维护；
离职人员交接的商户提成，接收人员享受一半的提成，另一半作为跨境客服专员福利会基金
被客户投诉情况严重者，此商户由销管中心无条件收回重新分配
活动执行未传达到位且出现舞弊、徇私、懒惰等行为的，商户上交由销管中心统一分配
diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js
index 3e096d113..8cfde8094 100644
--- a/src/main/ui/static/config/orgcommission/orgcommission.js
+++ b/src/main/ui/static/config/orgcommission/orgcommission.js
@@ -1,204 +1,253 @@
/**
* Created by yixian on 2017-03-08.
*/
-var commissionTypeMap = [{
- "label": 1,
- "value": "渠道计算法"
-},
- {
- "label": 2,
- "value": "总交易额比例"
- },
- {
- "label": 3,
- "value": "收益比例"
- }
-];
-define(['angular','../../analysis/org/analysis-org'], function (angular) {
- 'use strict';
- var app = angular.module('orgcommission', ['ui.router']);
- app.config(['$stateProvider', function ($stateProvider) {
- $stateProvider.state('analysis_org.commission', {
- url: '/org_commissions',
- templateUrl: '/static/config/orgcommission/templates/org_commission_root.html',
- controller: 'orgCommissionRootCtrl'
- }).state('analysis_org.commission.month', {
- url: '/commissionorg/months/{monthStr}',
- templateUrl: '/static/config/orgcommission/templates/org_commission_month_root.html',
- controller: 'commissionMonthRootCtrl'
- }).state('analysis_org.info', {
- url: '/commissionorg/info',
- templateUrl: '/static/config/orgcommission/templates/org_commission_info.html',
- controller: 'commissionMonthRootCtrl'
- }).state('analysis_org.commission.month.org', {
- url: '/org',
- templateUrl: '/static/config/orgcommission/templates/org_commission_month.html',
- controller: 'orgCommissionMonthViewCtrl',
- resolve: {
- monthData: ['$http', '$stateParams', function ($http, $stateParams) {
- return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr);
- }]
- }
- }).state('analysis_org.commission.month.referrer', {
- url: '/referrer',
- templateUrl: '/static/config/referrercommission/templates/referrer_commission_month.html',
- controller: 'referrerCommissionMonthViewCtrl',
- resolve: {
- monthData: ['$http', '$stateParams', function ($http, $stateParams) {
- return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr);
- }]
- }
- }).state('analysis_org.commission.month.org.orgdetail', {
- url: '/citypartners/{orgId}',
- templateUrl: '/static/config/orgcommission/templates/org_commission_detail.html',
- controller: 'orgCommissionOrgDetailCtrl',
- resolve: {
- detail: ['$http', '$stateParams', function ($http, $stateParams) {
- return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId);
- }]
- }
- }).state('analysis_org.commission.month.referrer.referrerdetail', {
- url: '/referrer_commissions/{orgId}',
- templateUrl: '/static/config/referrercommission/templates/referrer_commission_detail.html',
- controller: 'referrerCommissionOrgDetailCtrl',
- resolve: {
- detail: ['$http', '$stateParams', function ($http, $stateParams) {
- return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId);
- }]
- }
+var commissionTypeMap = [
+ {
+ label: 1,
+ value: '渠道计算法',
+ },
+ {
+ label: 2,
+ value: '总交易额比例',
+ },
+ {
+ label: 3,
+ value: '收益比例',
+ },
+]
+define(['angular', '../../analysis/org/analysis-org'], function (angular) {
+ 'use strict'
+ var app = angular.module('orgcommission', ['ui.router'])
+ app.config([
+ '$stateProvider',
+ function ($stateProvider) {
+ $stateProvider
+ .state('analysis_org.commission', {
+ url: '/org_commissions',
+ templateUrl: '/static/config/orgcommission/templates/org_commission_root.html',
+ controller: 'orgCommissionRootCtrl',
+ })
+ .state('analysis_org.commission.month', {
+ url: '/commissionorg/months/{monthStr}',
+ templateUrl: '/static/config/orgcommission/templates/org_commission_month_root.html',
+ controller: 'commissionMonthRootCtrl',
+ })
+ .state('analysis_org.info', {
+ url: '/commissionorg/info',
+ templateUrl: '/static/config/orgcommission/templates/org_commission_info.html',
+ controller: 'commissionMonthRootCtrl',
+ })
+ .state('analysis_org.commission.month.org', {
+ url: '/org',
+ templateUrl: '/static/config/orgcommission/templates/org_commission_month.html',
+ controller: 'orgCommissionMonthViewCtrl',
+ resolve: {
+ monthData: [
+ '$http',
+ '$stateParams',
+ function ($http, $stateParams) {
+ return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr)
+ },
+ ],
+ },
+ })
+ .state('analysis_org.commission.month.referrer', {
+ url: '/referrer',
+ templateUrl: '/static/config/referrercommission/templates/referrer_commission_month.html',
+ controller: 'referrerCommissionMonthViewCtrl',
+ resolve: {
+ monthData: [
+ '$http',
+ '$stateParams',
+ function ($http, $stateParams) {
+ return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr)
+ },
+ ],
+ },
+ })
+ .state('analysis_org.commission.month.org.orgdetail', {
+ url: '/citypartners/{orgId}',
+ templateUrl: '/static/config/orgcommission/templates/org_commission_detail.html',
+ controller: 'orgCommissionOrgDetailCtrl',
+ resolve: {
+ detail: [
+ '$http',
+ '$stateParams',
+ function ($http, $stateParams) {
+ return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId)
+ },
+ ],
+ },
})
- }]);
- app.controller('commissionMonthRootCtrl', ['$scope', '$state', function ($scope, $state) {
- if($state.is('analysis_org.commission.month')){
- $state.go('.org');
+ .state('analysis_org.commission.month.referrer.referrerdetail', {
+ url: '/referrer_commissions/{orgId}',
+ templateUrl: '/static/config/referrercommission/templates/referrer_commission_detail.html',
+ controller: 'referrerCommissionOrgDetailCtrl',
+ resolve: {
+ detail: [
+ '$http',
+ '$stateParams',
+ function ($http, $stateParams) {
+ return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId)
+ },
+ ],
+ },
+ })
+ },
+ ])
+ app.controller('commissionMonthRootCtrl', [
+ '$scope',
+ '$state',
+ function ($scope, $state) {
+ if ($state.is('analysis_org.commission.month')) {
+ $state.go('.org')
+ }
+ },
+ ])
+ app.controller('orgCommissionRootCtrl', [
+ '$scope',
+ '$http',
+ '$filter',
+ '$state',
+ 'commonDialog',
+ function ($scope, $http, $filter, $state, commonDialog) {
+ $scope.generate = {}
+ $scope.generateOrgCommission = function () {
+ $scope.generate.status = {}
+ if (!$scope.generate.month) {
+ commonDialog.alert({
+ type: 'error',
+ title: 'Error',
+ content: 'Select a month first!',
+ })
+ return
}
- }]);
- app.controller('orgCommissionRootCtrl', ['$scope', '$http', '$filter', '$state', 'commonDialog',
- function ($scope, $http, $filter, $state, commonDialog) {
- $scope.generate = {};
- $scope.generateOrgCommission = function () {
- $scope.generate.status = {};
- if (!$scope.generate.month) {
- commonDialog.alert({
- type: 'error', title: 'Error', content: 'Select a month first!'
- });
- return;
- }
- commonDialog.confirm({
- title: 'Confirm',
- content: 'This operation will clear the data generated before, Are you sure?'
- }).then(function () {
- var params = {month: $filter('date')($scope.generate.month, 'yyyy-MM')};
- $http.post('/sys/citypartner_prizes/generate', params).then(function () {
- $state.go('.org.month', {monthStr: params.month})
- $scope.generate.status = null;
- }, function (resp) {
- commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message});
- })
- })
- };
- $scope.availableYears = [new Date().getFullYear()];
- //当前年至2017年年份
- for (var i = 1; i < new Date().getFullYear()-2017+1; i++) {
- $scope.availableYears.push(new Date().getFullYear() - i);
- }
- $scope.params = {};
- $scope.months = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
- $scope.loadAvailableMonths = function (year) {
- $scope.params.year = year;
- $http.get('/sys/citypartner_prizes/months', {params: {year: $scope.params.year}}).then(function (resp) {
- $scope.availableMonths = resp.data;
- });
- };
-
- $scope.loadAvailableMonths(new Date().getFullYear());
- $scope.hasReport = function (mon) {
- var has = false;
- angular.forEach($scope.availableMonths, function (m) {
- if (mon == m.month) {
- has = true;
- }
- });
- return has;
- };
- $scope.gotoMonth = function (mon) {
- if(mon){
- $scope.params.month = mon;
- }
- var monthStr = $scope.params.year + '-' + $scope.params.month;
- $state.go('analysis_org.commission.month', {monthStr: monthStr})
- };
-
-
- }]);
- app.controller('orgCommissionMonthViewCtrl', ['$scope', 'monthData','$http', function ($scope, monthData,$http) {
- $scope.monthData = monthData.data;
- $scope.ctrl = {};
- $scope.commissionTypeMap = commissionTypeMap;
- $scope.seniors = {};
- $scope.active = function (log) {
- $http.get('/sys/citypartner_prizes/senior/'+log.org_id+'/details?monthStr='+$scope.monthData.monthstr).then(function (resp) {
- $scope.seniors = resp.data;
- if($scope.ctrl.activeLog && $scope.ctrl.activeLog.org_id==log.org_id){
- $scope.ctrl.activeLog=null;
- return;
- }
- $scope.ctrl.activeLog=log;
- })
+ commonDialog
+ .confirm({
+ title: 'Confirm',
+ content: 'This operation will clear the data generated before, Are you sure?',
+ })
+ .then(function () {
+ var params = { month: $filter('date')($scope.generate.month, 'yyyy-MM') }
+ $http.post('/sys/citypartner_prizes/generate', params).then(
+ function () {
+ $state.go('.org.month', { monthStr: params.month })
+ $scope.generate.status = null
+ },
+ function (resp) {
+ commonDialog.alert({ type: 'error', title: 'Error', content: resp.data.message })
+ }
+ )
+ })
+ }
+ $scope.params = { year: new Date() }
+ $scope.loadAvailableMonths = function () {
+ const year = $scope.params.year.getFullYear()
+ $http.get('/sys/citypartner_prizes/months', { params: { year: year } }).then(function (resp) {
+ $scope.availableMonths = resp.data
+ })
+ }
+ $scope.loadAvailableMonths()
+ $scope.months = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+ $scope.hasReport = function (mon) {
+ var has = false
+ angular.forEach($scope.availableMonths, function (m) {
+ if (mon == m.month) {
+ has = true
+ }
+ })
+ return has
+ }
+ $scope.gotoMonth = function (mon) {
+ if (mon) {
+ $scope.params.month = mon
}
- }]);
- app.controller('orgCommissionOrgDetailCtrl', ['$scope', 'detail', function ($scope, detail) {
- $scope.detail = detail.data;
- $scope.ctrl = {};
- $scope.active = function (log) {
- if($scope.ctrl.activeLog && $scope.ctrl.activeLog.client_moniker==log.client_moniker){
- $scope.ctrl.activeLog=null;
- return;
- }
- $scope.ctrl.activeLog=log;
+ var monthStr = $scope.params.year.getFullYear() + '-' + $scope.params.month
+ $state.go('analysis_org.commission.month', { monthStr: monthStr })
+ }
+ },
+ ])
+ app.controller('orgCommissionMonthViewCtrl', [
+ '$scope',
+ 'monthData',
+ '$http',
+ function ($scope, monthData, $http) {
+ $scope.monthData = monthData.data
+ $scope.ctrl = {}
+ $scope.commissionTypeMap = commissionTypeMap
+ $scope.seniors = {}
+ $scope.active = function (log) {
+ $http.get('/sys/citypartner_prizes/senior/' + log.org_id + '/details?monthStr=' + $scope.monthData.monthstr).then(function (resp) {
+ $scope.seniors = resp.data
+ if ($scope.ctrl.activeLog && $scope.ctrl.activeLog.org_id == log.org_id) {
+ $scope.ctrl.activeLog = null
+ return
+ }
+ $scope.ctrl.activeLog = log
+ })
+ }
+ },
+ ])
+ app.controller('orgCommissionOrgDetailCtrl', [
+ '$scope',
+ 'detail',
+ function ($scope, detail) {
+ $scope.detail = detail.data
+ $scope.ctrl = {}
+ $scope.active = function (log) {
+ if ($scope.ctrl.activeLog && $scope.ctrl.activeLog.client_moniker == log.client_moniker) {
+ $scope.ctrl.activeLog = null
+ return
}
- }]);
+ $scope.ctrl.activeLog = log
+ }
+ },
+ ])
- app.controller('referrerCommissionMonthViewCtrl', ['$scope', 'monthData', function ($scope, monthData) {
- $scope.monthData = monthData.data;
- $scope.ctrl = {};
- $scope.active = function (log) {
- if($scope.ctrl.activeLog && $scope.ctrl.activeLog.org_id==log.org_id){
- $scope.ctrl.activeLog=null;
- return;
- }
- $scope.ctrl.activeLog=log;
+ app.controller('referrerCommissionMonthViewCtrl', [
+ '$scope',
+ 'monthData',
+ function ($scope, monthData) {
+ $scope.monthData = monthData.data
+ $scope.ctrl = {}
+ $scope.active = function (log) {
+ if ($scope.ctrl.activeLog && $scope.ctrl.activeLog.org_id == log.org_id) {
+ $scope.ctrl.activeLog = null
+ return
}
- }]);
+ $scope.ctrl.activeLog = log
+ }
+ },
+ ])
- app.controller('referrerCommissionOrgDetailCtrl', ['$scope', 'detail', function ($scope, detail) {
- $scope.detail = detail.data;
- $scope.ctrl = {};
- $scope.active = function (log) {
- if($scope.ctrl.activeLog && $scope.ctrl.activeLog.client_moniker==log.client_moniker){
- $scope.ctrl.activeLog=null;
- return;
- }
- $scope.ctrl.activeLog=log;
+ app.controller('referrerCommissionOrgDetailCtrl', [
+ '$scope',
+ 'detail',
+ function ($scope, detail) {
+ $scope.detail = detail.data
+ $scope.ctrl = {}
+ $scope.active = function (log) {
+ if ($scope.ctrl.activeLog && $scope.ctrl.activeLog.client_moniker == log.client_moniker) {
+ $scope.ctrl.activeLog = null
+ return
}
- }]);
+ $scope.ctrl.activeLog = log
+ }
+ },
+ ])
- app.filter('commission_type_filter', function () {
- return function (sectorValue) {
- var sectorLabel = '';
- angular.forEach(commissionTypeMap, function (sector) {
- if (sector.label == sectorValue) {
- sectorLabel = sector.value;
- }
- });
- return sectorLabel;
+ app.filter('commission_type_filter', function () {
+ return function (sectorValue) {
+ var sectorLabel = ''
+ angular.forEach(commissionTypeMap, function (sector) {
+ if (sector.label == sectorValue) {
+ sectorLabel = sector.value
}
- });
-
-
- return app;
-
-
+ })
+ return sectorLabel
+ }
+ })
-});
+ return app
+})
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index f9e064700..d777cb390 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -11,8 +11,8 @@
@@ -92,7 +92,7 @@
| Month | -KPI | -BD Level | -Transaction Amount | -Total Commission | -Send Commission | -Hold Commission | -Prize Type | -Details | -
|---|---|---|---|---|---|---|---|---|
| Month | +KPI | +BD Level | +Transaction Amount | +Total Commission | +Send Commission | +Hold Commission | +Prize Type | +Details | +
| {{commission.month}} | -- {{commission.kpi_amount}} - 0.00 - | -- | {{commission.total_amount|currency:'AUD '}} | -- | - | - | - BD - Group - | -- - - - - - - | -
| {{commission.month}} | ++ {{commission.kpi_amount}} + 0.00 + | ++ | {{commission.total_amount|currency:'AUD '}} | ++ | + | + | + BD + Group + | ++ + + + + + + | +
| BD Level | -KPI完成度 | -Junior BD | -Intermediate BD | -Senior BD | -|||
|---|---|---|---|---|---|---|---|
| 费率 | -0.6-0.79 | -0.8-2.0 | -0.6-0.79 | -0.8-2.0 | -0.6-0.79 | -0.8-2.0 | -|
| BD Level | +KPI完成度 | +Junior BD | +Intermediate BD | +Senior BD | +|||
| 费率 | +0.6-0.79 | +0.8-2.0 | +0.6-0.79 | +0.8-2.0 | +0.6-0.79 | +0.8-2.0 | +|
| - | - | - | - | ||||
| + | + | + | ++ | +||||
+ is-open="ctrl.genmonth" datepicker-options="{minMode: 'month'}" ng-click="ctrl.genmonth=true"
+ placeholder="Select Month" />
-
-
+
-
diff --git a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
index bb1789c49..de2ec9660 100644
--- a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
@@ -43,10 +43,10 @@
+
-
@@ -101,7 +100,7 @@
Partner Commission:
@@ -59,11 +57,12 @@
- RoyalPay SurCharge:
+ Bestpay:{{r.channels.Bestpay}}" popover-title="RoyalPay SurCharge Detail"
+ popover-placement="bottom" popover-data-html="true">RoyalPay
+ SurCharge:
@@ -77,20 +76,20 @@
| - | Partner Commission | -BD Commission | -RoyalPay SurCharge | -
|---|---|---|---|
| + | Partner Commission | +BD Commission | +RoyalPay SurCharge | +
| Total | -- | - | - |
| Total | ++ | + | + |
平台收入趋势
+ ng-class="{nodata:chargeAnalysis.nodata}">
+ type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="20">
Required Field
-Length is more than 50
+Length is more than 20
+ type="url" name="company_website" id="website_input" required maxlength="100">
( Not required when business type is Offline scenario)
@@ -122,10 +122,12 @@
ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}">
diff --git a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
index 3c86baaed..5502868db 100644
--- a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
@@ -94,7 +94,7 @@
-
@@ -162,10 +164,10 @@
Required Field
+Length is more than 20
+
+ type="text" name="contact_email" id="contact_email_input" required maxlength="50">
Required Field
-Length is more than 128
+Length is more than 50
+ type="url" name="website" id="website_input" required maxlength="100">
diff --git a/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java b/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java
index 66b0c559f..f258ea143 100644
--- a/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java
+++ b/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java
@@ -1,23 +1,11 @@
package au.com.royalpay.payment.manage.process.custom;
-import au.com.royalpay.payment.channels.alipay.runtime.impls.AlipayCustomDeclaringTaskProcessor;
-//import au.com.royalpay.payment.core.mappers.PmtCustomReportsDetailMapper;
-//import au.com.royalpay.payment.core.mappers.PmtCustomReportsMapper;
-import au.com.royalpay.payment.core.mappers.PmtOrderMapper;
-import au.com.royalpay.payment.manage.mappers.custom.CustomReportDetailsMapper;
-import au.com.royalpay.payment.manage.mappers.custom.CustomReportsMapper;
-import com.alibaba.fastjson.JSONObject;
-import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
-import javax.annotation.Resource;
-import java.util.List;
-
/**
* Create by yixian at 2018-08-14 20:28
*/
diff --git a/uidocker/conf.d/default.conf b/uidocker/conf.d/default.conf
index beb93bbf7..9bbf8bfde 100644
--- a/uidocker/conf.d/default.conf
+++ b/uidocker/conf.d/default.conf
@@ -68,7 +68,7 @@ server {
}
- location ~ ^/api/v1.0/((jd)|(customs)|(alipay)|(rpay)|(yeepay)|(card_payment_view)|(lakala_pay)|(cb_bankpay)|(bestpay)|(hf)|(wechat_jsapi_gateway)|(h5_payment)|(gateway)|(hf_gateway)|(jd_gateway)|(micropay)|(retail_qrcode)|(jsapi_gateway)|(share_code)|(payment))/ {
+ location ~ ^/api/v1.0/((alipay_connect)|(customs)|(alipay)|(rpay)|(yeepay)|(card_payment_view)|(lakala_pay)|(cb_bankpay)|(bestpay)|(hf)|(wechat_jsapi_gateway)|(h5_payment)|(gateway)|(hf_gateway)|(jd_gateway)|(micropay)|(retail_qrcode)|(jsapi_gateway)|(share_code)|(payment))/ {
proxy_pass http://rppaycenter;
proxy_http_version 1.1;
(Not required when business type is Offline scenario)
Required Field
@@ -162,10 +162,10 @@
+ type="text" name="contact_email" id="contact_email_input" required maxlength="50">
Required Field
-Length is more than 128
+Length is more than 50