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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
velz 2026-01-27 16:33:09 +05:30
commit 3f315d4899
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Controllers/EmployeeRestController.php
View File

@ -4470,21 +4470,22 @@ class EmployeeRestController extends AdminController
")
->join('employee_polices', 'employees.id = employee_polices.employee_id')
->join('client_policy', 'employee_polices.client_policy_id = client_policy.id')
->whereIn('employees.emp_status', ['draft', 'enrolled'])
->whereIn('employee_polices.status', ['draft', 'enrolled'])
->where([
'employees.is_active' => 1,
'employees.emp_status' => 'draft',
'employee_polices.status' => 'draft',
'employee_polices.is_active' => 1,
'client_policy.policy_type_id' => 2,
'employees.family_floater_key' => 'self',
'employees.emp_code' => $emp_code,
'employees.client_id' => $client_id,
'employees.client_branch_id' => $client_branch_id,
'employees.emp_code' => $emp_code ?? null,
'employees.client_id' => $client_id ?? null,
'employees.client_branch_id' => $client_branch_id ?? null,
])
->orderBy('employee_polices.id', 'desc')
->first();
// dd($data);
// dd( db_connect()->getLastQuery());
// dd(db_connect()->getLastQuery());
if (!empty($data) && !empty($data['gmc_parent_policy_id'])) {

1
app/Controllers/RestAuthenticationController.php
View File

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

6
app/Models/EmployeePolicyModel.php
View File

@ -163,8 +163,10 @@ class EmployeePolicyModel extends Model
->orderBy('employee_polices.employee_id', 'ASC');
// Conditionally add where clauses
if ($client_id != 0 && !empty($client_id)) {
// Conditionally add where clauses
if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
$result->where('MD5(emp.client_id)', $client_id);
} else if ($client_id != 0 && !empty($client_id)) {
$result->where('emp.client_id', $client_id);
}
if ($branch_id != 0 && !empty($branch_id)) {