From 3926a7281b4cf4452aa73cc9355a100b2cbe5aad Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Thu, 2 Apr 2026 18:29:57 +0530 Subject: [PATCH] TC - Validation rule UTR, CC - kyc document isctive 1 only --- app/Controllers/ClientController.php | 6 ++++-- app/Controllers/TicketController.php | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index d1bc5d9b..25f01381 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -649,7 +649,7 @@ class ClientController extends AdminController $headerData['page_name'] = 'Clients'; $data['entity'] = $this->kycEntityTypeModel->findAll(); - $data['kyc_docs'] = $this->kycDocsModel->findAll(); + $data['kyc_docs'] = $this->kycDocsModel->where('is_active', 1)->findAll(); $data['police'] = $this->policesModel->findAll(); $data['insurer'] = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames(); $data['tpa'] = $this->tpaBranchModel->getTpaBranchesWithTpaNames(); @@ -916,7 +916,7 @@ class ClientController extends AdminController $editData['insurers'] = $this->insurerModel->where('is_active', 1)->findAll(); $editData['insurer_branch'] = $this->insurerBranchModel->where('is_active', 1)->findAll(); $editData['clients'] = $this->clientModel->where('is_active', 1)->findAll(); - $editData['kyc_docs'] = $this->kycDocsModel->findAll(); + $editData['kyc_docs'] = $this->kycDocsModel->where('is_active', 1)->findAll(); $editData['policyGridData'] = $this->policyGridModel->findAll(); $editData['policy_types'] = $this->policyTypeModel->findAll(); $editData['policy_type'] = ['1' => 'Base Policy', '2' => 'SI Topup', '3' => 'Dependent Addon']; @@ -3761,6 +3761,8 @@ class ClientController extends AdminController 'left' ); $builder->where('c.id', $client_id); + $builder->where('kd.is_active',1); + $builder->groupBy(['kd.id', 'ck.file_name']); $query = $builder->get(); diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 91d71085..c5e6d556 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|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details allows only alphanumeric characters, 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|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details allows only alphanumeric characters, 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,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|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details allows only alphanumeric characters, 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' => []], @@ -1784,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|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details allows only alphanumeric characters, 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.']],