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

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

Browse Source
This commit is contained in:
VENKATESHWARAN 2026-01-23 16:42:26 +05:30
commit db191a7c70
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/EmployeeRestController.php
View File

@ -2167,14 +2167,14 @@ class EmployeeRestController extends AdminController
if (!empty($pre_client_id)) { if (!empty($pre_client_id)) {
$client = $this->clientModel->where('id', $pre_client_id)->first(); $client = $this->clientModel->where('md5(id)', $pre_client_id)->first();
if ($client) { if ($client) {
$client['client_logo'] = base_url() . 'public/uploads/logo/' . $client['client_logo']; $client['client_logo'] = base_url() . 'public/uploads/logo/' . $client['client_logo'];
$clientPolicy = $this->clientPolicyModel $clientPolicy = $this->clientPolicyModel
->where('client_id', $pre_client_id) ->where('md5(client_id)', $pre_client_id)
->where('client_branch_id', $pre_branch_id) ->where('client_branch_id', $pre_branch_id)
->findAll(); ->findAll();
@ -3103,7 +3103,7 @@ class EmployeeRestController extends AdminController
$ClientPolicyData = $this->clientPolicyModel->select('client_policy.id as client_policy_id , client_policy.client_id as client_id, client_policy.policy_type_id as policy_type_id, client_policy.is_addon as is_addon , client_policy.open_for_enrollment as OpenForEnrollment , client_policy.inception_type as inception_type, client_policy.policy_no as policy_no, client_policy.insurer_id as insurer_id, DATE_FORMAT(client_policy.policy_end_date, "%d-%m-%Y") AS policy_expiry_date ') $ClientPolicyData = $this->clientPolicyModel->select('client_policy.id as client_policy_id , client_policy.client_id as client_id, client_policy.policy_type_id as policy_type_id, client_policy.is_addon as is_addon , client_policy.open_for_enrollment as OpenForEnrollment , client_policy.inception_type as inception_type, client_policy.policy_no as policy_no, client_policy.insurer_id as insurer_id, DATE_FORMAT(client_policy.policy_end_date, "%d-%m-%Y") AS policy_expiry_date ')
->where('client_policy.client_id', $this->request->getGet('client_id') ) ->where('md5(client_policy.client_id)', $this->request->getGet('client_id') )
->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id') ) ->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id') )
->where('client_policy.is_active', 1 ) ->where('client_policy.is_active', 1 )
->where('client_policy.policy_status', 1) ->where('client_policy.policy_status', 1)

1
app/Controllers/RestAuthenticationController.php
View File

@ -797,6 +797,7 @@ class RestAuthenticationController extends AdminController
$decoded = json_decode($HRAccessData['allowed_modules'], true); $decoded = json_decode($HRAccessData['allowed_modules'], true);
$getAllhrData[$key]['allowed_modules'] = $decoded; $getAllhrData[$key]['allowed_modules'] = $decoded;
$HRAccessData['pre_client_id'] = md5($HRAccessData['pre_client_id']);
$token = JWTToken::encode($HRAccessData); $token = JWTToken::encode($HRAccessData);
$getAllhrData[$key]['token'] = $token; $getAllhrData[$key]['token'] = $token;