SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

festival bonus added in edit payslip screen

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-01-19 13:04:01 +05:30
parent 130a65eb05
commit 7e18560ea3
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
application/views/editPayslip.php
View File

@ -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))
</div>
</div>
</div>
<div class="col-md-3">
</div>
@ -551,7 +553,39 @@ if(!empty($PayInfo))
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<center><label style="display:block;text-align:right;"><h4>Festival Bonus</h4></label></center>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<input type="text" class="form-control num" id="festival" name="festival" value="<?php echo $FestBonus;?>" onchange="calculateSalary();" readonly>
</div>
</div>
</div>
<div class="col-md-3">
</div>
<div class="col-md-3">
</div>
</div>
<div class="row">
@ -587,8 +621,8 @@ if(!empty($PayInfo))
</div>
</div>
<legend></legend>
<div class="row">
@ -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;