Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
bitbucket 2024-07-11 11:49:45 +05:30
commit 0f9afc24ca
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/EmployeeController.php
View File

@ -916,7 +916,7 @@ class EmployeeController extends AdminController
try { try {
$get_emp_code_and_client_policy_id = $this->employeePolicyModel $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('client_policy', 'client_policy.id = employee_polices.client_policy_id')
->join('employees', 'employees.id = employee_polices.employee_id') ->join('employees', 'employees.id = employee_polices.employee_id')
->join('tpa', 'tpa.id = client_policy.tpa_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']; $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){ if($people == 0){
$data = $this->employeePolicyModel->getECardSingleData($rand_string, $emp_code); $data = $this->employeePolicyModel->getECardSingleData($rand_string, $emp_code,$client_id);
} }
// dd($data); // dd($data);

8
app/Models/EmployeePolicyModel.php
View File

@ -814,7 +814,7 @@ class EmployeePolicyModel extends Model
->get()->getResultArray(); ->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') $result = $this->db->table('employees e')
->select('e.id, ->select('e.id,
@ -829,7 +829,7 @@ class EmployeePolicyModel extends Model
e.doj, e.doj,
e.band, e.band,
TIMESTAMPDIFF(YEAR, e.dob, CURDATE()) AS emp_age, 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, 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') $result = $this->db->table('employees e')
->select('e.id, ->select('e.id,
@ -896,7 +896,7 @@ class EmployeePolicyModel extends Model
e.doj, e.doj,
e.band, e.band,
TIMESTAMPDIFF(YEAR, e.dob, CURDATE()) AS emp_age, 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, ep.tpa_id,