From 7fcffe374c14da757ce3c433897be8c4466dc537 Mon Sep 17 00:00:00 2001
From: paulcortez <pbeldia@outlook.com>
Date: Tue, 17 Sep 2024 17:31:48 +0800
Subject: [PATCH] fix employee name and joining

fix employee name and joining
---
 app/Controllers/PayrollController.php   | 5 +++--
 app/Models/EmployeePayrollInfoModel.php | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php
index 5405ea3..ef1b3a0 100644
--- a/app/Controllers/PayrollController.php
+++ b/app/Controllers/PayrollController.php
@@ -188,7 +188,8 @@ class PayrollController extends BaseController
 
     public function employeePayrollInfo()
     {
-        $empPayInfos = (new EmployeePayrollInfoModel())->findAll();
+        $empPayInfoModel = new EmployeePayrollInfoModel();
+        $empPayInfos = $empPayInfoModel->getAllEmpPayInfoJoinedEmpPayType();
 
         $data['employees'] = (new EmployeeModel())->findAll();
         $data['paytypes'] = (new PayrollTypeModel())->findAll();
@@ -206,7 +207,7 @@ class PayrollController extends BaseController
 
                 $iconView = '<a href="#" class="ml-3" data-toggle="tooltip" title="View Information"><i class="fas fa-eye "></i></a>';
 
-                $empPayInfoHTMLTable->addRow($empPayInfo->emppay_id, $empPayInfo->paytype_id, $empPayInfo->employee_id, "", $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);
             }
 
             $data['tblEmpPayInfo'] = $empPayInfoHTMLTable->generate();
diff --git a/app/Models/EmployeePayrollInfoModel.php b/app/Models/EmployeePayrollInfoModel.php
index 3388d09..3f4e4a3 100644
--- a/app/Models/EmployeePayrollInfoModel.php
+++ b/app/Models/EmployeePayrollInfoModel.php
@@ -66,4 +66,13 @@ class EmployeePayrollInfoModel extends Model
         $data['data']['updated_by'] = auth()->user()->employee_id;
         return $data;
     }
+
+    public function getAllEmpPayInfoJoinedEmpPayType()
+    {
+        $builder = $this->db->table('emp_pay_info');
+        $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');
+        return $builder->get()->getResult();
+    }
 }