This commit is contained in:
venbatechnologies 2018-05-03 16:06:49 +05:30
parent 38aa457d90
commit 8cde4aac39
2 changed files with 182 additions and 147 deletions

View File

@ -513,30 +513,31 @@ function phpAlert($msg) {
$data['dropdownvalue'] = $current; $data['dropdownvalue'] = $current;
$data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current); $data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current);
//print_r( $data['fresh']); //print_r( $data['fresh']);
$employeeSalary = []; // $employeeSalary = [];
foreach($data['fresh'] as $value){ // foreach($data['fresh'] as $value){
//print_r($value); // //print_r($value);
$NoofDays=$value->NoofDays;//Month day 30,31,28 // $NoofDays=$value->NoofDays;//Month day 30,31,28
$HRA_Amount = $value->HRA_Amount; // $HRA_Amount = $value->HRA_Amount;
$Basic_Pay = $value->Basic_Pay; // $Basic_Pay = $value->Basic_Pay;
$TotalSalary = $value->TotalSalary; // $TotalSalary = $value->TotalSalary;
$Food_Allowances= $value->Food_Allowances; // $Food_Allowances= $value->Food_Allowances;
$Days_worked = $value->Days_worked; // working day // $Days_worked = $value->Days_worked; // working day
$LOP_Days = $value->LOP_Days; // not working day // $LOP_Days = $value->LOP_Days; // not working day
$Paid_leave = $value->Paid_leave; // leave day // $Paid_leave = $value->Paid_leave; // leave day
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours // $OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
$Monthly_Due= $value->Monthly_Due;// loan due amt // $Monthly_Due= $value->Monthly_Due;// loan due amt
$MasterIncentives=$value->MasterIncentives;//Master values get
// echo 'master'.$MasterIncentives;
$Allowances =$value->Allowances; // $MasterIncentives=$value->MasterIncentives;//Master values get
$HRA_Rate=$value->HRA_Rate; // // echo 'master'.$MasterIncentives;
$PF_Rate=$value->PF_Rate;
$ESI_Rate=$value->ESI_Rate;
$MonthIncentive = $value->MonthlyIncentives;//T_Monthly_Pay_Inputs,for change month // $Allowances =$value->Allowances;
//echo 'month'. $MonthIncentive; // $HRA_Rate=$value->HRA_Rate;
// $PF_Rate=$value->PF_Rate;
// $ESI_Rate=$value->ESI_Rate;
// $MonthIncentive = $value->MonthlyIncentives;//T_Monthly_Pay_Inputs,for change month
// //echo 'month'. $MonthIncentive;
// $Incentive = 0; // $Incentive = 0;
@ -550,65 +551,74 @@ foreach($data['fresh'] as $value){
// $Incentive = $MonthIncentive; // $Incentive = $MonthIncentive;
// } // }
//echo $Incentive;
$daySalarys = $Days_worked + $Paid_leave; // $daySalarys = $Days_worked + $Paid_leave;
//echo "hra amount";print_r(array($HRA_Amount,$Basic_Pay,$totalsalary)); // //echo "hra amount";print_r(array($HRA_Amount,$Basic_Pay,$totalsalary));
//$Allowances = $allowances * $values; // //$Allowances = $allowances * $values;
$dayFood_Allowance = $Food_Allowances * $Days_worked; // $dayFood_Allowance = $Food_Allowances * $Days_worked;
$daySalary = $Basic_Pay / $NoofDays; // $daySalary = $Basic_Pay / $NoofDays;
/**per day salary working hour**/ // /**per day salary working hour**/
//echo $daySalary.'<br/>'; // //echo $daySalary.'<br/>';
$dayHra = $HRA_Amount / $NoofDays; // $dayHra = $HRA_Amount / $NoofDays;
/** 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 ($OT_Hrs_Worked != 0) // if ($OT_Hrs_Worked != 0)
{ // {
$totSalayOT = $OT_Hrs_Worked * $onehoursSalary; // $totSalayOT = $OT_Hrs_Worked * $onehoursSalary;
} // }
else // else
{ // {
$totSalayOT = 0; // $totSalayOT = 0;
} // }
$currentDaySalary = $daySalary * $daySalarys; // $currentDaySalary = $daySalary * $daySalarys;
/** current day salary working days calculation**/ // /** current day salary working days calculation**/
$currentDayHra = $dayHra * $daySalarys; // $currentDayHra = $dayHra * $daySalarys;
/** total working days hra calculations**/ // /** total working days hra calculations**/
// echo $currentDayHra.'<br/>'; // // echo $currentDayHra.'<br/>';
$currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT; // $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
/** current date pf calculation**/ // /** current date pf calculation**/
if ($TotalSalary <= 20000) // if ($TotalSalary <= 20000)
{ // {
$esiAmount = $currentDatePF * $ESI_Rate/ 100; // $esiAmount = $currentDatePF * $ESI_Rate/ 100;
/** esiamount not elgiable for 20000 **/ // /** esiamount not elgiable for 20000 **/
} // }
else // else
{ // {
$esiAmount = 0; // $esiAmount = 0;
} // }
$pfAmount = $currentDaySalary * $PF_Rate/ 100; // $pfAmount = $currentDaySalary * $PF_Rate/ 100;
/** pf amount per day**/ // /** pf amount per day**/
//echo $totalothour;die; // //echo $totalothour;die;
$salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $MasterIncentives; // $empSalaryAdd = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive;
$salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount) - $Monthly_Due;
$employeeSalary []= round($salaryInCurrentday); // $empSalarySub = $esiAmount + $pfAmount + $Monthly_Due;
// $salaryInCurrentday= $empSalaryAdd - $empSalarySub;
// $employeeSalary []= round($salaryInCurrentday);
}
$data['empSalary'] = $employeeSalary;
// }
// $data['empSalary'] = $employeeSalary;
//echo sizeof($data['fresh'])."-".sizeof($data['empSalary']);die; //echo sizeof($data['fresh'])."-".sizeof($data['empSalary']);die;
$this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs'; $this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs';
@ -621,20 +631,18 @@ foreach($data['fresh'] as $value){
$current = $this->input->post('monthyear'); $current = $this->input->post('monthyear');
//echo $current; //echo $current;
//$month = '0'.$current;
//echo 'c'.$month;
$data['month'] = $this->monthlypay_model->monthlyListing($current); $data['month'] = $this->monthlypay_model->monthlyListing($current);
//print_r($data['month']); //print_r($data['month']);
$data['dropdownvalue'] = $current; $data['dropdownvalue'] = $current;
$data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current); $data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current);
$employeeSalary = []; $employeeSalary = [];
foreach($data['fresh'] as $value){ foreach($data['fresh'] as $value){
//print_r($value); print_r($value);
$NoofDays=$value->NoofDays;//Month day 30,31,28 $NoofDays=$value->NoofDays;//Month day 30,31,28
$HRA_Amount = $value->HRA_Amount; $HRA_Amount = $value->HRA_Amount;
$Basic_Pay = $value->Basic_Pay; $Basic_Pay = $value->Basic_Pay;
@ -644,9 +652,34 @@ foreach($data['fresh'] as $value){
$LOP_Days = $value->LOP_Days; // not working day $LOP_Days = $value->LOP_Days; // not working day
$Paid_leave = $value->Paid_leave; // leave day $Paid_leave = $value->Paid_leave; // leave day
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours $OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
$Monthly_Due= $value->Monthly_Due;// loan due amt $Monthly_Due = $value->Monthly_Due;// AUTO LOAN DUE
$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
$MasterIncentives=$value->MasterIncentives;//Master values get $MasterIncentives=$value->MasterIncentives;//Master values get
// echo 'master'.$MasterIncentives; // echo 'master'.$MasterIncentives;
// $Loan_amount = $value->Loan_Amount;
$loan=0;
if($Loan_Recovered =='NA'){
$loan=0.00;
}
else if($Loan_Recovered == 0.00)
{
$loan=$Monthly_Due;
}
else if($Loan_Recovered >= 0.00)
{
$loan = $Loan_Recovered;
}
echo 'Loan'. $loan ;
$Allowances =$value->Allowances; $Allowances =$value->Allowances;
$HRA_Rate=$value->HRA_Rate; $HRA_Rate=$value->HRA_Rate;
@ -654,7 +687,6 @@ foreach($data['fresh'] as $value){
$ESI_Rate=$value->ESI_Rate; $ESI_Rate=$value->ESI_Rate;
$MonthIncentive = $value->MonthlyIncentives;//T_Monthly_Pay_Inputs,for change month $MonthIncentive = $value->MonthlyIncentives;//T_Monthly_Pay_Inputs,for change month
//echo 'month'. $MonthIncentive;
$Incentive = 0; $Incentive = 0;
@ -719,8 +751,12 @@ foreach($data['fresh'] as $value){
/** pf amount per day**/ /** pf amount per day**/
//echo $totalothour;die; //echo $totalothour;die;
$salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive; $empSalaryAdd = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive;
$salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount) - $Monthly_Due; $empSalarySub = $esiAmount + $pfAmount + $loan;
$salaryInCurrentday= $empSalaryAdd - $empSalarySub;
$employeeSalary []= round($salaryInCurrentday); $employeeSalary []= round($salaryInCurrentday);

View File

@ -2,18 +2,18 @@
$sample = array_merge($month,$fresh); $sample = array_merge($month,$fresh);
$show_hide_column_value = true; $show_hide_column_value = true;
foreach($sample as $s) // foreach($sample as $s)
{ // {
if(!empty($s->Key)) // if(!empty($s->Key))
{ // {
$show_hide_column_value = false; // $show_hide_column_value = false;
} // }
else // else
{ // {
$show_hide_column_value = true; // $show_hide_column_value = true;
} // }
break; // break;
} // }
$ex = explode('-',$dropdownvalue); $ex = explode('-',$dropdownvalue);
@ -522,7 +522,7 @@ function isCheckKeyCode(event){
var paidLeave =parseFloat(document.getElementById('paidLeave'+sno).textContent); var paidLeave =parseFloat(document.getElementById('paidLeave'+sno).textContent);
var otHrsWork =parseFloat(document.getElementById('otHrsWork'+sno).textContent); var otHrsWork =parseFloat(document.getElementById('otHrsWork'+sno).textContent);
var monthDue =parseFloat(document.getElementById('monthDue'+sno).textContent); var monthDue =parseFloat(document.getElementById('monthDue'+sno).textContent);
var loanRecd=parseFloat(document.getElementById('loanRecd'+sno).textContent); var loanRecd=document.getElementById('loanRecd'+sno).textContent;
var incentie=parseFloat(document.getElementById('incentie'+sno).textContent); var incentie=parseFloat(document.getElementById('incentie'+sno).textContent);
var otherDet =parseFloat(document.getElementById('otherDet'+sno).textContent); var otherDet =parseFloat(document.getElementById('otherDet'+sno).textContent);
@ -573,37 +573,36 @@ function isCheckKeyCode(event){
// console.log("11days hra"+currentDayHra); // console.log("11days hra"+currentDayHra);
//------loan calculator start----------/
var current_loan_amt = 0; var current_loan_amt = 0;
// if(parseFloat(monthDue)>=parseFloat(loanRecd))
// {
// var oldloan = parseFloat(monthDue) - parseFloat(loanRecd);
// //console.log("if" + oldloan);
// var loandue = parseFloat(monthDue) - parseFloat(oldloan);
// // console.log("if "+loandue);
// }else{
// var oldloan = parseFloat(monthDue) - parseFloat(loanRecd);//Auto Due
// //console.log("else" + oldloan);
// var loandue = parseFloat(monthDue)- parseFloat(oldloan);//Manual Due
// //console.log("else"+loandue);
// }
var autoLoan =parseFloat(monthDue); var autoLoan =parseFloat(monthDue);
var manualLoan =parseFloat(loanRecd); var manualLoan =parseFloat(loanRecd);
// var manualLoan = Math.min.apply(null, arrayOfNumbers.filter(function(loanRecd) { return !isNaN(loanRecd); }))
//alert(manualLoan);
if(manualLoan == 0.00){ if(manualLoan == 0.00){
current_loan_amt = autoLoan; current_loan_amt = autoLoan;
//alert('0.00');
}
else if(isNaN(manualLoan))
{
//alert('N');
current_loan_amt = 0.00;
} }
else if(manualLoan == 'NA') else if(manualLoan == 'NA')
{ {
current_loan_amt = 0; //alert('NA');
current_loan_amt = 0.00;
} }
else if(manualLoan >= 0.00) else if(manualLoan >= 0.00)
{ {
current_loan_amt = manualLoan; current_loan_amt = manualLoan;
//alert('manual');
}
else{
current_loan_amt = manualLoan;
} }
// console.log(current_loan_amt); // console.log(current_loan_amt);
@ -668,7 +667,7 @@ var manualLoan =parseFloat(loanRecd);
document.getElementById("empsal"+sno).innerHTML = cals; document.getElementById("empsal"+sno).innerHTML = cals;
//$data['empSalary'] = $employeeSalary;