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

dashboard issues todaysalary

Browse Source
This commit is contained in:
venbatechnologies 2017-12-21 16:09:00 +05:30
parent e0f1eee2fb
commit 4948034c0d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/controllers/user.php
View File

@ -202,8 +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 = $allowances * $values;
$Food_Allowances = $dayFoodAmt * $values; $Food_Allowances = $dayFoodAmt * $values;
$daySalary = $Basic_Pay / $CUR_month; $daySalary = $Basic_Pay / $CUR_month;
@ -213,6 +214,7 @@ class user extends BaseController
$dayHra = $HRA_Amount / $CUR_month; $dayHra = $HRA_Amount / $CUR_month;
/** per day hra amount **/ /** per day hra amount **/
//echo $dayHra.'<br/>'; //echo $dayHra.'<br/>';
$onehoursSalary = ($daySalary + $dayHra) / 8; $onehoursSalary = ($daySalary + $dayHra) / 8;
/**one hour salay ot calculation**/ /**one hour salay ot calculation**/
if ($totalothour != 0) /** if ot not equal zero **/ { if ($totalothour != 0) /** if ot not equal zero **/ {
@ -227,7 +229,7 @@ class user extends BaseController
$currentDayHra = $dayHra * $values; $currentDayHra = $dayHra * $values;
/** total working days hra calculations**/ /** total working days hra calculations**/
// echo $currentDayHra.'<br/>'; // echo $currentDayHra.'<br/>';
$currentDatePF = $currentDaySalary + $currentDayHra; $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
/** current date pf calculation**/ /** current date pf calculation**/
if ($totalsalary <= 20000) { if ($totalsalary <= 20000) {
@ -240,8 +242,8 @@ class user extends BaseController
/** pf amount per day**/ /** pf amount per day**/
//echo $totalothour;die; //echo $totalothour;die;
$salaryInCurrentday = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances; $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances+ $Allowances;
$salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount);
$employeeSalary += round($salaryInCurrentday); $employeeSalary += round($salaryInCurrentday);
} }
@ -316,6 +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 = $allowances * $values;
$Food_Allowances = $dayFoodAmt * $values; $Food_Allowances = $dayFoodAmt * $values;
@ -341,7 +346,7 @@ class user extends BaseController
$currentDayHra = $dayHra * $values; $currentDayHra = $dayHra * $values;
/** total working days hra calculations**/ /** total working days hra calculations**/
// echo $currentDayHra.'<br/>'; // echo $currentDayHra.'<br/>';
$currentDatePF = $currentDaySalary + $currentDayHra; $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
/** current date pf calculation**/ /** current date pf calculation**/
if ($totalsalary <= 20000) { if ($totalsalary <= 20000) {
@ -354,9 +359,9 @@ class user extends BaseController
/** pf amount per day**/ /** pf amount per day**/
//echo $totalothour;die; //echo $totalothour;die;
$salaryInCurrentday = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances; $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances + $Allowances;
$salaryInCurrentday = $salaryInCurrentdays -($esiAmount+$pfAmount);
$totalSalarys = $totalSalary + $salaryInCurrentday; $totalSalarys = $totalSalary + $salaryInCurrentday;
$totalSalary = round($totalSalarys); $totalSalary = round($totalSalarys);