SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allowance issues fixed

Browse Source
This commit is contained in:
gandhimathi 2017-12-21 11:45:43 +00:00
parent 4948034c0d
commit bcb8947693
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/controllers/user.php
View File

@ -202,9 +202,9 @@ class user extends BaseController
$Basic_Pay = $totalEmployeePersent[0]->Basic_Pay; $Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
$totalsalary = $totalEmployeePersent[0]->TotalSalary; $totalsalary = $totalEmployeePersent[0]->TotalSalary;
$dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances; $dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances;
$allowances =$totalEmployeePersent[0]->Allowances; //$allowances =$totalEmployeePersent[0]->Allowances;
$Allowances = $allowances * $values; //$Allowances = $allowances * $values;
$Food_Allowances = $dayFoodAmt * $values; $Food_Allowances = $dayFoodAmt * $values;
$daySalary = $Basic_Pay / $CUR_month; $daySalary = $Basic_Pay / $CUR_month;
@ -242,7 +242,7 @@ class user extends BaseController
/** pf amount per day**/ /** pf amount per day**/
//echo $totalothour;die; //echo $totalothour;die;
$salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances+ $Allowances; $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances;
$salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount); $salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount);
$employeeSalary += round($salaryInCurrentday); $employeeSalary += round($salaryInCurrentday);
@ -318,9 +318,9 @@ class user extends BaseController
$Basic_Pay = $totalEmployeePersent[0]->Basic_Pay; $Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
$totalsalary = $totalEmployeePersent[0]->TotalSalary; $totalsalary = $totalEmployeePersent[0]->TotalSalary;
$dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances; $dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances;
$allowances =$totalEmployeePersent[0]->Allowances; //$allowances =$totalEmployeePersent[0]->Allowances;
$Allowances = $allowances * $values; // $Allowances = $allowances * $values;
$Food_Allowances = $dayFoodAmt * $values; $Food_Allowances = $dayFoodAmt * $values;
@ -359,7 +359,7 @@ class user extends BaseController
/** pf amount per day**/ /** pf amount per day**/
//echo $totalothour;die; //echo $totalothour;die;
$salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances + $Allowances; $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances ;
$salaryInCurrentday = $salaryInCurrentdays -($esiAmount+$pfAmount); $salaryInCurrentday = $salaryInCurrentdays -($esiAmount+$pfAmount);
$totalSalarys = $totalSalary + $salaryInCurrentday; $totalSalarys = $totalSalary + $salaryInCurrentday;