diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index 47545af6..1ec0228d 100755 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -512,11 +512,10 @@ function phpAlert($msg) { $data['dropdownvalue'] = $current; $data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current); //print_r( $data['fresh']); - - $employeeSalary = []; + $employeeSalary = []; foreach($data['fresh'] as $value){ - + //print_r($value); $NoofDays=$value->NoofDays;//Month day 30,31,28 $HRA_Amount = $value->HRA_Amount; $Basic_Pay = $value->Basic_Pay; @@ -527,108 +526,30 @@ foreach($data['fresh'] as $value){ $Paid_leave = $value->Paid_leave; // leave day $OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours $Monthly_Due= $value->Monthly_Due;// loan due amt - $Incentives=$value->Incentives; + $MasterIncentives=$value->Incentives;//Master values get + // echo 'master'.$MasterIncentives; + $Allowances =$value->Allowances; $HRA_Rate=$value->HRA_Rate; $PF_Rate=$value->PF_Rate; $ESI_Rate=$value->ESI_Rate; + $MonthIncentive = $value->Incent;//T_Monthly_Pay_Inputs,for change month + //echo 'month'. $MonthIncentive; + $Incentive = 0; - - $daySalarys = $Days_worked + $Paid_leave; - - //echo "hra amount";print_r(array($HRA_Amount,$Basic_Pay,$totalsalary)); - //$Allowances = $allowances * $values; - $dayFood_Allowance = $Food_Allowances * $Days_worked; - - $daySalary = $Basic_Pay / $NoofDays; - /**per day salary working hour**/ - //echo $daySalary.'
'; - - $dayHra = $HRA_Amount / $NoofDays; - /** per day hra amount **/ - //echo $dayHra.'
'; - - $onehoursSalary = ($daySalary + $dayHra) / 8; - /**one hour salay ot calculation**/ - if ($OT_Hrs_Worked != 0) - { - $totSalayOT = $OT_Hrs_Worked * $onehoursSalary; - } - else - { - $totSalayOT = 0; - } - $currentDaySalary = $daySalary * $daySalarys; - /** current day salary working days calculation**/ - - - $currentDayHra = $dayHra * $daySalarys; - /** total working days hra calculations**/ - // echo $currentDayHra.'
'; - $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT; - /** current date pf calculation**/ - if ($TotalSalary <= 20000) + if(empty($MonthIncentive)) { - $esiAmount = $currentDatePF * $ESI_Rate / 100; - /** esiamount not elgiable for 20000 **/ - } - else - { - $esiAmount = 0; - } - $pfAmount = $currentDaySalary * $PF_Rate/ 100; - /** pf amount per day**/ - - //echo $totalothour;die; - $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentives; - $salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount) - $Monthly_Due; - $employeeSalary []= round($salaryInCurrentday); - - - -} - $data['empSalary'] = $employeeSalary; - - $this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs'; - $this->loadViews("monthlypayinputs", $this->global,$data,NULL); - - - } - - function changeMonth() - { - - $current = $this->input->post('monthyear'); - - $data['month'] = $this->monthlypay_model->monthlyListing($current); - //print_r($data['month']); - - $data['dropdownvalue'] = $current; - $data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current); - - $employeeSalary = []; -foreach($data['fresh'] as $value){ - - - $NoofDays=$value->NoofDays;//Month day 30,31,28 - $HRA_Amount = $value->HRA_Amount; - $Basic_Pay = $value->Basic_Pay; - $TotalSalary = $value->TotalSalary; - $Food_Allowances= $value->Food_Allowances; - $Days_worked = $value->Days_worked; // working day - $LOP_Days = $value->LOP_Days; // not working day - $Paid_leave = $value->Paid_leave; // leave day - $OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours - $Monthly_Due= $value->Monthly_Due;// loan due amt - $Incentives=$value->Incentives; - $Allowances =$value->Allowances; - $HRA_Rate=$value->HRA_Rate; - $PF_Rate=$value->PF_Rate; - $ESI_Rate=$value->ESI_Rate; - + $Incentive = $MasterIncentives; + } + else + { + $Incentive = $MonthIncentive; + + } + //echo $Incentive; @@ -679,7 +600,125 @@ foreach($data['fresh'] as $value){ /** pf amount per day**/ //echo $totalothour;die; - $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentives; + $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive; + $salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount) - $Monthly_Due; + $employeeSalary []= round($salaryInCurrentday); + + + +} + $data['empSalary'] = $employeeSalary; + + //echo sizeof($data['fresh'])."-".sizeof($data['empSalary']);die; + $this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs'; + $this->loadViews("monthlypayinputs", $this->global,$data,NULL); + } + + + function changeMonth() + { + + $current = $this->input->post('monthyear'); + //echo $current; + + //$month = '0'.$current; + //echo 'c'.$month; + + $data['month'] = $this->monthlypay_model->monthlyListing($current); + //print_r($data['month']); + + $data['dropdownvalue'] = $current; + $data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current); + + $employeeSalary = []; +foreach($data['fresh'] as $value){ + + //print_r($value); + $NoofDays=$value->NoofDays;//Month day 30,31,28 + $HRA_Amount = $value->HRA_Amount; + $Basic_Pay = $value->Basic_Pay; + $TotalSalary = $value->TotalSalary; + $Food_Allowances= $value->Food_Allowances; + $Days_worked = $value->Days_worked; // working day + $LOP_Days = $value->LOP_Days; // not working day + $Paid_leave = $value->Paid_leave; // leave day + $OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours + $Monthly_Due= $value->Monthly_Due;// loan due amt + $MasterIncentives=$value->Incentives;//Master values get + // echo 'master'.$MasterIncentives; + + $Allowances =$value->Allowances; + $HRA_Rate=$value->HRA_Rate; + $PF_Rate=$value->PF_Rate; + $ESI_Rate=$value->ESI_Rate; + + $MonthIncentive = $value->Incent;//T_Monthly_Pay_Inputs,for change month + //echo 'month'. $MonthIncentive; + + $Incentive = 0; + + if(empty($MonthIncentive)) + { + + $Incentive = $MasterIncentives; + } + else + { + $Incentive = $MonthIncentive; + + } + //echo $Incentive; + + + + $daySalarys = $Days_worked + $Paid_leave; + + //echo "hra amount";print_r(array($HRA_Amount,$Basic_Pay,$totalsalary)); + //$Allowances = $allowances * $values; + $dayFood_Allowance = $Food_Allowances * $Days_worked; + + $daySalary = $Basic_Pay / $NoofDays; + /**per day salary working hour**/ + //echo $daySalary.'
'; + + $dayHra = $HRA_Amount / $NoofDays; + /** per day hra amount **/ + //echo $dayHra.'
'; + + $onehoursSalary = ($daySalary + $dayHra) / 8; + /**one hour salay ot calculation**/ + if ($OT_Hrs_Worked != 0) + { + $totSalayOT = $OT_Hrs_Worked * $onehoursSalary; + } + else + { + $totSalayOT = 0; + } + $currentDaySalary = $daySalary * $daySalarys; + /** current day salary working days calculation**/ + + + $currentDayHra = $dayHra * $daySalarys; + /** total working days hra calculations**/ + // echo $currentDayHra.'
'; + $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT; + /** current date pf calculation**/ + if ($TotalSalary <= 20000) + { + + $esiAmount = $currentDatePF * $ESI_Rate/ 100; + /** esiamount not elgiable for 20000 **/ + } + else + { + $esiAmount = 0; + } + $pfAmount = $currentDaySalary * $PF_Rate/ 100; + /** pf amount per day**/ + + //echo $totalothour;die; + $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive; $salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount) - $Monthly_Due; $employeeSalary []= round($salaryInCurrentday); diff --git a/application/models/monthlypay_model.php b/application/models/monthlypay_model.php index 5c7c005f..a98dfc5e 100755 --- a/application/models/monthlypay_model.php +++ b/application/models/monthlypay_model.php @@ -10,7 +10,7 @@ class monthlypay_model extends CI_Model * @param number $segment : This is pagination limit * @return array $result : This is result */ - function monthlyListing($current="") + function monthlyListing($current="") { //echo $current; $curr_split = explode('-',$current); @@ -67,7 +67,16 @@ class monthlypay_model extends CI_Model function getEmpPayDetailsforMonthInputs($current="") { - //echo $current; + //$month = '0'.$current; + + $month = $current; +if(strlen($month) == 6) +{ + $month = '0'.$month; +} + +//echo $month; + $current = '01-'.$current; //echo $current; $current = date_create($current); @@ -79,19 +88,23 @@ class monthlypay_model extends CI_Model //$monthyear_val = date('Y-m',strtotime($current)); $lastdate = $year_val.'-'.$month_val.'-'.$date_val; //echo $lastdate; - $sql = "select T_Emp_Pay_Data.EmpID, T_Emp_Pay_Data.Incentives,T_Emp_Pay_Data.*,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining,T_Attendance.Days_Worked as Days_worked,T_Attendance.Absent as LOP_Days,T_Attendance.Paid_Leave as Paid_leave,T_Attendance.Total_OTHrs as OT_Hrs_Worked,T_Attendance.NoofDays,T_Loan_Master.Loan_ID,T_Loan_Master.Monthly_Due,T_Payroll.Key from T_Emp_Pay_Data + + //left join T_Payroll on T_Employee_Details.EmpID = T_Payroll.EmpID and month(T_Payroll.PayOn) = month(?) and year(T_Payroll.PayOn) = year(?) + $sql ="select T_Emp_Pay_Data.EmpID, T_Emp_Pay_Data.Incentives,T_Emp_Pay_Data.*,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining,T_Attendance.Days_Worked as Days_worked,T_Attendance.Absent as LOP_Days,T_Attendance.Paid_Leave as Paid_leave,T_Attendance.Total_OTHrs as OT_Hrs_Worked,T_Attendance.NoofDays,T_Loan_Master.Loan_ID,T_Loan_Master.Monthly_Due,T_Payroll.Key,T_Monthly_Pay_Inputs.Incentives as Incent + from T_Emp_Pay_Data left join T_Employee_Details on T_Employee_Details.EmpID = T_Emp_Pay_Data.EmpID - left join T_Payroll on T_Employee_Details.EmpID = T_Payroll.EmpID and month(T_Payroll.PayOn) = month(?) and year(T_Payroll.PayOn) = year(?) + left join T_Payroll on T_Employee_Details.EmpID = T_Payroll.EmpID and T_Payroll.PayOn = ? left join T_Attendance on T_Emp_Pay_Data.EmpID = T_Attendance.EmpID + left join T_Monthly_Pay_Inputs on T_Monthly_Pay_Inputs.EmpID = T_Emp_Pay_Data.EmpID left join T_Loan_Master on T_Emp_Pay_Data.EmpID = T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1 where T_Employee_Details.DateofJoining <= ? and month(T_Attendance.Month_Year) = month(?) and year(T_Attendance.Month_Year) = year(?) order by T_Employee_Details.EmpID"; - $query = $this->db->query($sql,array($current,$current,$lastdate,$current,$current)); + $query = $this->db->query($sql,array($month,$lastdate,$current,$current)); return $query->result(); } - + function getPublicHoldays($current="") { if(!empty($current)) diff --git a/application/views/monthlypayinputs.php b/application/views/monthlypayinputs.php index 96b3910d..9855f2a0 100755 --- a/application/views/monthlypayinputs.php +++ b/application/views/monthlypayinputs.php @@ -1,10 +1,13 @@ $record) { - + //echo 'PAY'.$record->Key; $index++; if(in_array($record->EmpID,$testarray)) @@ -225,7 +230,8 @@ $('html').bind('keypress', function(e) Key) && !empty($record->Loan_ID)){ echo "contenteditable='true'; style='background-color:#ffcccc;text-align:right' title='Loan Pending'"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Loan_Recovered)){if(is_numeric($record->Loan_Recovered)){echo number_format($record->Loan_Recovered,2,'.','');}else {echo $record->Loan_Recovered;}}else{echo number_format(0.00,2,'.','');} ?> - Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Incentives)){echo $record->Incentives;}else{ echo number_format(0.00,2,'.','');;} ?> + Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Incent)){echo $record->Incent;}else {echo $record->Incentives;} ?> + Key)){echo "contenteditable='true';"; } ?> Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"style="text-align:right;" >Other_Deductions)){echo $record->Other_Deductions; }else{ echo number_format(0.00,2,'.','');;} ?> @@ -552,7 +558,7 @@ var manualLoan =parseFloat(loanRecd); current_loan_amt = manualLoan; } - console.log(current_loan_amt); + // console.log(current_loan_amt); if(parseFloat(incentie) == parseFloat(incentie)){