Merge pull request 'added reinitialize button (copy button from empay info)' (#30) from paulcortezl5 into main

Reviewed-on: #30
pull/31/head
paul 5 months ago
commit 85a5799b98

@ -63,6 +63,7 @@ $routes->get('payroll/emppaytrans/(:num)', 'PayrollController::employeePayrollTr
$routes->get('payroll/emppaytransviewempinit/(:num)/(:num)', 'PayrollController::employeePayrollTransactionsViewEmpForInit/$1/$2');
$routes->get('payroll/emppaytransinit/(:num)/(:num)/(:num)', 'PayrollController::empPayTransInitializePayroll/$1/$2/$3');
$routes->get('payroll/emppaytransempinit/(:num)/(:num)', 'PayrollController::empPayTransInitializeEmpPayroll/$1/$2');
$routes->get('payroll/emppaytransempreinitpay/(:num)/(:num)/(:num)', 'PayrollController::empPayTransReInitEmpPayroll/$1/$2/$3');
$routes->post('payroll/emppaytransupdateworkdays', 'PayrollController::employeePayrollTransactionsEditDaysWorked');
$routes->get('payroll/emppaytransrecom/(:num)', 'PayrollController::employeePayrollTransactionsRecompute/$1');
$routes->post('payroll/saveemppaytransaddinded', 'PayrollController::saveEmpPayTransIncomeDeduction');

@ -542,9 +542,11 @@ class PayrollController extends BaseController
$empAttSum = MiscLib::searchFromAsocArray('employee_id', $trans->employee_id, $attSummary);
$empPayTransHTMLTable->addRow($trans->employee_id, $trans->company_issued_id, $trans->last_name . ', ' . $trans->first_name, $trans->branch_code, $trans->basic_monthly_pay, ($empAttSum === null) ? 0 : $empAttSum->att_work_days);
}
}
$data['tblEmpPayTrans'] = $empPayTransHTMLTable->generate();
$data['tblEmpPayTrans'] = $empPayTransHTMLTable->generate();
}
else
$data['tblEmpPayTrans'] = '<p>No Employee Found on this Payroll Group</p>';
}
else
{
@ -555,9 +557,10 @@ class PayrollController extends BaseController
foreach($empPayTrans as $trans)
{
//$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>';
$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, $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);
// Get Emp Trans In Ded
$empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
@ -743,6 +746,33 @@ class PayrollController extends BaseController
return redirect()->back()->withInput()->with('message', 'Payroll processed. Please verify the entries.');
}
public function empPayTransReInitEmpPayroll($emppaytransid, $employeeid, $paytypeid)
{
$empPayTransactionModel = new EmployeePayTransactionModel();
$currentEmpPayTransaction = $empPayTransactionModel->find($emppaytransid);
$empPayInfo = (new EmployeePayrollInfoModel())->where(['employee_id'=>$employeeid, 'paytype_id'=>$paytypeid])->first();
if($empPayInfo == null)
return redirect()->back()->withInput()->with('error', 'Employee Payroll Information not found. Please check payroll information.');
$attSummary = (new AttendanceSummaryModel())->where('paytrans_id', $currentEmpPayTransaction->paytrans_id)->findAll();
$empAttSum = MiscLib::searchFromAsocArray('employee_id', $empPayInfo->employee_id, $attSummary);
$empPayTransaction = new EmployeePayTransaction();
$empPayTransaction->fill($this->empPayTransFillArrayFromEmpPayInfo($currentEmpPayTransaction->paytrans_id, $empPayInfo, $empAttSum));
$empPayTransaction->emppaytrans_id = $emppaytransid;
if($empPayTransactionModel->save($empPayTransaction))
{
$this->computeEmployeePayroll($emppaytransid, true);
return redirect()->back()->withInput()->with('message', 'Payroll re-initialize. Please verify the entries.');
}
else
return redirect()->back()->withInput()->with('error', 'Failed to re-initialize payroll.');
}
public function employeePayrollTransactionsEditDaysWorked()
{
$empPayTransModel = new EmployeePayTransactionModel();

@ -538,14 +538,20 @@
<?php endif; ?>
</div>
<div class="card-footer">
<?php if($paygroupid != null && $paygroupid != -1): ?>
<?php if($transactionStatus == 'INIT'): ?>
<a class="btn btn-warning" href="/payroll/emppaytransinit/<?= $payTrans->paytrans_id.'/'.$paygroupid.'/'.$payTrans->paytype_id ?>">Initialize Payroll</a>
<?php if(strpos($tblEmpPayTrans, 'No Employee Found') === false): ?>
<a class="btn btn-warning" href="/payroll/emppaytransinit/<?= $payTrans->paytrans_id.'/'.$paygroupid.'/'.$payTrans->paytype_id ?>">Initialize Payroll</a>
<?php endif; ?>
<?php elseif($transactionStatus == 'OPEN'): ?>
<a class="btn btn-primary" href="/payroll/emppaytransinit">View Report Summary</a>
<a class="btn btn-warning" href="/payroll/emppaytransviewempinit/<?= $payTrans->paytrans_id.'/'.$paygroupid ?>">Initialize Employee</a>
<?php else: ?>
<a class="btn btn-danger" href="/payroll/emppaytransinit/">Re-open Payroll</a>
<?php endif; ?>
<?php endif; ?>
</div>
</div>
</div>

Loading…
Cancel
Save