paul
/
kwpayroll
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

editing of comp benifits

Browse Source 
editing of comp benifits
pull/11/head
paulcortez 7 months ago
parent e76e139f18
commit 47faf1033c
4 changed files with 157 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
app/Config/Auth.php
Unescape Escape View File

@ -78,7 +78,7 @@ class Auth extends ShieldAuth
public array $redirects = [ public array $redirects = [
'register' => '/hi', 'register' => '/hi',
'login' => '/hi', 'login' => '/hi',
'logout' => 'login', 'logout' => '/login',
'force_reset' => '/', 'force_reset' => '/',
'permission_denied' => '/', 'permission_denied' => '/',
'group_denied' => '/', 'group_denied' => '/',

1
app/Config/Routes.php
Unescape Escape View File

@ -46,6 +46,7 @@ $routes->post('payroll/addemppayinfo', 'PayrollController::addEmployeePayrollInf
$routes->get('payroll/compben', 'PayrollController::employeeCompensationBenefits'); $routes->get('payroll/compben', 'PayrollController::employeeCompensationBenefits');
$routes->post('payroll/addcompben', 'PayrollController::addEmployeeCompensationBenefits'); $routes->post('payroll/addcompben', 'PayrollController::addEmployeeCompensationBenefits');
$routes->post('payroll/delcomben', 'PayrollController::deleteEmployeeCompensationBenefits');
$routes->get('payroll/paysettings', 'PayrollController::payrollSettings'); $routes->get('payroll/paysettings', 'PayrollController::payrollSettings');
$routes->post('payroll/paysettings', 'PayrollController::payrollSettings'); $routes->post('payroll/paysettings', 'PayrollController::payrollSettings');

20
app/Controllers/PayrollController.php
Unescape Escape View File

@ -300,12 +300,26 @@ class PayrollController extends BaseController
$rawData['is_override'] = isset($rawData['is_override']) ? 1 : 0; $rawData['is_override'] = isset($rawData['is_override']) ? 1 : 0;
$empPayInDed->fill($rawData); $empPayInDed->fill($rawData);
$empPayInDedModel->save($empPayInDed);
if($empPayInDedModel->getInsertID() == 0) if($empPayInDedModel->save($empPayInDed))
{
if(isset($rawData['emppayinded_id']))
return redirect()->to('/payroll/compben?payschedid='.$this->request->getPost('payschedule_id').'&empid='.$this->request->getPost('emp_id'))->with('message', 'Employee Compensation Benefits edited');
else
return redirect()->to('/payroll/compben?payschedid='.$this->request->getPost('payschedule_id').'&empid='.$this->request->getPost('emp_id'))->with('message', 'Employee Compensation Benefits Added');
}
else
return redirect()->back()->withInput()->with('error', 'Failed to add employee compensation benefits'); return redirect()->back()->withInput()->with('error', 'Failed to add employee compensation benefits');
}
public function deleteEmployeeCompensationBenefits()
{
$empPayInDedModel = new EmpPayIncomeDeductionModel();
if($empPayInDedModel->delete($this->request->getPost('emppayinded_id')))
return redirect()->to('/payroll/compben?payschedid='.$this->request->getPost('payschedule_id').'&empid='.$this->request->getPost('emp_id'))->with('message', 'Employee Compensation Benefits deleted');
else else
return redirect()->to('/payroll/compben?payschedid='.$this->request->getPost('payschedule_id').'&empid='.$this->request->getPost('emp_id'))->with('message', 'Employee Compensation Benefits Added'); return redirect()->back()->with('error', 'Failed to delete employee compensation benefits');
} }
public function payrollSettings() public function payrollSettings()

170
app/Views/payroll/compensationbenefitsview.php
Unescape Escape View File

@ -62,22 +62,22 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="rdoFixedAmount" name="amount_type" value="fixed" checked> <input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed" checked>
<label for="rdoFixedAmount" class="form-check-label">Fixed amount.</label> <label for="rdoInFixedAmount" class="form-check-label">Fixed amount.</label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="rdoPercentageAmount" name="amount_type" value="perc"> <input class="form-check-input" type="radio" id="rdoInPercentageAmount" name="amount_type" value="perc">
<label for="rdoPercentageAmount" class="form-check-label">Amount is in percentage.</label> <label for="rdoInPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="txtAmount">Amount</label> <label for="txtInAmount">Amount</label>
<input class="form-control" type="number" id="txtAmount" name="amount" values="<?= old('amount') ?>"> <input class="form-control" type="text" id="txtInAmount" name="amount" step="0.01" values="<?= old('amount') ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input class="custom-control-input" type="checkbox" id="chkIsOverride" name="is_override"> <input class="custom-control-input" type="checkbox" id="chkInIsOverride" name="is_override">
<label for="chkIsOverride" class="custom-control-label">Override computations if there are any.</label> <label for="chkInIsOverride" 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> <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>
@ -131,22 +131,22 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="rdoFixedAmount" name="amount_type" value="fixed" checked> <input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed" checked>
<label for="rdoFixedAmount" class="form-check-label">Fixed amount.</label> <label for="rdoDedFixedAmount" class="form-check-label">Fixed amount.</label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="rdoPercentageAmount" name="amount_type" value="perc"> <input class="form-check-input" type="radio" id="rdoDedPercentageAmount" name="amount_type" value="perc">
<label for="rdoPercentageAmount" class="form-check-label">Amount is in percentage.</label> <label for="rdoDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="txtAmount">Amount</label> <label for="txtDedAmount">Amount</label>
<input class="form-control" type="number" id="txtAmount" name="amount" values="<?= old('amount') ?>"> <input class="form-control" type="number" id="txtDedAmount" name="amount" step="0.01" values="<?= old('amount') ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input class="custom-control-input" type="checkbox" id="chkIsOverride" name="is_override"> <input class="custom-control-input" type="checkbox" id="chkDedIsOverride" name="is_override">
<label for="chkIsOverride" class="custom-control-label">Override computations if there are any.</label> <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> <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>
@ -189,33 +189,102 @@
<div class="col-12"> <div class="col-12">
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<label for="txtEmpPayIndedId">Income Name</label> <label for="txtEditInInDedName">Income Name</label>
<input type="hidden" name="emppayinded_id" > <input class="form-control" type="text" readonly id="txtEditInInDedName" name="inded_name">
<input class="form-control" type="text" readonly id="txtEmpPayIndedId" name="inded_name">
</div> </div>
<input type="hidden" id="txtEditInEmpPayIndedId" name="emppayinded_id" > <!-- Primary Key -->
<input type="hidden" name="emppay_id" value="<?= $selectedEmployee->emppay_id ?>" >
<input type="hidden" name="payschedule_id" value="<?= $_GET['payschedid'] ?>"> <input type="hidden" name="payschedule_id" value="<?= $_GET['payschedid'] ?>">
<input type="hidden" id="txtEditInInDedId" name="inded_id">
<input type="hidden" name="emp_id" value="<?= $selectedEmployee->employee_id ?>" >
</div>
<div class="form-group">
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoEditInFixedAmount" name="amount_type" value="fixed">
<label for="rdoEditInFixedAmount" class="form-check-label">Fixed amount.</label>
</div>
<div class="form-check">
<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>
<div class="form-group">
<label for="txtEditInAmount">Amount</label>
<input class="form-control" type="number" id="txtEditInAmount" 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="chkEditInIsOverride" name="is_override">
<label for="chkEditInIsOverride" 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>
<?php else : ?>
<div class="col-12">
<p class="text-danger">No Employee Loaded. Please select employee first</p>
</div>
<?php endif ?>
</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 -->
<div class="modal fade" id="mdlEditDeduction">
<div class="modal-dialog">
<div class="modal-content">
<form action="<?= url_to('payroll/addcompben') ?>" 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">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="row">
<div class="col-12">
<p class="lead">Employee Deduction Information</p>
<div class="row">
<?php if($empLoaded) : ?>
<div class="col-12">
<div class="form-group">
<div class="form-group">
<label for="txtEditDedInDedName">Deduction Name</label>
<input class="form-control" type="text" readonly id="txtEditDedInDedName" name="inded_name">
</div>
<input type="hidden" id="txtEditDedEmpPayIndedId" name="emppayinded_id" > <!-- Primary Key -->
<input type="hidden" name="emppay_id" value="<?= $selectedEmployee->emppay_id ?>" > <input type="hidden" name="emppay_id" value="<?= $selectedEmployee->emppay_id ?>" >
<input type="hidden" name="payschedule_id" value="<?= $_GET['payschedid'] ?>">
<input type="hidden" id="txtEditDedInDedId" name="inded_id">
<input type="hidden" name="emp_id" value="<?= $selectedEmployee->employee_id ?>" > <input type="hidden" name="emp_id" value="<?= $selectedEmployee->employee_id ?>" >
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="rdoFixedAmount" name="amount_type" value="fixed" checked> <input class="form-check-input" type="radio" id="rdoEditDedFixedAmount" name="amount_type" value="fixed">
<label for="rdoFixedAmount" class="form-check-label">Fixed amount.</label> <label for="rdoEditDedFixedAmount" class="form-check-label">Fixed amount.</label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="rdoPercentageAmount" name="amount_type" value="perc"> <input class="form-check-input" type="radio" id="rdoEditDedPercentageAmount" name="amount_type" value="perc">
<label for="rdoPercentageAmount" class="form-check-label">Amount is in percentage.</label> <label for="rdoEditDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="txtAmount">Amount</label> <label for="txtEditDedAmount">Amount</label>
<input class="form-control" type="number" id="txtAmount" name="amount" values="<?= old('amount') ?>"> <input class="form-control" type="number" id="txtEditDedAmount" name="amount" step="0.01" values="<?= old('amount') ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input class="custom-control-input" type="checkbox" id="chkIsOverride" name="is_override"> <input class="custom-control-input" type="checkbox" id="chkEditDedIsOverride" name="is_override">
<label for="chkIsOverride" class="custom-control-label">Override computations if there are any.</label> <label for="chkEditDedIsOverride" 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> <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>
@ -321,9 +390,12 @@
$deductionTotal = 0; $deductionTotal = 0;
?> ?>
<tr> <tr>
<td><span class="pl-3">Basic Salary</span></td> <td>
<span class="pl-3">Basic Salary (Daily)</span><br>
<span class="pl-4 text-sm"><?= number_format($selectedEmployee->basic_daily_pay, 2, ".", ",") ?> </span>
</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td class="text-right"><?= number_format($selectedEmployee->basic_semi_monthly_pay, 2, ".", ",") ?></td> <td class="text-right"><?= number_format($selectedEmployee->basic_daily_pay, 2, ".", ",") ?></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<?php foreach($empPayIncomeList as $empPayIncome):?> <?php foreach($empPayIncomeList as $empPayIncome):?>
@ -343,7 +415,10 @@
data-amount = "<?= $empPayIncome->amount ?>" data-amount = "<?= $empPayIncome->amount ?>"
data-is_override = "<?= $empPayIncome->is_override ?>" data-is_override = "<?= $empPayIncome->is_override ?>"
onclick="editIncome(this)"><i class="fas fa-edit"></i></a> onclick="editIncome(this)"><i class="fas fa-edit"></i></a>
<a href="#" class="ml-3" data-emppayinded_id = "<?= $empPayIncome->emppayinded_id ?>" data-toggle="tooltip" title="Delete Income Information"><i class="fas fa-trash "></i></a> <form action="/payroll/delcomben" method="post" class="ml-3 d-inline-block">
<input type="hidden" name="emppayinded_id" value="<?= $empPayIncome->emppayinded_id ?>">
<a href="#" data-toggle="tooltip" title="Delete Income Information"><i class="fas fa-trash "></i></a>
</form>
</td> </td>
</tr> </tr>
<?php <?php
@ -365,7 +440,17 @@
<td class="text-right">-<?= number_format($empPayDeduction->amount, 2, ".", ",") ?></td> <td class="text-right">-<?= number_format($empPayDeduction->amount, 2, ".", ",") ?></td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
<a href="#" class="ml-3" data-toggle="tooltip" title="Edit Deduction Information" ><i class="fas fa-edit "></i></a> <a href="#" class="ml-3" data-toggle="tooltip" title="Edit Deduction Information"
data-emppayinded_id = "<?= $empPayDeduction->emppayinded_id ?>"
data-inded_name = "<?= $empPayDeduction->inded_name ?>"
data-emppay_id = "<?= $empPayDeduction->emppay_id ?>"
data-payschedule_id = "<?= $empPayDeduction->payschedule_id ?>"
data-inded_id = "<?= $empPayDeduction->inded_id ?>"
data-is_fixed_amt = "<?= $empPayDeduction->is_fixed_amt ?>"
data-is_percent_amt = "<?= $empPayDeduction->is_percent_amt ?>"
data-amount = "<?= $empPayDeduction->amount ?>"
data-is_override = "<?= $empPayDeduction->is_override ?>"
onclick="editDeduction(this)"><i class="fas fa-edit "></i></a>
<a href="#" class="ml-3" data-toggle="tooltip" title="Delete Deduction Information"><i class="fas fa-trash "></i></a> <a href="#" class="ml-3" data-toggle="tooltip" title="Delete Deduction Information"><i class="fas fa-trash "></i></a>
</td> </td>
</tr> </tr>
@ -431,9 +516,30 @@ $('.select2').select2();
function editIncome(element) { function editIncome(element) {
$('#txtEditInInDedName').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);
$('#txtEditInAmount').val($(element).data('amount'));
$('#chkEditInIsOverride').val($(element).data('is_override'));
$('#mdlEditIncome').modal('show'); $('#mdlEditIncome').modal('show');
} }
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'));
$('#mdlEditDeduction').modal('show');
}
</script> </script>
<?= $this->endSection() ?> <?= $this->endSection() ?>

Write Preview
Loading…
Cancel
Save