fix payslip view

fix payslip view. rely on employee_id instead of company_issued_id
pull/45/head
paulcortez 2 months ago
parent ba6193af0f
commit e628cc5509

@ -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,
]);

@ -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)
{

@ -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);
}
}
Loading…
Cancel
Save