diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php
index 9b588cff..9fbba199 100755
--- a/application/controllers/payslip.php
+++ b/application/controllers/payslip.php
@@ -509,106 +509,116 @@ function phpAlert($msg) {
$current = date("m-Y");
//echo $current;
$data['month'] = $this->monthlypay_model->monthlyListing($current);
- // $data['fresh'] = $this-> monthlypay_model->getEmpPayDetails($current);
- $data['dropdownvalue'] = $current;
- $data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current);
- //print_r( $data['fresh']);
- $employeeSalary = [];
-foreach($data['fresh'] as $value){
+ // $data['fresh'] = $this-> monthlypay_model->getEmpPayDetails($current);
+ $data['dropdownvalue'] = $current;
+ $data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current);
+ //print_r( $data['fresh']);
+// $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->MasterIncentives;//Master values get
- // echo 'master'.$MasterIncentives;
+// //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
- $Allowances =$value->Allowances;
- $HRA_Rate=$value->HRA_Rate;
- $PF_Rate=$value->PF_Rate;
- $ESI_Rate=$value->ESI_Rate;
+// $MasterIncentives=$value->MasterIncentives;//Master values get
+// // echo 'master'.$MasterIncentives;
- $MonthIncentive = $value->MonthlyIncentives;//T_Monthly_Pay_Inputs,for change month
- //echo 'month'. $MonthIncentive;
+// $Allowances =$value->Allowances;
+// $HRA_Rate=$value->HRA_Rate;
+// $PF_Rate=$value->PF_Rate;
+// $ESI_Rate=$value->ESI_Rate;
- // $Incentive = 0;
+// $MonthIncentive = $value->MonthlyIncentives;//T_Monthly_Pay_Inputs,for change month
+// //echo 'month'. $MonthIncentive;
- // if(empty($MonthIncentive))
- // {
+// $Incentive = 0;
- // $Incentive = $MasterIncentives;
- // }
- // else
- // {
- // $Incentive = $MonthIncentive;
+// if(empty($MonthIncentive))
+// {
+
+// $Incentive = $MasterIncentives;
+// }
+// else
+// {
+// $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));
- //$Allowances = $allowances * $values;
- $dayFood_Allowance = $Food_Allowances * $Days_worked;
+// //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.'
';
+// $daySalary = $Basic_Pay / $NoofDays;
+// /**per day salary working hour**/
+// //echo $daySalary.'
';
- $dayHra = $HRA_Amount / $NoofDays;
- /** per day hra amount **/
- //echo $dayHra.'
';
+// $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**/
+// $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)
- {
+// $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**/
+// $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 + $MasterIncentives;
- $salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount) - $Monthly_Due;
- $employeeSalary []= round($salaryInCurrentday);
+// //echo $totalothour;die;
+// $empSalaryAdd = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive;
+
+// $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;
$this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs';
@@ -621,20 +631,18 @@ foreach($data['fresh'] as $value){
$current = $this->input->post('monthyear');
//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']);
-
- $data['dropdownvalue'] = $current;
+ $data['dropdownvalue'] = $current;
$data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current);
- $employeeSalary = [];
-foreach($data['fresh'] as $value){
+ $employeeSalary = [];
+
+
+ foreach($data['fresh'] as $value){
+
+ print_r($value);
- //print_r($value);
$NoofDays=$value->NoofDays;//Month day 30,31,28
$HRA_Amount = $value->HRA_Amount;
$Basic_Pay = $value->Basic_Pay;
@@ -644,9 +652,34 @@ foreach($data['fresh'] as $value){
$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
+ $Monthly_Due = $value->Monthly_Due;// AUTO LOAN DUE
+
+ $Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
+
$MasterIncentives=$value->MasterIncentives;//Master values get
// 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;
$HRA_Rate=$value->HRA_Rate;
@@ -654,8 +687,7 @@ foreach($data['fresh'] as $value){
$ESI_Rate=$value->ESI_Rate;
$MonthIncentive = $value->MonthlyIncentives;//T_Monthly_Pay_Inputs,for change month
- //echo 'month'. $MonthIncentive;
-
+
$Incentive = 0;
if(empty($MonthIncentive))
@@ -668,7 +700,7 @@ foreach($data['fresh'] as $value){
$Incentive = $MonthIncentive;
}
- //echo $Incentive;
+ // echo $Incentive;
@@ -719,8 +751,12 @@ foreach($data['fresh'] as $value){
/** pf amount per day**/
//echo $totalothour;die;
- $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive;
- $salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount) - $Monthly_Due;
+ $empSalaryAdd = $currentDaySalary + $totSalayOT + $currentDayHra + $dayFood_Allowance + $Allowances + $Incentive;
+ $empSalarySub = $esiAmount + $pfAmount + $loan;
+
+ $salaryInCurrentday= $empSalaryAdd - $empSalarySub;
+
+
$employeeSalary []= round($salaryInCurrentday);
diff --git a/application/views/monthlypayinputs.php b/application/views/monthlypayinputs.php
index b48296a9..72c0f18d 100755
--- a/application/views/monthlypayinputs.php
+++ b/application/views/monthlypayinputs.php
@@ -2,18 +2,18 @@
$sample = array_merge($month,$fresh);
$show_hide_column_value = true;
- foreach($sample as $s)
- {
- if(!empty($s->Key))
- {
- $show_hide_column_value = false;
- }
- else
- {
- $show_hide_column_value = true;
- }
- break;
- }
+ // foreach($sample as $s)
+ // {
+ // if(!empty($s->Key))
+ // {
+ // $show_hide_column_value = false;
+ // }
+ // else
+ // {
+ // $show_hide_column_value = true;
+ // }
+ // break;
+ // }
$ex = explode('-',$dropdownvalue);
@@ -522,7 +522,7 @@ function isCheckKeyCode(event){
var paidLeave =parseFloat(document.getElementById('paidLeave'+sno).textContent);
var otHrsWork =parseFloat(document.getElementById('otHrsWork'+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 otherDet =parseFloat(document.getElementById('otherDet'+sno).textContent);
@@ -542,25 +542,25 @@ function isCheckKeyCode(event){
//con(incentie);
var dayWorkPaid=dayWorks+paidLeave;
- // console.log("day"+dayWorkPaid);
+ // console.log("day"+dayWorkPaid);
var NoofDays=dayWorks+paidLeave +lopDay;
- // console.log("monthday"+NoofDays);
+ // console.log("monthday"+NoofDays);
var Food_Allowances = fAllow * dayWorks;
- // console.log("workedFA"+Food_Allowances);
+ // console.log("workedFA"+Food_Allowances);
var daySalary = bpay / NoofDays;
- // console.log("1daysalary "+daySalary);
+ // console.log("1daysalary "+daySalary);
var dayHra = hraAmt / NoofDays;
- // console.log("1dayHRA"+dayHra);
+ // console.log("1dayHRA"+dayHra);
var onehoursSalary = (daySalary + dayHra) / 8;
- //console.log("onehours "+onehoursSalary);
+ //console.log("onehours "+onehoursSalary);
var totSalayOT =0;
- if (otHrsWork!= 0)
+ if (otHrsWork!= 0)
{
totSalayOT = otHrsWork * onehoursSalary;
}
- else
+ else
{
totSalayOT = 0;
}
@@ -573,40 +573,39 @@ function isCheckKeyCode(event){
// console.log("11days hra"+currentDayHra);
-
- //------loan calculator start----------/
- 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 manualLoan =parseFloat(loanRecd);
+ var current_loan_amt = 0;
+ var autoLoan =parseFloat(monthDue);
+ var manualLoan =parseFloat(loanRecd);
+ // var manualLoan = Math.min.apply(null, arrayOfNumbers.filter(function(loanRecd) { return !isNaN(loanRecd); }))
+ //alert(manualLoan);
if(manualLoan == 0.00){
current_loan_amt = autoLoan;
+ //alert('0.00');
+ }
+ else if(isNaN(manualLoan))
+ {
+ //alert('N');
+ current_loan_amt = 0.00;
+
}
else if(manualLoan == 'NA')
- {
- current_loan_amt = 0;
+ {
+ //alert('NA');
+ current_loan_amt = 0.00;
+
}
else if(manualLoan >= 0.00)
{
current_loan_amt = manualLoan;
+ //alert('manual');
+ }
+ else{
+ current_loan_amt = manualLoan;
+
}
- // console.log(current_loan_amt);
+ // console.log(current_loan_amt);
if(parseFloat(incentie) == parseFloat(incentie)){
@@ -648,27 +647,27 @@ var manualLoan =parseFloat(loanRecd);
}
- var pfAmount = currentDaySalary * pfRate / 100;
- // console.log("11daypf"+pfAmount);
+ var pfAmount = currentDaySalary * pfRate / 100;
+ // console.log("11daypf"+pfAmount);
- var empSalaryAdd= currentDaySalary + totSalayOT + currentDayHra + Food_Allowances + allow +incent+Festivals;
+ var empSalaryAdd= currentDaySalary + totSalayOT + currentDayHra + Food_Allowances + allow +incent+Festivals;
- var empSalarySub = current_loan_amt + esiAmount + pfAmount + otherDets;
+ var empSalarySub = current_loan_amt + esiAmount + pfAmount + otherDets;
var empMonthSalary = empSalaryAdd - empSalarySub
- var employeeSalary = Math.round(empMonthSalary);
+ var employeeSalary = Math.round(empMonthSalary);
//console.log( employeeSalary);
- var cals =(employeeSalary).toFixed(0);
+ var cals =(employeeSalary).toFixed(0);
- document.getElementById("empsal"+sno).innerHTML = cals;
+ document.getElementById("empsal"+sno).innerHTML = cals;
- //$data['empSalary'] = $employeeSalary;
+