diff --git a/application/views/editPayslip.php b/application/views/editPayslip.php index 633e6cb8..081a3623 100755 --- a/application/views/editPayslip.php +++ b/application/views/editPayslip.php @@ -27,7 +27,8 @@ $TotalDeduction = ''; $SalaryAsPerPF = ''; $FoodAllowance=''; - $Incentive = ''; + $Incentive = ''; + $FestBonus = ''; $Advance = ''; $BalanceAdvance = ''; $LessAdvance = ''; @@ -86,7 +87,8 @@ if(!empty($PayInfo)) $TotalDeduction = $ep->TotalDeduction; $SalaryAsPerPF = $ep->SalaryAsPerPF; $FoodAllowance=$ep->FoodAllowance; - $Incentive = $ep->Incentive; + $Incentive = $ep->Incentive; + $FestBonus = $ep->Festival_Bonus; $Advance = $ep->Advance; $BalanceAdvance = $ep->BalanceAdvance; $LessAdvance = $ep->LessAdvance; @@ -106,7 +108,7 @@ if(!empty($PayInfo)) $DOJ = date_format($DOJ,"Y-m-d"); $Designation = $ep->Designation; $DeptName = $ep->DeptName; - $totalearnings = $WorkedSalary + $HRA + $FoodAllowance + $Other_allowances + $Incentive + $OTSalary; + $totalearnings = $WorkedSalary + $HRA + $FoodAllowance + $Other_allowances + $Incentive + $FestBonus + $OTSalary; $totaldeductions = $PF + $EmployeeESI + $Advance + $OtherDeductions; @@ -539,8 +541,8 @@ if(!empty($PayInfo)) - +
@@ -551,7 +553,39 @@ if(!empty($PayInfo)) +
+ +
+
+
+
+
+
+
+ + + + +
+
+
+ +
+
+
+
+ +
+ + +
+ +
+
+ + +
@@ -587,8 +621,8 @@ if(!empty($PayInfo))
- - + +
@@ -744,6 +778,7 @@ function calculateSalary() var otherallowence = 0.00; var otherdeductions = 0.00; var incentive = 0.00; + var festival =0.00; var txtbasicda = 0.00; var txtpf = 0.00; var txthra = 0.00; @@ -773,6 +808,7 @@ function calculateSalary() otherallowence = parseFloat($('#otherallowence').val()); otherdeductions = parseFloat($('#otherdeductions').val()); incentive = parseFloat($('#incentive').val()); + festival = parseFloat($('#festival').val()); txtbasicda = parseFloat($('#txtbasicda').val()); txtpf = parseFloat($('#txtpf').val()); txthra = parseFloat($('#txthra').val()); @@ -787,7 +823,7 @@ function calculateSalary() totaldeductions = parseFloat($('#totaldeductions').val()); netpay = parseFloat($('#netpay').val()); - totalearnings = parseFloat(txtbasicda + txthra + txtfood + otherallowence + incentive + otsalary,2); + totalearnings = parseFloat(txtbasicda + txthra + txtfood + otherallowence + incentive + festival + otsalary,2); totaldeductions = parseFloat(otherdeductions + txtpf + txtesi + txtloandue,2); netpay = totalearnings - totaldeductions;