From b5e983904953a1b2c33e324ffb2a8da1174a27c8 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 25 Mar 2026 12:56:54 +0530 Subject: [PATCH] FIX_NEWLY_ADD --- app/Config/Acl.php | 10 +++++----- app/Models/EmployeePolicyModel.php | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/Config/Acl.php b/app/Config/Acl.php index 1fbea05..2dc7b69 100644 --- a/app/Config/Acl.php +++ b/app/Config/Acl.php @@ -14,8 +14,8 @@ class Acl '#^/loginPos#' => ['public' => true], '#^/getVerifyPosMobileNo#' => ['public' => true], '#^/getVerifiedPosUserData#' => ['public' => true], - '#^/swagger#' => ['roles' => [ADMIN_ROLE_ID]], - '#^/fedeploy#' => ['roles' => [ADMIN_ROLE_ID]], + '#^/swagger#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID]], + '#^/fedeploy#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID]], // ===================== PUBLIC DOWNLOADS / FORMS ===================== '#^/download-#' => ['public' => true], @@ -59,13 +59,13 @@ class Acl // ===================== LOGS ===================== '#^/logs#' => [ - 'roles' => [ADMIN_ROLE_ID], + 'roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID], 'teams' => [] ], // ===================== INTERNAL TEST ===================== '#^/test#' => [ - 'roles' => [ADMIN_ROLE_ID], + 'roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID], 'teams' => [] ], @@ -78,7 +78,7 @@ class Acl // ===================== DEFAULT DENY (ZERO TRUST) ===================== '#^/#' => [ - 'roles' => [ADMIN_ROLE_ID], + 'roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID], 'teams' => [] ], ]; diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index dafe21c..9ee48ef 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -163,17 +163,19 @@ class EmployeePolicyModel extends Model "(IF(COALESCE(emp.is_dependent_modified, 0) = 1, 'Newly Added, ', CASE WHEN emp.relationship != 'Self' + AND emp.file_id IS NULL AND emp.created_by = ( SELECT e_sub.id 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 AND e_sub.relationship = 'Self' AND e_sub.is_active = 1 AND ep_sub.client_policy_id = employee_polices.client_policy_id LIMIT 1 ) - THEN 'Newly Added, ' + + THEN 'Newly Added ' ELSE NULL END )) AS newly_added",