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

Merge pull request 'change default radio button on income and deduction with delete on emp transaction' (#37) from paulcortezl5 into main

Browse Source 
Reviewed-on: #37
pull/38/head
paul 4 months ago
parent af1bb2f57c a4142e9936
commit f24147a995
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -70,6 +70,7 @@ $routes->post('payroll/emppaytransupdateworkdays', 'PayrollController::employeeP
$routes->get('payroll/emppaytransrecom/(:num)', 'PayrollController::employeePayrollTransactionsRecompute/$1');
$routes->post('payroll/saveemppaytransaddinded', 'PayrollController::saveEmpPayTransIncomeDeduction');
$routes->get('payroll/emppaytransdelinded/(:num)/(:num)', 'PayrollController::deleteEmpPayTransIncomeDeduction/$1/$2');
$routes->get('payroll/emppaytransdel/(:num)', 'PayrollController::employeePayrollTransactionsDeleteEmp/$1');
$routes->get('payroll/emppaytransreport/(:num)/(:num)', 'PayrollController::empPayransReport/$1/$2');

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

@ -599,8 +599,9 @@ class PayrollController extends BaseController
//$iconView = '<a href="#" class="ml-3" data-toggle="tooltip" title="View Information" onclick="showEmpPayTransDetails('.$trans->emppaytrans_id.')"><i class="fas fa-eye "></i></a>';
$iconCopy = '<a href="/payroll/emppaytransempreinitpay/' . $trans->emppaytrans_id . '/' . $trans->employee_id . '/' . $trans->paytype_id . '" class="ml-3" data-toggle="tooltip" title="Copy from Payroll Information" onclick="return confirm(\'This will copy payroll information to this record but income and deduction is not affected. Would you like to proceed?\')"><i class="fa fa-copy" aria-hidden="true"></i></a>';
$iconEdit = '<a href="#" class="ml-3" data-toggle="tooltip" title="Edit Information" onclick="showEmpPayTransDetails(' . $trans->emppaytrans_id . ')"><i class="fas fa-edit "></i></a>';
$iconDelete = '<a href="/payroll/emppaytransdelete/' . $trans->emppaytrans_id . '" class="ml-3" data-toggle="tooltip" title="Delete Information" onclick="return confirm(\'Are you sure you want to delete this record?\')"><i class="fas fa-trash"></i></a>';
$empPayTransHTMLTable->addRow($trans->employee_id, $trans->last_name . ', ' . $trans->first_name, $trans->branch_code, $trans->basic_pay, $trans->actual_work_days, $trans->gross_income, $trans->total_deduction, $trans->net_pay, $iconCopy . ' ' . $iconEdit);
$empPayTransHTMLTable->addRow($trans->employee_id, $trans->last_name . ', ' . $trans->first_name, $trans->branch_code, $trans->basic_pay, $trans->actual_work_days, $trans->gross_income, $trans->total_deduction, $trans->net_pay, $iconCopy . ' ' . $iconEdit . ' ' . $iconDelete);
// Get Emp Trans In Ded
$empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
@ -648,6 +649,14 @@ class PayrollController extends BaseController
return view('payroll/emppaytransinitempview', $data);
}
public function employeePayrollTransactionsDeleteEmp($emppaytransid)
{
if((new EmployeePayTransactionModel())->delete($emppaytransid))
return redirect()->back()->with('message', 'Employee Payroll Transaction Deleted');
else
return redirect()->back()->with('error', 'Employee Payroll Transaction Deletion Failed');
}
public function empPayTransFillArrayFromEmpPayInfo($paytransid, $empPayInfo, $empAttSum)
{
return [

37
app/Views/payroll/emppaytransactionview.php
Unescape Escape View File

@ -63,18 +63,18 @@
</div>
<div class="form-group">
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed" checked>
<input class="form-check-input" type="radio" id="rdoInDaysBasedAmount" name="amount_type" value="daysbased" checked>
<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 class="form-check">
<input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed">
<label for="rdoInFixedAmount" 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>
</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>
@ -130,18 +130,19 @@
</div>
<div class="form-group">
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed" checked>
<input class="form-check-input" type="radio" id="rdoDedDaysBasedAmount" name="amount_type" value="daysbased" checked>
<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 class="form-check">
<input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed">
<label for="rdoDedFixedAmount" class="form-check-label">Fixed amount.</label>
</div>
<div class="form-check">
<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>
@ -195,18 +196,18 @@
</div>
<div class="form-group">
<div class="form-check">
<input class="form-check-input" type="radio" id="rdoEditInDedFixedAmount" name="amount_type" value="fixed" checked>
<input class="form-check-input" type="radio" id="rdoEditInDedDaysBasedAmount" name="amount_type" value="daysbased" checked>
<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 class="form-check">
<input class="form-check-input" type="radio" id="rdoEditInDedFixedAmount" name="amount_type" value="fixed">
<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>

Write Preview
Loading…
Cancel
Save