Merge pull request 'activated soft delete' (#16) from paulcortezl5 into main

Reviewed-on: #16

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');

app/Controllers/PayrollController.php

@@ -270,8 +270,9 @@ class PayrollController extends BaseController
             foreach($empPayInfos as $empPayInfo)
             {
                 $iconView = '<a href="#" class="ml-3" data-toggle="tooltip" title="View Information"><i class="fas fa-eye "></i></a>';
+                $iconDelete = '<a href="/payroll/delempayinfo/'.$empPayInfo->emppay_id.'" onclick="return confirm(\'Are you sure you want to delete this employee?\')" class="ml-3" data-toggle="tooltip" title="Delete Information"><i class="fas fa-trash "></i></a>';
 
-                $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();

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', 

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', 

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', 

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();
     }

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;

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', 

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();
     }
 

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();
     }
 }

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'];
 

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', 

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'];
 

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'];
 

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'];
 

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', 

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', 

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'];
 

app/Views/payroll/emppaytransactionview.php

@@ -271,7 +271,7 @@
                           </div>
                           <div class="col-12 col-sm-4">
                             <div class="form-group">
-                              <label>Gross Salary</label>
+                              <label>Total Deduction</label>
                               <input type="text" class="form-control" value="<?= number_format($empPayTransaction['empPayTrans']->total_deduction, 2) ?>" readonly>
                             </div>
                           </div>