From e628cc550941e99a580992db69fc1462aeac6a4f Mon Sep 17 00:00:00 2001
From: paulcortez <pbeldia@outlook.com>
Date: Thu, 13 Mar 2025 19:01:21 +0800
Subject: [PATCH] fix payslip view

fix payslip view. rely on employee_id instead of company_issued_id
---
 app/Controllers/AdministratorController.php   |  2 +
 app/Controllers/RegularEmployeeController.php |  8 ++--
 ...025-03-13-095622_ExtendUserAddEmpSysId.php | 41 +++++++++++++++++++
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 app/Database/Migrations/2025-03-13-095622_ExtendUserAddEmpSysId.php

diff --git a/app/Controllers/AdministratorController.php b/app/Controllers/AdministratorController.php
index a03c62b..3ebb47a 100644
--- a/app/Controllers/AdministratorController.php
+++ b/app/Controllers/AdministratorController.php
@@ -215,6 +215,8 @@ class AdministratorController extends BaseController
             'username' => $employee->company_issued_id,
             'email'    => $employee->email_address,
             'password' => $employee->company_issued_id,
+            'company_id' => $employee->company_id,
+            'sys_emp_id' => $employee->employee_id,
             'employee_id' => $employee->company_issued_id,
             'display_name' => $employee->first_name." ".$employee->last_name,
         ]);
diff --git a/app/Controllers/RegularEmployeeController.php b/app/Controllers/RegularEmployeeController.php
index c65f095..09ef1df 100644
--- a/app/Controllers/RegularEmployeeController.php
+++ b/app/Controllers/RegularEmployeeController.php
@@ -28,11 +28,11 @@ class RegularEmployeeController extends BaseController
     {
         $data['paytransid'] = $this->request->getGet('paytransid');
         $data['payTransactions'] = (new PayrollTransactionModel())->orderBy('paytype_id','DESC')->limit(15)->findAll();
-        $data['loggedEmployee'] = (new EmployeeModel())->where('company_issued_id', auth()->user()->employee_id)->first();
+        $data['loggedEmployee'] = (new EmployeeModel())->where('employee_id', auth()->user()->sys_emp_id)->first();
 
         if($data['paytransid'] != null)
         {
-            $data['empPayTrans'] = (new EmployeePayTransactionModel())->where(['paytrans_id' => $data['paytransid'], 'company_issued_id'=>auth()->user()->employee_id])->first();
+            $data['empPayTrans'] = (new EmployeePayTransactionModel())->where(['paytrans_id' => $data['paytransid'], 'employee_id'=>auth()->user()->sys_emp_id])->first();
 
             if($data['empPayTrans'] != null)
             {
@@ -46,9 +46,9 @@ class RegularEmployeeController extends BaseController
     }
     public function payslipViewPrint($paytransid)
     {
-        $data['loggedEmployee'] = (new EmployeeModel())->where('company_issued_id', auth()->user()->employee_id)->first();
+        $data['loggedEmployee'] = (new EmployeeModel())->where('employee_id', auth()->user()->sys_emp_id)->first();
         $data['payTransaction'] = (new PayrollTransactionModel())->find($paytransid);
-        $data['empPayTrans'] = (new EmployeePayTransactionModel())->where(['paytrans_id' => $paytransid, 'company_issued_id'=>auth()->user()->employee_id])->first();
+        $data['empPayTrans'] = (new EmployeePayTransactionModel())->where(['paytrans_id' => $paytransid, 'employee_id'=>auth()->user()->sys_emp_id])->first();
 
         if($data['empPayTrans'] != null)
         {
diff --git a/app/Database/Migrations/2025-03-13-095622_ExtendUserAddEmpSysId.php b/app/Database/Migrations/2025-03-13-095622_ExtendUserAddEmpSysId.php
new file mode 100644
index 0000000..26cef87
--- /dev/null
+++ b/app/Database/Migrations/2025-03-13-095622_ExtendUserAddEmpSysId.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Forge;
+use CodeIgniter\Database\Migration;
+
+class ExtendUserAddEmpSysId extends Migration
+{
+    private array $tables;
+
+    public function __construct(?Forge $forge = null)
+    {
+        parent::__construct($forge);
+
+        /** @var \Config\Auth $authConfig */
+        $authConfig   = config('Auth');
+        $this->tables = $authConfig->tables;
+    }
+
+    public function up()
+    {
+        $fields = [
+            'sys_emp_id' => [
+                'type' => 'INT',
+                'constraint' => 11,
+                'unsigned' => true,
+                'after' => 'company_id',
+            ],
+        ];
+        $this->forge->addColumn($this->tables['users'], $fields);
+    }
+
+    public function down()
+    {
+        $fields = [
+            'sys_emp_id',
+        ];
+        $this->forge->dropColumn($this->tables['users'], $fields);
+    }
+}
-- 
2.39.2