fixing computation on allowances

fixing computation on allowances
pull/19/head
paulcortez 7 months ago
parent 1440358af9
commit 82094166aa

@ -51,4 +51,16 @@ class PayrollComputation
return $tax;
}
// rawData should contain is_fixed_amt, is_percent_amt, worked_days_based and amount
// $empPayTrans is from EmployeePayTransactionModel();
public function computeIncomeDeductionByComputationType($rawData, $empPayTrans)
{
$amount = 0;
if($rawData['is_fixed_amt']) $amount = $rawData['amount'];
else if($rawData['is_percent_amt']) $amount = ($rawData['amount'] / 100) * $empPayTrans->basic_pay;
else if($rawData['worked_days_based']) $amount = $rawData['amount'] * $empPayTrans->actual_work_days;
return $amount;
}
}

@ -46,7 +46,7 @@ $routes->post('payroll/saveemppayinfo', 'PayrollController::saveEmployeePayrollI
$routes->get('payroll/delempayinfo/(:num)', 'PayrollController::deleteEmployeePayrollInfo/$1');
$routes->get('payroll/compben', 'PayrollController::employeeCompensationBenefits');
$routes->post('payroll/addcompben', 'PayrollController::addEmployeeCompensationBenefits');
$routes->post('payroll/savecompben', 'PayrollController::saveEmployeeCompensationBenefits');
$routes->post('payroll/delcomben', 'PayrollController::deleteEmployeeCompensationBenefits');
$routes->get('payroll/paysettings', 'PayrollController::payrollSettings');
@ -59,7 +59,7 @@ $routes->get('payroll/emppaytrans/(:num)', 'PayrollController::employeePayrollTr
$routes->get('payroll/emppaytransinit/(:num)/(:num)/(:num)', 'PayrollController::empPayTransInitializePayroll/$1/$2/$3');
$routes->post('payroll/emppaytransupdateworkdays', 'PayrollController::employeePayrollTransactionsEditDaysWorked');
$routes->get('payroll/emppaytransrecom/(:num)', 'PayrollController::employeePayrollTransactionsRecompute/$1');
$routes->post('payroll/emppaytransaddinded', 'PayrollController::addEmpPayTransIncomeDeduction');
$routes->post('payroll/saveemppaytransaddinded', 'PayrollController::saveEmpPayTransIncomeDeduction');
$routes->get('payroll/emppaytransdelinded/(:num)/(:num)', 'PayrollController::deleteEmpPayTransIncomeDeduction/$1/$2');

@ -383,7 +383,7 @@ class PayrollController extends BaseController
return view('payroll/compensationbenefitsview', $data);
}
public function addEmployeeCompensationBenefits()
public function saveEmployeeCompensationBenefits()
{
$empPayInDed = new EmpPayIncomeDeduction();
$empPayInDedModel = new EmpPayIncomeDeductionModel();
@ -393,6 +393,7 @@ class PayrollController extends BaseController
// Initialize all payroll type fields to 0
$rawData['is_fixed_amt'] = 0;
$rawData['is_percent_amt'] = 0;
$rawData['worked_days_based'] = 0;
// Handle radio button input
if (isset($rawData['amount_type'])) {
@ -403,6 +404,9 @@ class PayrollController extends BaseController
case 'perc':
$rawData['is_percent_amt'] = 1;
break;
case 'daysbased':
$rawData['worked_days_based'] = 1;
break;
}
}
@ -615,7 +619,8 @@ class PayrollController extends BaseController
$empPayTransInDed = new EmpPayTransIncomeDeduction();
$empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
$amount = $empPayInDed->is_fixed_amt ? $empPayInDed->amount : ($empPayInDed->amount / 100) * $empPayTransaction->basic_pay;
$payCompute = new PayrollComputation();
$amount = $payCompute->computeIncomeDeductionByComputationType($rawData, $empPayTransaction);
$empPayTransInDed->fill(
['emppaytrans_id' => $empPayTransaction->emppaytrans_id,
@ -628,6 +633,7 @@ class PayrollController extends BaseController
'include_in_gross' => $empPayInDed->include_in_gross,
'is_fixed_amt' => $empPayInDed->is_fixed_amt,
'is_percent_amt' => $empPayInDed->is_percent_amt,
'worked_days_based' => $empPayInDed->worked_days_based,
'amount' => $amount,
'base_amount' => $empPayInDed->amount,
'is_override' => $empPayInDed->is_override]
@ -660,7 +666,7 @@ class PayrollController extends BaseController
return redirect()->back()->with('message', 'Employee Payroll Recomputed');
}
public function addEmpPayTransIncomeDeduction()
public function saveEmpPayTransIncomeDeduction()
{
$empPayTransInDed = new EmpPayTransIncomeDeduction();
$empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
@ -672,6 +678,7 @@ class PayrollController extends BaseController
// Initialize all payroll type fields to 0
$rawData['is_fixed_amt'] = 0;
$rawData['is_percent_amt'] = 0;
$rawData['worked_days_based'] = 0;
// Handle radio button input
if (isset($rawData['amount_type'])) {
@ -682,6 +689,9 @@ class PayrollController extends BaseController
case 'perc':
$rawData['is_percent_amt'] = 1;
break;
case 'daysbased':
$rawData['worked_days_based'] = 1;
break;
}
}
@ -690,10 +700,13 @@ class PayrollController extends BaseController
$empPayTrans = $empPayTransactionModel->find($rawData['emppaytrans_id']);
$incomeDeduction = $incomeDeductionModel->find($rawData['inded_id']);
$amount = $rawData['is_fixed_amt'] ? $rawData['amount'] : ($rawData['amount'] / 100) * $empPayTrans->basic_pay;
//$amount = $rawData['is_fixed_amt'] ? $rawData['amount'] : ($rawData['amount'] / 100) * $empPayTrans->basic_pay;
$payCompute = new PayrollComputation();
$amount = $payCompute->computeIncomeDeductionByComputationType($rawData, $empPayTrans);
$empPayTransInDed->fill(
['emppaytrans_id' => $rawData['emppaytrans_id'],
['emppaytransinded_id' => (isset($rawData['emppaytransinded_id'])) ? $rawData['emppaytransinded_id'] : null,
'emppaytrans_id' => $rawData['emppaytrans_id'],
'inded_id' => $rawData['inded_id'],
'payslip_display' => $incomeDeduction->payslip_display,
'inded_name' => $incomeDeduction->inded_name,
@ -703,6 +716,7 @@ class PayrollController extends BaseController
'include_in_gross' => $incomeDeduction->include_in_gross,
'is_fixed_amt' => $rawData['is_fixed_amt'],
'is_percent_amt' => $rawData['is_percent_amt'],
'worked_days_based' => $rawData['worked_days_based'],
'amount' => $amount,
'base_amount' => $rawData['amount'],
'is_override' => $rawData['is_override']]
@ -711,6 +725,10 @@ class PayrollController extends BaseController
if($empPayTransInDedModel->save($empPayTransInDed))
{
$this->computeEmployeePayroll($rawData['emppaytrans_id'], true, $empPayTransactionModel, $empPayTransInDedModel);
if(isset($rawData['emppaytransinded_id']))
return redirect()->back()->with('message', 'Income or Deduction Updated');
else
return redirect()->back()->with('message', 'Income or Deduction Added');
}
else

@ -0,0 +1,30 @@
<?php
namespace App\Database\Migrations;
use CodeIgniter\Database\Migration;
class AddWrkHrsBasedOnEmpPayTransIncomeDeduction extends Migration
{
public function up()
{
$fields = [
'worked_days_based' => [
'type' => 'TINYINT',
'constraint' => 1,
'null' => false,
'after' => 'is_percent_amt',
],
];
$this->forge->addColumn('emp_pay_trans_inded', $fields);
}
public function down()
{
$fields = [
'worked_days_based',
];
$this->forge->dropColumn('emp_pay_trans_inded', $fields);
}
}

@ -0,0 +1,30 @@
<?php
namespace App\Database\Migrations;
use CodeIgniter\Database\Migration;
class AddWrkDyasBasedOnEmpPayIncomeDeduction extends Migration
{
public function up()
{
$fields = [
'worked_days_based' => [
'type' => 'TINYINT',
'constraint' => 1,
'null' => false,
'after' => 'is_percent_amt',
],
];
$this->forge->addColumn('emp_pay_inded', $fields);
}
public function down()
{
$fields = [
'worked_days_based',
];
$this->forge->dropColumn('emp_pay_inded', $fields);
}
}

@ -13,6 +13,7 @@ class EmpPayIncomeDeduction extends Entity
'inded_id' => null,
'is_fixed_amt' => null,
'is_percent_amt' => null,
'worked_days_based' => null,
'amount' => null,
'is_override' => null,
];

@ -18,6 +18,7 @@ class EmpPayTransIncomeDeduction extends Entity
'include_in_gross' => null,
'is_fixed_amt' => null,
'is_percent_amt' => null,
'worked_days_based' => null,
'amount' => null,
'base_amount' => null,
'is_override' => null,

@ -17,6 +17,7 @@ class EmpPayIncomeDeductionModel extends Model
'inded_id',
'is_fixed_amt',
'is_percent_amt',
'worked_days_based',
'amount',
'is_override',
];

@ -22,6 +22,7 @@ class EmpPayTransIncomeDeductionModel extends Model
'include_in_gross',
'is_fixed_amt',
'is_percent_amt',
'worked_days_based',
'amount',
'base_amount',
'is_override'];

@ -35,7 +35,7 @@
<div class="modal fade" id="mdlAddIncome">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/addcompben') ?>" method="post">
<form action="<?= url_to('payroll/savecompben') ?>" method="post">
<div class="modal-header">
<h4 class="modal-title" >New Employee Income</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -69,6 +69,11 @@
<input class="form-check-input" type="radio" id="rdoInPercentageAmount" name="amount_type" value="perc">
<label for="rdoInPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoInDaysBasedAmount" name="amount_type" value="daysbased">
<label for="rdoInDaysBasedAmount" class="form-check-label">Daily based amount.</label>
<p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
</div>
</div>
<div class="form-group">
<label for="txtInAmount">Amount</label>
@ -104,7 +109,7 @@
<div class="modal fade" id="mdlAddDeduction">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/addcompben') ?>" method="post">
<form action="<?= url_to('payroll/savecompben') ?>" method="post">
<div class="modal-header">
<h4 class="modal-title" >New Employee Deduction</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -138,6 +143,11 @@
<input class="form-check-input" type="radio" id="rdoDedPercentageAmount" name="amount_type" value="perc">
<label for="rdoDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoDedDaysBasedAmount" name="amount_type" value="daysbased">
<label for="rdoDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
<p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
</div>
</div>
<div class="form-group">
<label for="txtDedAmount">Amount</label>
@ -173,7 +183,7 @@
<div class="modal fade" id="mdlEditIncome">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/addcompben') ?>" method="post">
<form action="<?= url_to('payroll/savecompben') ?>" method="post">
<div class="modal-header bg-warning">
<h4 class="modal-title" >Edit Employee Income</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -189,8 +199,8 @@
<div class="col-12">
<div class="form-group">
<div class="form-group">
<label for="txtEditInInDedName">Income Name</label>
<input class="form-control" type="text" readonly id="txtEditInInDedName" name="inded_name">
<label for="txtEditInDedName">Income Name</label>
<input class="form-control" type="text" readonly id="txtEditInDedName" name="inded_name">
</div>
<input type="hidden" id="txtEditInEmpPayIndedId" name="emppayinded_id" > <!-- Primary Key -->
<input type="hidden" name="emppay_id" value="<?= $selectedEmployee->emppay_id ?>" >
@ -207,6 +217,11 @@
<input class="form-check-input" type="radio" id="rdoEditInPercentageAmount" name="amount_type" value="perc">
<label for="rdoEditInPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoEditInDaysBasedAmount" name="amount_type" value="daysbased">
<label for="rdoEditInDaysBasedAmount" class="form-check-label">Daily based amount.</label>
<p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
</div>
</div>
<div class="form-group">
<label for="txtEditInAmount">Amount</label>
@ -242,7 +257,7 @@
<div class="modal fade" id="mdlEditDeduction">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/addcompben') ?>" method="post">
<form action="<?= url_to('payroll/savecompben') ?>" method="post">
<div class="modal-header bg-warning">
<h4 class="modal-title" >Edit Employee Deduction</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -276,6 +291,11 @@
<input class="form-check-input" type="radio" id="rdoEditDedPercentageAmount" name="amount_type" value="perc">
<label for="rdoEditDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoEditDedDaysBasedAmount" name="amount_type" value="daysbased">
<label for="rdoEditDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
<p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
</div>
</div>
<div class="form-group">
<label for="txtEditDedAmount">Amount</label>
@ -519,14 +539,17 @@ $(document).ready(function() {
function editIncome(element) {
$('#txtEditInInDedName').val($(element).data('inded_name'));
$('#txtEditInDedName').val($(element).data('inded_name'));
$('#txtEditInEmpPayIndedId').val($(element).data('emppayinded_id'));
//$('#emppay_id').val($(element).data('emppay_id'));
//$('#payschedule_id').val($(element).data('payschedule_id'));
$('#txtEditInInDedId').val($(element).data('inded_id'));
$("[name='amount_type'][value='" + ($(element).data('is_fixed_amt') ? 'fixed' : 'perc') + "']").prop('checked', true);
$("[name='amount_type'][value='" + ($(element).data('is_fixed_amt') ? 'fixed' : ($(element).data('is_percent_amt') ? 'perc' : 'daysbased')) + "']").prop('checked', true);
//$("[name='amount_type'][value='" + ($(element).data('is_fixed_amt') ? 'fixed' : 'perc') + "']").prop('checked', true);
$('#txtEditInAmount').val($(element).data('amount'));
$('#chkEditInIsOverride').val($(element).data('is_override'));
$('#chkEditInIsOverride').prop('checked', $(element).data('is_override'));
$('#mdlEditIncome').modal('show');
}
@ -536,10 +559,12 @@ function editDeduction(element) {
$('#txtEditDedInDedName').val($(element).data('inded_name'));
$('#txtEditDedEmpPayIndedId').val($(element).data('emppayinded_id'));
$('#txtEditDedInDedId').val($(element).data('inded_id'));
$("[name='amount_type'][value='" + ($(element).data('is_fixed_amt') ? 'fixed' : 'perc') + "']").prop('checked', true);
$('#txtEditDedAmount').val($(element).data('amount'));
$('#chkEditDedIsOverride').val($(element).data('is_override'));
$('[name="amount_type"][value="' + ($(element).data('is_fixed_amt') ? 'fixed' : ($(element).data('is_percent_amt') ? 'perc' : 'daysbased')) + '"]').prop('checked', true);
//$("[name='amount_type'][value='" + ($(element).data('is_fixed_amt') ? 'fixed' : 'perc') + "']").prop('checked', true);
$('#txtEditDedAmount').val($(element).data('amount'));
$('#chkEditDedIsOverride').prop('checked', $(element).data('is_override'));
$('#mdlEditDeduction').modal('show');
}

@ -35,7 +35,7 @@
<div class="modal fade" id="mdlAddIncome">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/emppaytransaddinded') ?>" method="post">
<form action="<?= url_to('payroll/saveemppaytransaddinded') ?>" method="post">
<div class="modal-header">
<h4 class="modal-title" >New Payroll Transaction</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -67,6 +67,11 @@
<input class="form-check-input" type="radio" id="rdoInPercentageAmount" name="amount_type" value="perc">
<label for="rdoInPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoInDaysBasedAmount" name="amount_type" value="daysbased">
<label for="rdoInDaysBasedAmount" class="form-check-label">Daily based amount.</label>
<p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
</div>
</div>
<div class="form-group">
<label for="txtInAmount">Amount</label>
@ -97,7 +102,7 @@
<div class="modal fade" id="mdlAddDeduction">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/emppaytransaddinded') ?>" method="post">
<form action="<?= url_to('payroll/saveemppaytransaddinded') ?>" method="post">
<div class="modal-header">
<h4 class="modal-title" >New Payroll Transaction</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -122,22 +127,93 @@
</div>
<div class="form-group">
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed" checked>
<label for="rdoInFixedAmount" class="form-check-label">Fixed amount.</label>
<input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed" checked>
<label for="rdoDedFixedAmount" class="form-check-label">Fixed amount.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoInPercentageAmount" name="amount_type" value="perc">
<label for="rdoInPercentageAmount" class="form-check-label">Amount is in percentage.</label>
<input class="form-check-input" type="radio" id="rdoDedPercentageAmount" name="amount_type" value="perc">
<label for="rdoDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoDedDaysBasedAmount" name="amount_type" value="daysbased">
<label for="rdoDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
<p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
</div>
</div>
<div class="form-group">
<label for="txtInAmount">Amount</label>
<input class="form-control" type="text" id="txtInAmount" name="amount" step="0.01" values="<?= old('amount') ?>">
<label for="txtDedAmount">Amount</label>
<input class="form-control" type="text" id="txtDedAmount" name="amount" step="0.01" values="<?= old('amount') ?>">
</div>
<div class="form-group">
<div class="custom-control custom-checkbox">
<input class="custom-control-input" type="checkbox" id="chkInIsOverride" name="is_override">
<label for="chkInIsOverride" class="custom-control-label">Override computations if there are any.</label>
<input class="custom-control-input" type="checkbox" id="chkDedIsOverride" name="is_override">
<label for="chkDedIsOverride" class="custom-control-label">Override computations if there are any.</label>
<p><small><i>Override will implement this amount and not the computational amount made like in SSS, Philhealth, Pag-IBIG and taxastion</i></small></p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</form>
</div>
</div>
</div>
<!-- Modal Edit Income Deduction -->
<div class="modal fade" id="mdlEditIncomeDeduction">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/saveemppaytransaddinded') ?>" method="post">
<div class="modal-header bg-warning">
<h4 class="modal-title" >Edit Income or Deduction</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="row">
<div class="col-12">
<p class="lead">Income or Deduction Information</p>
<div class="row">
<div class="col-12">
<div class="form-group">
<label for="txtEditInDedName">Income Name</label>
<input class="form-control" type="text" readonly id="txtEditInDedName" name="inded_name">
<input type="hidden" name="emppaytransinded_id" id="hdnEditInDedEmpPayTransInDedId" >
<input type="hidden" name="emppaytrans_id" id="hdnEditInDedEmpPayTransId" >
<input type="hidden" name="inded_id" id="hdnEditInDedInDedId" >
</div>
<div class="form-group">
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoEditInDedFixedAmount" name="amount_type" value="fixed" checked>
<label for="rdoEditInDedFixedAmount" class="form-check-label">Fixed amount.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoEditInDedPercentageAmount" name="amount_type" value="perc">
<label for="rdoEditInDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoEditInDedDaysBasedAmount" name="amount_type" value="daysbased">
<label for="rdoEditInDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
<p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
</div>
</div>
<div class="form-group">
<label for="txtEditInDedAmount">Amount</label>
<input class="form-control" type="text" id="txtEditInDedAmount" name="amount" step="0.01" values="<?= old('amount') ?>">
<p id="lblEditInDed_daysbased"></p>
</div>
<div class="form-group">
<div class="custom-control custom-checkbox">
<input class="custom-control-input" type="checkbox" id="chkEditInDedIsOverride" name="is_override">
<label for="chkEditInDedIsOverride" class="custom-control-label">Override computations if there are any.</label>
<p><small><i>Override will implement this amount and not the computational amount made like in SSS, Philhealth, Pag-IBIG and taxastion</i></small></p>
</div>
</div>
@ -347,6 +423,18 @@
<?php if($empPayTransInDed->is_income) echo number_format($empPayTransInDed->amount, 2, ".", ","); else echo "&nbsp;"; ?>
</td>
<td>
<a href="#" class="ml-3" data-toggle="tooltip" title="Edit Income or Deduction"
data-emppaytransinded_id="<?= $empPayTransInDed->emppaytransinded_id ?>"
data-emppaytrans_id="<?= $empPayTransInDed->emppaytrans_id ?>"
data-inded_id="<?= $empPayTransInDed->inded_id ?>"
data-inded_name="<?= $empPayTransInDed->inded_name ?>"
data-is_fixed_amt="<?= $empPayTransInDed->is_fixed_amt ?>"
data-is_percent_amt="<?= $empPayTransInDed->is_percent_amt ?>"
data-worked_days_based="<?= $empPayTransInDed->worked_days_based ?>"
data-amount="<?= $empPayTransInDed->amount ?>"
data-base_amount="<?= $empPayTransInDed->base_amount ?>"
data-is_override="<?= $empPayTransInDed->is_override ?>"
onclick="editIncomeDeduction(this)"><i class="fas fa-edit "></i></a>
<a href="/payroll/emppaytransdelinded/<?= $empPayTransInDed->emppaytransinded_id.'/'.$empPayTransInDed->emppaytrans_id ?>" onclick="return confirm('Are you sure you want to delete this item?')" class="ml-3" data-toggle="tooltip" title="Delete Employee Information"><i class="fas fa-trash "></i></a>
</td>
</tr>
@ -434,6 +522,32 @@ function showEmpPayTransDetails(emppaytransid)
$("#txtDedEmpPayTransId").val(emppaytransid);
}
function editIncomeDeduction(element)
{
$('#hdnEditInDedEmpPayTransInDedId').val($(element).data("emppaytransinded_id"));
$('#hdnEditInDedEmpPayTransId').val($(element).data("emppaytrans_id"));
$('#hdnEditInDedInDedId').val($(element).data("inded_id"));
$('#txtEditInDedName').val($(element).data('inded_name'));
$('[name="amount_type"][value="' + ($(element).data('is_fixed_amt') ? 'fixed' : ($(element).data('is_percent_amt') ? 'perc' : 'daysbased')) + '"]').prop('checked', true);
if($(element).data('worked_days_based'))
{
$('#txtEditInDedAmount').val($(element).data('base_amount'));
$('#lblEditInDed_daysbased').html('Computed amount is ' + $(element).data('amount'))
}
else
{
$('#txtEditInDedAmount').val($(element).data('amount'));
$('#lblEditInDed_daysbased').html('');
}
$('#chkEditInDedIsOverride').prop('checked', $(element).data('is_override'));
$('#mdlEditIncomeDeduction').modal('show');
}
</script>
<?= $this->endSection() ?>

Loading…
Cancel
Save