From 60c07556da099cfe3bc3384caf9904cab2b60e4c Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Wed, 1 Apr 2026 15:28:55 +0530 Subject: [PATCH] FIX_header access and UTR Details Validation --- app/Config/Acl.php | 2 +- app/Controllers/TicketController.php | 9 +++++---- app/Views/layout/header.php | 11 ++++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/Config/Acl.php b/app/Config/Acl.php index b66743fb..df90b2f2 100644 --- a/app/Config/Acl.php +++ b/app/Config/Acl.php @@ -122,7 +122,7 @@ class Acl // ===================== POLICY TRANSACTION / BDS ===================== '#^/policy_tranction#' => [ - 'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID], + 'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID,STAFF_ROLE_ID], 'teams' => [FINANCE_TEAM_ID,POS_TEAM_ID] ], '#^/dmsSearch#' => [ diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 44d25abe..91d71085 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -1307,7 +1307,7 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], @@ -1418,7 +1418,7 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => [ 'label' => 'UTR Details', 'rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], @@ -1672,7 +1672,8 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], + 'errors' => [ 'regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , '], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], @@ -1783,7 +1784,7 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 8c23fd9b..97eef3be 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -2107,9 +2107,14 @@ body[data-sidebar-size="condensed"] .footer { - - - +