From 1ba4618a099d732678d96c29f092509c16b486a0 Mon Sep 17 00:00:00 2001 From: Venba Date: Thu, 11 Jul 2024 06:11:54 +0000 Subject: [PATCH 1/2] FIX_ECARD_CLIENTID_ADDED --- app/Controllers/EmployeeController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index ec8467e6..4a7900d6 100644 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -916,7 +916,7 @@ class EmployeeController extends AdminController try { $get_emp_code_and_client_policy_id = $this->employeePolicyModel - ->select('employee_polices.client_policy_id, employees.emp_code, tpa.short_name') + ->select('employee_polices.client_policy_id, employees.emp_code, tpa.short_name,employees.client_id') ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id') ->join('employees', 'employees.id = employee_polices.employee_id') ->join('tpa', 'tpa.id = client_policy.tpa_id') @@ -940,10 +940,10 @@ class EmployeeController extends AdminController $emp_code = $get_emp_code_and_client_policy_id['emp_code']; - $data = $this->employeePolicyModel->getECardDataUsingMd5($client_policy_id, $emp_code); + $data = $this->employeePolicyModel->getECardDataUsingMd5($client_policy_id, $emp_code,$client_id); if($people == 0){ - $data = $this->employeePolicyModel->getECardSingleData($rand_string, $emp_code); + $data = $this->employeePolicyModel->getECardSingleData($rand_string, $emp_code,$client_id); } // dd($data); From 1b3a7c85c0919f5f36e6a34aa6b988842da19b68 Mon Sep 17 00:00:00 2001 From: Venba Date: Thu, 11 Jul 2024 06:16:08 +0000 Subject: [PATCH 2/2] FIX_ECARD_CLIENTID_ADDED_IN_MODEL --- app/Models/EmployeePolicyModel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 160eb71e..a94410f5 100644 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -814,7 +814,7 @@ class EmployeePolicyModel extends Model ->get()->getResultArray(); } - public function getECardDataUsingMd5($client_policy_id, $emp_code){ + public function getECardDataUsingMd5($client_policy_id, $emp_code,$client_id){ $result = $this->db->table('employees e') ->select('e.id, @@ -829,7 +829,7 @@ class EmployeePolicyModel extends Model e.doj, e.band, TIMESTAMPDIFF(YEAR, e.dob, CURDATE()) AS emp_age, - (SELECT name FROM employees WHERE relationship = "Self" and emp_code = ' . $this->db->escape($emp_code) . ') AS self, + (SELECT name FROM employees WHERE relationship = "Self" and emp_code = ' . $this->db->escape($emp_code) . ' and client_id = '.$client_id.') AS self, ep.tpa_id, @@ -881,7 +881,7 @@ class EmployeePolicyModel extends Model } - public function getECardSingleData($rand_string, $emp_code){ + public function getECardSingleData($rand_string, $emp_code,$client_id){ $result = $this->db->table('employees e') ->select('e.id, @@ -896,7 +896,7 @@ class EmployeePolicyModel extends Model e.doj, e.band, TIMESTAMPDIFF(YEAR, e.dob, CURDATE()) AS emp_age, - (SELECT name FROM employees WHERE relationship = "Self" and emp_code = ' . $this->db->escape($emp_code) . ') AS self, + (SELECT name FROM employees WHERE relationship = "Self" and emp_code = ' . $this->db->escape($emp_code) . ' and client_id = '.$client_id.') AS self, ep.tpa_id,