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

MERGE_TEST_ENROLISSUE

Browse Source
This commit is contained in:
Ubuntu 2026-03-25 13:08:58 +05:30
commit 01652cd7d8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Config/Acl.php
View File

@ -14,8 +14,8 @@ class Acl
'#^/loginPos#' => ['public' => true], '#^/loginPos#' => ['public' => true],
'#^/getVerifyPosMobileNo#' => ['public' => true], '#^/getVerifyPosMobileNo#' => ['public' => true],
'#^/getVerifiedPosUserData#' => ['public' => true], '#^/getVerifiedPosUserData#' => ['public' => true],
'#^/swagger#' => ['roles' => [ADMIN_ROLE_ID]], '#^/swagger#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID]],
'#^/fedeploy#' => ['roles' => [ADMIN_ROLE_ID]], '#^/fedeploy#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID]],
// ===================== PUBLIC DOWNLOADS / FORMS ===================== // ===================== PUBLIC DOWNLOADS / FORMS =====================
'#^/download-#' => ['public' => true], '#^/download-#' => ['public' => true],
@ -59,13 +59,13 @@ class Acl
// ===================== LOGS ===================== // ===================== LOGS =====================
'#^/logs#' => [ '#^/logs#' => [
'roles' => [ADMIN_ROLE_ID], 'roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID],
'teams' => [] 'teams' => []
], ],
// ===================== INTERNAL TEST ===================== // ===================== INTERNAL TEST =====================
'#^/test#' => [ '#^/test#' => [
'roles' => [ADMIN_ROLE_ID], 'roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID],
'teams' => [] 'teams' => []
], ],
@ -78,7 +78,7 @@ class Acl
// ===================== DEFAULT DENY (ZERO TRUST) ===================== // ===================== DEFAULT DENY (ZERO TRUST) =====================
'#^/#' => [ '#^/#' => [
'roles' => [ADMIN_ROLE_ID], 'roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID],
'teams' => [] 'teams' => []
], ],
]; ];

6
app/Models/EmployeePolicyModel.php
View File

@ -163,17 +163,19 @@ class EmployeePolicyModel extends Model
"(IF(COALESCE(emp.is_dependent_modified, 0) = 1, 'Newly Added, ', "(IF(COALESCE(emp.is_dependent_modified, 0) = 1, 'Newly Added, ',
CASE CASE
WHEN emp.relationship != 'Self' WHEN emp.relationship != 'Self'
AND emp.file_id IS NULL
AND emp.created_by = ( AND emp.created_by = (
SELECT e_sub.id SELECT e_sub.id
FROM employees e_sub FROM employees e_sub
INNER JOIN employee_polices ep_sub ON e_sub.id = ep_sub.employee_id JOIN employee_polices ep_sub ON e_sub.id = ep_sub.employee_id
WHERE e_sub.emp_code = emp.emp_code WHERE e_sub.emp_code = emp.emp_code
AND e_sub.relationship = 'Self' AND e_sub.relationship = 'Self'
AND e_sub.is_active = 1 AND e_sub.is_active = 1
AND ep_sub.client_policy_id = employee_polices.client_policy_id AND ep_sub.client_policy_id = employee_polices.client_policy_id
LIMIT 1 LIMIT 1
) )
THEN 'Newly Added, '
THEN 'Newly Added '
ELSE NULL ELSE NULL
END END
)) AS newly_added", )) AS newly_added",