diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index a0929b943..ecb1475f8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -420,6 +420,7 @@ public class BDPrizeServiceImpl implements BDPrizeService { config.put("manager_id", bdId); config.put("bd_name", bdUser.getString("display_name")); config.put("bd_level", info.getIntValue("bd_level")); + config.put("bd_type", info.getIntValue("bd_type")); config.put("city", info.getString("city")); config.put("get_prize", info.getBooleanValue("get_prize")); config.put("bd_group", info.getString("bd_group")); @@ -431,6 +432,7 @@ public class BDPrizeServiceImpl implements BDPrizeService { config.put("city", info.getString("city")); config.put("get_prize", info.getBooleanValue("get_prize")); config.put("bd_group", info.getString("bd_group")); + config.put("bd_type", info.getIntValue("bd_type")); config.put("last_update_by", manager.getString("display_name")); config.put("last_update_date", new Date()); financialBDConfigMapper.updateBDConfig(config); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml index 563654312..e2c675edd 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml @@ -11,6 +11,7 @@ c.get_prize, c.bd_group, c.kpi_amount, + c.bd_type, m.is_valid FROM sys_managers m LEFT JOIN financial_bd_config c ON c.manager_id = m.manager_id diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index 0b84b33d3..c73624f18 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -127,6 +127,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { $scope.editBDLevels = function () { $uibModal.open({ templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html', + size: 'lg', controller: 'bdLevelConfigCtrl' }) }; @@ -194,7 +195,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { } }]); 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; @@ -220,7 +221,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { 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'}, {id: 2, label: 'KA Manager'}, {id: 3, label: 'Sydney GM'},{id: 4, label: 'COO'},{id: 5, label: 'NJ Department'}]; + $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) { diff --git a/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html b/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html index 7e507227d..4c2514d4e 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html +++ b/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html @@ -82,7 +82,7 @@