CelHRTeam/EchoTex_Payroll
12
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev_chapal #5

Merged
chapal merged 2 commits from dev_chapal into devqc 2024-10-17 12:57:41 +06:00
Conversation 0 Commits 2 Files Changed 2 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b985339a1 - Show all commits

5
HRM.UI/Controllers/Payroll/BonusController.cs
View File

@ -745,6 +745,7 @@ namespace HRM.UI.Controllers.Payroll
DateTime dtpSalaryMonth = (DateTime)pItem["salaryMonthDate"].ToObject<DateTime>(); DateTime dtpSalaryMonth = (DateTime)pItem["salaryMonthDate"].ToObject<DateTime>();
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
int payrollTypeId = currentUser.PayrollTypeID.GetValueOrDefault(); int payrollTypeId = currentUser.PayrollTypeID.GetValueOrDefault();
//int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic); //int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic);
@ -780,7 +781,7 @@ namespace HRM.UI.Controllers.Payroll
//DateTime nextPayProcessDate = new SystemInformationService().Get().NextPayProcessDate; //DateTime nextPayProcessDate = new SystemInformationService().Get().NextPayProcessDate;
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
DateTime nextPayProcessDate = currentUser.NextPayProcessDate.GetValueOrDefault(); DateTime nextPayProcessDate = currentUser.NextPayProcessDate.GetValueOrDefault();
int payrollTypeId = currentUser.PayrollTypeID.GetValueOrDefault();
if (dtpSalaryMonth.Month == nextPayProcessDate.Month && dtpSalaryMonth.Year == nextPayProcessDate.Year) if (dtpSalaryMonth.Month == nextPayProcessDate.Month && dtpSalaryMonth.Year == nextPayProcessDate.Year)
{ {
List<ProdBonusProcess> oProdBonusProsses = _prodBonusProcessService.Get(GlobalFunctions.LastDateOfMonth(dtpSalaryMonth)); List<ProdBonusProcess> oProdBonusProsses = _prodBonusProcessService.Get(GlobalFunctions.LastDateOfMonth(dtpSalaryMonth));
@ -790,7 +791,7 @@ namespace HRM.UI.Controllers.Payroll
{ {
//int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic); //int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic);
int setupID = 21; int setupID = 21;
ADParameter _ADParam = new ADParameterService().Get(setupID); ADParameter _ADParam = new ADParameterService().Get(setupID, payrollTypeId);
_prodBonusProcessService.UndoProcess(oProdBonusProsses, _ADParam, GlobalFunctions.LastDateOfMonth(dtpSalaryMonth)); _prodBonusProcessService.UndoProcess(oProdBonusProsses, _ADParam, GlobalFunctions.LastDateOfMonth(dtpSalaryMonth));
//MessageBox.Show("Bonus process deleted successfully.", "Undo Bonus Process", MessageBoxButtons.OK, MessageBoxIcon.Information); //MessageBox.Show("Bonus process deleted successfully.", "Undo Bonus Process", MessageBoxButtons.OK, MessageBoxIcon.Information);