From 740e74faebac24e1275e91759d348893c6f98937 Mon Sep 17 00:00:00 2001 From: paulcortez Date: Mon, 14 Oct 2024 18:54:41 +0800 Subject: [PATCH] activated soft delete activated soft delete --- app/Config/Routes.php | 1 + app/Controllers/PayrollController.php | 13 ++++++++++++- app/Models/CompanyBranchModel.php | 2 +- app/Models/CompanyDepartmentModel.php | 2 +- app/Models/CompanyInfoModel.php | 2 +- app/Models/EmpPayIncomeDeductionModel.php | 8 +++++--- app/Models/EmpPayTransIncomeDeductionModel.php | 8 +++++--- app/Models/EmployeeModel.php | 2 +- app/Models/EmployeePayTransactionModel.php | 5 +++-- app/Models/EmployeePayrollInfoModel.php | 9 ++++++--- app/Models/EmploymentStatusModel.php | 2 +- app/Models/IncomeDeductionModel.php | 2 +- app/Models/JobTitleModel.php | 2 +- app/Models/PayrollGroupModel.php | 2 +- app/Models/PayrollScheduleModel.php | 2 +- app/Models/PayrollTransactionModel.php | 2 +- app/Models/PayrollTypeModel.php | 2 +- app/Models/SettingsModel.php | 2 +- app/Views/payroll/emppaytransactionview.php | 2 +- 19 files changed, 45 insertions(+), 25 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 503176c..7cbcac7 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -43,6 +43,7 @@ $routes->post('payroll/addpaytype', 'PayrollController::addPayrollType'); $routes->get('payroll/emppayinfo', 'PayrollController::employeePayrollInfo'); $routes->post('payroll/addemppayinfo', 'PayrollController::addEmployeePayrollInfo'); +$routes->get('payroll/delempayinfo/(:num)', 'PayrollController::deleteEmployeePayrollInfo/$1'); $routes->get('payroll/compben', 'PayrollController::employeeCompensationBenefits'); $routes->post('payroll/addcompben', 'PayrollController::addEmployeeCompensationBenefits'); diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php index 708a0df..a5905b1 100644 --- a/app/Controllers/PayrollController.php +++ b/app/Controllers/PayrollController.php @@ -270,8 +270,9 @@ class PayrollController extends BaseController foreach($empPayInfos as $empPayInfo) { $iconView = ''; + $iconDelete = ''; - $empPayInfoHTMLTable->addRow($empPayInfo->emppay_id, $empPayInfo->paytype_name, $empPayInfo->company_issued_id, $empPayInfo->last_name . ', ' . $empPayInfo->first_name, $empPayInfo->basic_monthly_pay, $empPayInfo->basic_semi_monthly_pay, $empPayInfo->basic_daily_pay, $empPayInfo->basic_hourly_pay, $iconView); + $empPayInfoHTMLTable->addRow($empPayInfo->emppay_id, $empPayInfo->paytype_name, $empPayInfo->company_issued_id, $empPayInfo->last_name . ', ' . $empPayInfo->first_name, $empPayInfo->basic_monthly_pay, $empPayInfo->basic_semi_monthly_pay, $empPayInfo->basic_daily_pay, $empPayInfo->basic_hourly_pay, $iconView." ".$iconDelete); } $data['tblEmpPayInfo'] = $empPayInfoHTMLTable->generate(); @@ -303,6 +304,16 @@ class PayrollController extends BaseController return redirect()->to('/payroll/emppayinfo')->with('message', 'Employee Payroll Type Added'); } + public function deleteEmployeePayrollInfo($emppayid) + { + $empPayInfoModel = new EmployeePayrollInfoModel(); + + if($empPayInfoModel->delete($emppayid)) + return redirect()->back()->with('message', 'Employee Deleted on Payroll'); + else + return redirect()->back()->with('error', 'Failed to delete employee on payroll'); + } + public function employeeCompensationBenefits() { $empPayInfoModel = new EmployeePayrollInfoModel(); diff --git a/app/Models/CompanyBranchModel.php b/app/Models/CompanyBranchModel.php index 2bc5cdf..e09df53 100644 --- a/app/Models/CompanyBranchModel.php +++ b/app/Models/CompanyBranchModel.php @@ -10,7 +10,7 @@ class CompanyBranchModel extends Model protected $primaryKey = 'branch_code'; protected $useAutoIncrement = false; protected $returnType = \App\Entities\CompanyBranch::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['branch_code', 'company_id', diff --git a/app/Models/CompanyDepartmentModel.php b/app/Models/CompanyDepartmentModel.php index 0f1f5ee..51a5c26 100644 --- a/app/Models/CompanyDepartmentModel.php +++ b/app/Models/CompanyDepartmentModel.php @@ -10,7 +10,7 @@ class CompanyDepartmentModel extends Model protected $primaryKey = 'dept_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\CompanyDepartment::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['company_id', 'parent_dept_id', diff --git a/app/Models/CompanyInfoModel.php b/app/Models/CompanyInfoModel.php index 3a79143..6e23274 100644 --- a/app/Models/CompanyInfoModel.php +++ b/app/Models/CompanyInfoModel.php @@ -10,7 +10,7 @@ class CompanyInfoModel extends Model protected $primaryKey = 'company_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\CompanyInfo::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['company_code', 'company_name', diff --git a/app/Models/EmpPayIncomeDeductionModel.php b/app/Models/EmpPayIncomeDeductionModel.php index 9eb912b..fb3d341 100644 --- a/app/Models/EmpPayIncomeDeductionModel.php +++ b/app/Models/EmpPayIncomeDeductionModel.php @@ -10,7 +10,7 @@ class EmpPayIncomeDeductionModel extends Model protected $primaryKey = 'emppayinded_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\EmpPayIncomeDeduction::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['emppay_id', 'payschedule_id', @@ -67,7 +67,8 @@ class EmpPayIncomeDeductionModel extends Model $builder->where([ 'emp_pay_inded.emppay_id' => $empPayId, 'pay_income_deduction.is_income' => $isIncome, - 'emp_pay_inded.payschedule_id' => $paySchedId + 'emp_pay_inded.payschedule_id' => $paySchedId, + 'emp_pay_inded.deleted_at' => null ]); return $builder->get()->getResult(); } @@ -79,7 +80,8 @@ class EmpPayIncomeDeductionModel extends Model $builder->join('pay_income_deduction', 'pay_income_deduction.inded_id = emp_pay_inded.inded_id'); $builder->where([ 'emp_pay_inded.emppay_id' => $empPayId, - 'emp_pay_inded.payschedule_id' => $paySchedId + 'emp_pay_inded.payschedule_id' => $paySchedId, + 'emp_pay_inded.deleted_at' => null ]); return $builder->get()->getResult(); } diff --git a/app/Models/EmpPayTransIncomeDeductionModel.php b/app/Models/EmpPayTransIncomeDeductionModel.php index 0c3b5de..bba8c9d 100644 --- a/app/Models/EmpPayTransIncomeDeductionModel.php +++ b/app/Models/EmpPayTransIncomeDeductionModel.php @@ -10,7 +10,7 @@ class EmpPayTransIncomeDeductionModel extends Model protected $primaryKey = 'emppaytransinded_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\EmpPayTransIncomeDeduction::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['emppaytrans_id', 'inded_id', @@ -69,7 +69,8 @@ class EmpPayTransIncomeDeductionModel extends Model $builder = $this->db->table('emp_pay_trans_inded'); $builder->select('*'); $builder->join('pay_income_deduction', 'pay_income_deduction.inded_id = emp_pay_trans_inded.inded_id'); - $builder->where('emp_pay_trans_inded.emppaytrans_id', $emptransid); + $builder->where(['emp_pay_trans_inded.emppaytrans_id' => $emptransid, + 'emp_pay_trans_inded.deleted_at' => null]); return $builder->get()->getResult(); } @@ -79,7 +80,8 @@ class EmpPayTransIncomeDeductionModel extends Model $builder->selectSum('amount'); $builder->where(['emppaytrans_id'=>$emppaytransid, 'is_income'=>$isincome, - 'is_taxable'=>$istaxable]); + 'is_taxable'=>$istaxable, + 'deleted_at'=>null]); $result = $builder->get()->getRow(); if($result->amount == null) return 0; diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index 64fdc36..97a4795 100644 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -10,7 +10,7 @@ class EmployeeModel extends Model protected $primaryKey = 'employee_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\Employee::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['company_id', 'branch_code', diff --git a/app/Models/EmployeePayTransactionModel.php b/app/Models/EmployeePayTransactionModel.php index dbe2ab9..4247987 100644 --- a/app/Models/EmployeePayTransactionModel.php +++ b/app/Models/EmployeePayTransactionModel.php @@ -10,7 +10,7 @@ class EmployeePayTransactionModel extends Model protected $primaryKey = 'emppaytrans_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\EmployeePayTransaction::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['paytrans_id', 'company_id', @@ -96,7 +96,8 @@ class EmployeePayTransactionModel extends Model $builder->join('pay_group', 'pay_group.pay_group_id = emp_pay_trans.pay_group_id'); $builder->join('emp_status', 'emp_status.emp_status_id = emp_pay_trans.emp_status_id'); $builder->join('employee', 'employee.employee_id = emp_pay_trans.employee_id'); - $builder->where('emp_pay_trans.pay_group_id', $paygroupid); + $builder->where(['emp_pay_trans.pay_group_id' => $paygroupid, + 'emp_pay_trans.deleted_at' => null]); return $builder->get()->getResult(); } diff --git a/app/Models/EmployeePayrollInfoModel.php b/app/Models/EmployeePayrollInfoModel.php index 1465e3a..655c23a 100644 --- a/app/Models/EmployeePayrollInfoModel.php +++ b/app/Models/EmployeePayrollInfoModel.php @@ -10,7 +10,7 @@ class EmployeePayrollInfoModel extends Model protected $primaryKey = 'emppay_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\EmployeePayrollInfo::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['employee_id', 'paytype_id', @@ -72,6 +72,7 @@ class EmployeePayrollInfoModel extends Model $builder->select('*'); $builder->join('employee', 'employee.employee_id = emp_pay_info.employee_id'); $builder->join('pay_type', 'pay_type.paytype_id = emp_pay_info.paytype_id'); + $builder->where('emp_pay_info.deleted_at', null); return $builder->get()->getResult(); } @@ -81,7 +82,8 @@ class EmployeePayrollInfoModel extends Model $builder->select('*'); $builder->join('employee', 'employee.employee_id = emp_pay_info.employee_id'); $builder->join('pay_type', 'pay_type.paytype_id = emp_pay_info.paytype_id'); - $builder->where('emp_pay_info.employee_id', $empID); + $builder->where(['emp_pay_info.employee_id' => $empID, + 'emp_pay_info.deleted_at' => null]); return $builder->get()->getRow(); } @@ -92,7 +94,8 @@ class EmployeePayrollInfoModel extends Model $builder->join('employee', 'employee.employee_id = emp_pay_info.employee_id'); $builder->join('pay_type', 'pay_type.paytype_id = emp_pay_info.paytype_id'); $builder->where(['employee.pay_group_id' => $payGroupId, - 'emp_pay_info.paytype_id' => $payTypeId]); + 'emp_pay_info.paytype_id' => $payTypeId, + 'emp_pay_info.deleted_at' => null]); return $builder->get()->getResult(); } } diff --git a/app/Models/EmploymentStatusModel.php b/app/Models/EmploymentStatusModel.php index 5d9dc60..5f3bf16 100644 --- a/app/Models/EmploymentStatusModel.php +++ b/app/Models/EmploymentStatusModel.php @@ -10,7 +10,7 @@ class EmploymentStatusModel extends Model protected $primaryKey = 'emp_status_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\EmploymentStatus::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['status_name']; diff --git a/app/Models/IncomeDeductionModel.php b/app/Models/IncomeDeductionModel.php index 3e9ec90..559be19 100644 --- a/app/Models/IncomeDeductionModel.php +++ b/app/Models/IncomeDeductionModel.php @@ -10,7 +10,7 @@ class IncomeDeductionModel extends Model protected $primaryKey = 'inded_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\IncomeDeduction::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['payslip_display', 'inded_name', diff --git a/app/Models/JobTitleModel.php b/app/Models/JobTitleModel.php index ad75eff..6bd8da0 100644 --- a/app/Models/JobTitleModel.php +++ b/app/Models/JobTitleModel.php @@ -10,7 +10,7 @@ class JobTitleModel extends Model protected $primaryKey = 'job_title_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\JobTitle::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['job_title_name']; diff --git a/app/Models/PayrollGroupModel.php b/app/Models/PayrollGroupModel.php index c120180..4722b31 100644 --- a/app/Models/PayrollGroupModel.php +++ b/app/Models/PayrollGroupModel.php @@ -10,7 +10,7 @@ class PayrollGroupModel extends Model protected $primaryKey = 'pay_group_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\PayrollGroup::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['pay_group_code', 'pay_group_name']; diff --git a/app/Models/PayrollScheduleModel.php b/app/Models/PayrollScheduleModel.php index d1230cd..e6d228d 100644 --- a/app/Models/PayrollScheduleModel.php +++ b/app/Models/PayrollScheduleModel.php @@ -10,7 +10,7 @@ class PayrollScheduleModel extends Model protected $primaryKey = 'payschedule_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\PayrollSchedule::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['sched_code', 'sched_name']; diff --git a/app/Models/PayrollTransactionModel.php b/app/Models/PayrollTransactionModel.php index 95eeda7..302fdac 100644 --- a/app/Models/PayrollTransactionModel.php +++ b/app/Models/PayrollTransactionModel.php @@ -10,7 +10,7 @@ class PayrollTransactionModel extends Model protected $primaryKey = 'paytrans_id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\PayrollTransaction::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['paytype_id', 'payschedule_id', diff --git a/app/Models/PayrollTypeModel.php b/app/Models/PayrollTypeModel.php index 41d88ed..12e466f 100644 --- a/app/Models/PayrollTypeModel.php +++ b/app/Models/PayrollTypeModel.php @@ -10,7 +10,7 @@ class PayrollTypeModel extends Model protected $primaryKey = 'id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\PayrollType::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['paytype_code', 'paytype_name', diff --git a/app/Models/SettingsModel.php b/app/Models/SettingsModel.php index 8df15af..a6afb71 100644 --- a/app/Models/SettingsModel.php +++ b/app/Models/SettingsModel.php @@ -10,7 +10,7 @@ class SettingsModel extends Model protected $primaryKey = 'id'; protected $useAutoIncrement = true; protected $returnType = \App\Entities\Settings::class; - protected $useSoftDeletes = false; + protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = ['class', 'key', 'value', 'type', 'context']; diff --git a/app/Views/payroll/emppaytransactionview.php b/app/Views/payroll/emppaytransactionview.php index 03a9398..714a72a 100644 --- a/app/Views/payroll/emppaytransactionview.php +++ b/app/Views/payroll/emppaytransactionview.php @@ -271,7 +271,7 @@
- +