From 585de418867ba1c07204008fca017d31b520eb25 Mon Sep 17 00:00:00 2001 From: paulcortez Date: Sun, 24 Nov 2024 14:47:33 +0800 Subject: [PATCH] added reinitialize button (copy button from empay info) added reinitialize button (copy button from empay info) --- app/Config/Routes.php | 1 + app/Controllers/PayrollController.php | 36 +++++++++++++++++++-- app/Views/payroll/emppaytransactionview.php | 8 ++++- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 9bf238a..a4f0380 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -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'); diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php index 9e016bc..fd819c4 100644 --- a/app/Controllers/PayrollController.php +++ b/app/Controllers/PayrollController.php @@ -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'] = '

No Employee Found on this Payroll Group

'; } else { @@ -555,9 +557,10 @@ class PayrollController extends BaseController foreach($empPayTrans as $trans) { //$iconView = ''; + $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, $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(); diff --git a/app/Views/payroll/emppaytransactionview.php b/app/Views/payroll/emppaytransactionview.php index fd24760..d1ffa25 100644 --- a/app/Views/payroll/emppaytransactionview.php +++ b/app/Views/payroll/emppaytransactionview.php @@ -538,14 +538,20 @@ -- 2.39.2