diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 2df2ba04..3d8b8f42 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -421,6 +421,10 @@ $routes->cli('cli/check_bounce_mail_cli', 'MasterController::testCheckBounceMail
 $routes->cli('cli/app_check_list', 'MasterController::appCheckList');
 $routes->cli('cli/new_gdrive_token', 'GoogleDriveController::generateNewGoogleDriveAccessToken');
 
+//crone job
+$routes->cli('cli/enrollOpendAndClose', 'DashboardController::updatePolicyEnrollmentStatus');
+$routes->cli("cli/sendCroneRemainderMail", "DashboardController::sendCroneRemainderMail");
+
 //Employee login api's
 $routes->post("/employeeRest/verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber");
 $routes->post("/employeeRest/getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
diff --git a/app/Controllers/Chatbot/MainMenuConversation.php b/app/Controllers/Chatbot/MainMenuConversation.php
index 8a36512c..011806f0 100644
--- a/app/Controllers/Chatbot/MainMenuConversation.php
+++ b/app/Controllers/Chatbot/MainMenuConversation.php
@@ -56,7 +56,7 @@ class MainMenuConversation extends Conversation
                     break;
                 default:
                     $this->say("Invalid selection. Please choose an option.");
-                    $this->showMainMenu();
+                    $this->bot->startConversation(new MainMenuConversation());
                     break;
             }
         });
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 308cb9e3..4dd09ce2 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -4176,7 +4176,21 @@ class ClientController extends AdminController
             ->where('client_policy.id', $param)
             ->findAll();
        
-        $dataForClientAndInsurer = [];
+        $dataForClientAndInsurer = $this->clientPolicyModel
+                ->select("
+                        clients.id AS client_id,
+                        clients.client_name,
+                        insurers.id AS insurer_id,
+                        insurers.name AS insurer_name,
+                        tpa.id AS tpa_id,
+                        tpa.name AS tpa_name,
+                    ")
+                ->join('clients', 'client_policy.client_id = clients.id', 'left')
+                ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
+                ->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
+                ->where('client_policy.id', $param)
+                ->first();
+                
         $memberData = [];
 
         // Respond based on the query result
diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 4df9136a..8ee7765d 100755
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -286,9 +286,11 @@ class DashboardController extends AdminController
         }
 
         $myLogger->logme('error', 'enrollment_status function completed');
+        $myLogger->logme('error', 'updated Open Enrollment Policy count : "'.count($openEnrollment).'" and Close Enrollment Policy count : "'.count($closeEnrollment).'"');
+
         return $this->respond([
             'status' => true,  
-            'message' => 'updated Policy Enrollment Status', 
+            'message' => 'updated Open and Close Enrollment successfully', 
             'open_policy_count' => count($openEnrollment), 
             'close_policy_count'  => count($closeEnrollment),
             'open_policy_ids' => $openEnrollment, 
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 92c19dc7..e3817ef5 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -98,7 +98,6 @@ class TicketController extends BaseController
             6 => "Trigger 6",
             7 => "Trigger 7"
         ];
-
         $this->placeHolders = [
 
             '((ACM))' => 'acm',
@@ -109,6 +108,7 @@ class TicketController extends BaseController
             '((INSURED_NAME))' => 'insured_name',
             '((CLAIM_NO))' => 'claim_number',
             '((RELATIONSHIP))' => 'relationship',
+            '((POLICY_TYPE))' => 'policy_type',
         ];
 
         $this->ticketMasterModel = new TicketMasterModel();
@@ -332,7 +332,7 @@ class TicketController extends BaseController
             if ($return_value) {
                 //mail trigger part
                 $mail_responce = $this->sendAutoMailTrigger($return_value);
-                return $this->respond(['status' => true, 'code' => 200, 'data' => $ticket_data, "message" => "Claim created successfully", 'mail_responce' => $mail_responce], 200);
+                return $this->respond(['status' => true, 'ticket_id' => $return_value, 'code' => 200, 'data' => $ticket_data, "message" => "Claim created successfully", 'mail_responce' => $mail_responce], 200);
             } else {
                 return $this->respond(['status' => false, 'code' => 404, 'message' => 'Failed to create claim'], 200);
             }
@@ -502,6 +502,7 @@ class TicketController extends BaseController
         try {
             // Fetch Ticket Data
             $ticket_data = $this->ticketMasterModel->getTicketDataByTicketID($ticket_id);
+            // print_r($ticket_data); die;
 
             if (!$ticket_data) {
                 $this->myLogger->logme('error', "No ticket data found for Ticket ID: $ticket_id");
@@ -512,6 +513,7 @@ class TicketController extends BaseController
 
             // Fetch Email Template Data
             $template_data = $this->ticketMasterModel->getTemplateDataByTicketID($ticket_id);
+            // print_r($template_data); die;
 
             if (!$template_data) {
                 $this->myLogger->logme('error', "No email template found for Claim Status ID: " . $ticket_data['claim_status_id']);
@@ -524,14 +526,18 @@ class TicketController extends BaseController
             $subject = $this->replacePlaceholders($template_data['subject'], $ticket_data);
             $message = $this->replacePlaceholders($template_data['mail_content'], $ticket_data);
 
+            // print_r($subject); 
+            // print_r($message); 
+            // die;
+
             // Validate Essential Fields
             if (empty($ticket_data['emp_mail'])) {
-                $this->myLogger->logme('error', "Employee email is missing for Ticket ID: $ticket_id");
+                $this->myLogger->logme('error', "Employee email is missing for Ticket ID : '".$ticket_id ."'");
                 return null;
             }
 
             if (empty($subject) || empty($message)) {
-                $this->myLogger->logme('error', "Generated email content is empty for Ticket ID: $ticket_id");
+                $this->myLogger->logme('error', "Generated email content is empty for Ticket ID: '".$ticket_id ."'");
                 return null;
             }
 
@@ -544,6 +550,8 @@ class TicketController extends BaseController
                 'attachments' => []
             ];
 
+            // print_r($mailData); die;
+
             $this->myLogger->logme('error', "Final Email Data");
 
             return $mailData;
@@ -559,10 +567,15 @@ class TicketController extends BaseController
 
         if (!empty($ticket_data) && !empty($content)) {
             foreach ($this->placeHolders as $key => $value) {
-                $replaceData = strtoupper($ticket_data[$value]) ?? '';
+
                 if ($value == "emp_code") {
                     $replaceData = $ticket_data[$value] ?? '';
+                }else if($value == "policy_type"){
+                    $replaceData = str_replace("Claim-", "", $this->ticketType[$ticket_data['ticket_type_id']] ?? "");
+                }else{
+                    $replaceData = strtoupper($ticket_data[$value]) ?? '';
                 }
+
                 $content = str_replace($key, $replaceData, $content);
             }
         }
@@ -576,8 +589,12 @@ class TicketController extends BaseController
     public function sendTrigger($mail_content)
     {
         $this->myLogger->logme('error', "Sending email with content");
-
-        $response = MailHelper::send_email($mail_content);
+        if(!empty($mail_content)){
+            $response = MailHelper::send_email($mail_content);
+        }else{
+            $response = ['status' => false, 'code' => 404, 'message' => "Mail not sent, mail data empty"];
+            $this->myLogger->logme('error', "Mail not sent, mail data empty");
+        }
 
         $this->myLogger->logme('error', "Email sent response: " . json_encode($response));
 
@@ -634,6 +651,7 @@ class TicketController extends BaseController
         $mail_responce = [];
         if (!empty($auto_mail_enable) && $auto_mail_enable['is_auto_mail'] == 1) {
             $mail_content = $this->constructMailContent($ticket_id);
+            // print_r($mail_content); die;
             $mail_responce = $this->sendTrigger($mail_content);
         }elseif (!empty($auto_mail_enable) && $auto_mail_enable['is_auto_mail'] == 0 ){
             $this->myLogger->logme('error','Auto Mail Not Sent, Reason: Automail Not Enabled');
diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php
index 6571a34e..d8fd4894 100755
--- a/app/Models/EmployeeModel.php
+++ b/app/Models/EmployeeModel.php
@@ -106,7 +106,7 @@ class EmployeeModel extends Model
 
     public function getEmpFamilybyEmpCode(string $client_policy_id = null,string $emp_code = null,string $client_id = null,array $emp_status = [],array $policy_status = [],array $relationship = [],array $client_branch_id = [])
     {
-        $result =  $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employees.unit','employees.file_id','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policy_type.long_name as policy_name','client_policy.is_addon', 'employee_polices.payable_employee','employee_polices.rand_string'])
+        $result =  $this->select(['employees.id as emp_id', 'employees.client_id','employees.client_branch_id', 'employees.relationship', 'employees.relationship_code', 'employees.change_event', 'employees.emp_code', 'employees.name', 'employees.email_personal', 'employees.email_corporate', 'employees.mobile', 'employees.gender', 'employees.dob', 'employees.doj', 'employees.basic_pay', 'employees.band', 'employees.designation', 'employees.emp_status','employees.unit','employees.file_id','employee_polices.id as emp_policy_id', 'employee_polices.employee_id', 'employee_polices.client_policy_id', 'employee_polices.tpa_id', 'employee_polices.uhid', 'employee_polices.batch_code', 'employee_polices.status', 'employee_polices.pre_existing_alignments', 'employee_polices.basic_cover_si', 'employee_polices.date_coverage', 'employee_polices.policy_end_date', 'employee_polices.days', 'employee_polices.premium', 'employee_polices.rata_premimum', 'employee_polices.gst', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit','policy_type.long_name as policy_name','client_policy.is_addon', 'employee_polices.payable_employee','employee_polices.rand_string','employee_polices.claim_status'])
                         ->join('employee_polices', 'employee_polices.employee_id = employees.id')
                         ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
                         ->join('policy_type', 'policy_type.id = client_policy.policy_type_id','left')
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 67db3017..abe5ecc2 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -826,6 +826,7 @@ class EmployeePolicyModel extends Model
                 employee_polices.rata_premimum as premium, 
                 employee_polices.claim_status,
                 employee_polices.age_band,
+                employee_polices.tpa_id,
 
                 
                 batch_data.emp_policy_id AS emp_policy_id,
@@ -1731,7 +1732,7 @@ class EmployeePolicyModel extends Model
                 employee_polices ep
             WHERE 
                 ep.file_id = $file_id
-                AND ep.uhid IS NOT NULL'
+                AND ep.uhid IS NOT NULL
                 AND ep.status != 'truncated'
                 AND ep.status != 'truncated'
                 AND ep.is_active = 1;
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index 02da248b..2928a664 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -10,7 +10,7 @@
                 <!-- Header Section -->
                 <div class="row mb-3">
                     <div class="col-6 d-flex align-items-center">
-                        <h4 class="mb-0">Ticket</h4>
+                        <h4 class="mb-0">Claims</h4>
                     </div>
                     <div class="col-6 text-right">
                         <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
diff --git a/app/Views/ticket_form_gpa.php b/app/Views/ticket_form_gpa.php
index 59e3f849..4a4a741d 100644
--- a/app/Views/ticket_form_gpa.php
+++ b/app/Views/ticket_form_gpa.php
@@ -63,20 +63,20 @@
                             <div class="form-group col-md-3">
                                 <label for="client_name">Corporate Name<span class="text-danger"></span></label>
                                 <input type="hidden" id="client_id" name="client_id" value="<?= isset($ticket_data['client_id']) ? $ticket_data['client_id'] : '' ?>">
-                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>">
+                                <input type="text" class="form-control" id="client_name" placeholder="Client" value="<?= isset($ticket_data['client_name']) ? $ticket_data['client_name'] : '' ?>" readonly>
                             </div>
 
                             <div class="form-group col-md-3">
                                 <label for="insurer_id">Insurer<span class="text-danger"></span></label>
                                 <input type=hidden id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
-                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>">
+                                <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly>
                             </div>
 
                             <div class="form-group col-md-3">
                                 <label for="policy_no">Policy No<span class="text-danger"></span></label>
                                 <input type="text" class="form-control" id="policy_no"
                                     value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"
-                                    name="policy_no" readonly>
+                                    name="policy_no">
                             </div>
 
                             <div class="form-group col-md-3">
@@ -127,6 +127,20 @@
                                     name="emp_name">
                             </div>
 
+                            <div class="form-group col-md-3">
+                                <label for="emp_mobile">Employee Mobile No<span class="text-danger"></span></label>
+                                <input type="text" class="form-control" id="emp_mobile" placeholder="Enter EMP Mobile"
+                                    value="<?= isset($ticket_data['emp_mobile']) ? $ticket_data['emp_mobile'] : '' ?>"
+                                    name="emp_mobile">
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label for="emp_mail">Employee Mail ID<span class="text-danger"></span></label>
+                                <input type="text" class="form-control" id="emp_mail" placeholder="Enter EMP Mail"
+                                    value="<?= isset($ticket_data['emp_mail']) ? $ticket_data['emp_mail'] : '' ?>"
+                                    name="emp_mail">
+                            </div>
+
 
                             <div class="form-group col-md-3">
                                 <label for="date_of_join">Date of joining<span class="text-danger"></span></label>
diff --git a/app/Views/ticket_form_handler.php b/app/Views/ticket_form_handler.php
index 6e5532a3..9e9a6eb5 100644
--- a/app/Views/ticket_form_handler.php
+++ b/app/Views/ticket_form_handler.php
@@ -257,7 +257,16 @@ function toggleAccordion(id) {
     const content = document.getElementById(id);
     const arrow = document.querySelector(`#${id === 'mobileAccordion' ? 'mobileArrow' : 'clientBranchArrow'}`);
 
-    // Toggle the display of the accordion content
+    // Define the other accordion to close
+    const otherId = id === 'mobileAccordion' ? 'clientBranchAccordion' : 'mobileAccordion';
+    const otherContent = document.getElementById(otherId);
+    const otherArrow = document.querySelector(`#${id === 'mobileAccordion' ? 'clientBranchArrow' : 'mobileArrow'}`);
+
+    // Close the other accordion
+    otherContent.classList.remove('show');
+    otherArrow.classList.remove('rotate');
+
+    // Toggle the current accordion
     if (content.classList.contains('show')) {
         content.classList.remove('show');
         arrow.classList.remove('rotate');
@@ -267,6 +276,7 @@ function toggleAccordion(id) {
     }
 }
 
+
 function openFetchEmpDataodal() {
     var myModal = new bootstrap.Modal(document.getElementById('empDetailsModal'));
     myModal.show();
@@ -343,6 +353,7 @@ function appendBranch(data) {
 //append the clients policy data to the modal
 function appendPolicy(data) {
 
+    let ticket_type = $('#ticket_type_id').val();
     $('#emp_client_policy_data_list').empty();
 
     $('#emp_client_policy_data_list').append($('<option>', {
@@ -351,12 +362,53 @@ function appendPolicy(data) {
     }));
 
     $.each(data, function(index, item) {
-        var option = $('<option>', {
-            value: item.id,
-            text: item.policy_type + '-' + item.policy_no,
-        });
 
-        $('#emp_client_policy_data_list').append(option).select2();
+        if(ticket_type == 1){
+
+            if(item.policy_type_id == 2 || item.policy_type_id == 3 ||  item.policy_type_id == 4 ||item.policy_type_id == 5) {
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.policy_type + '-' + item.policy_no,
+                });
+            
+                $('#emp_client_policy_data_list').append(option).select2();
+            }
+
+        }else if(ticket_type == 2){
+
+            if(item.policy_type_id == 1) {
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.policy_type + '-' + item.policy_no,
+                });
+            
+                $('#emp_client_policy_data_list').append(option).select2();
+            }
+
+        }else if(ticket_type == 3){
+
+            if(item.policy_type_id == 6) {
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.policy_type + '-' + item.policy_no,
+                });
+            
+                $('#emp_client_policy_data_list').append(option).select2();
+            }
+
+        }else if(ticket_type == 4){
+
+            if(item.policy_type == 7) {
+                var option = $('<option>', {
+                    value: item.id,
+                    text: item.policy_type + '-' + item.policy_no,
+                });
+            
+                $('#emp_client_policy_data_list').append(option).select2();
+            }
+
+        }
+
     });
 
 }
@@ -428,6 +480,7 @@ function getEmpData(input) {
         if (response.status) {
             console.log(response.message, 'SUCCESS');
             appendEmployee(response.data, 'search_by_client_employee');
+            setClientAndInsurerData(response.dataForClientAndInsurer);
         } else {
             toastr.warning(response.message, 'WARNING');
         }
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index 1100e26a..0f4efd00 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -130,7 +130,7 @@ table.dataTable tbody td {
                                     placeholder="Template Name" required>
                             </div>
 
-                            <div class="form-group col-md-4">
+                            <div class="form-group col-md-3">
                                 <label for="emp_code">Policy Type</label>
                                 <select class="form-control" id="policy_type" name="ticket_type" required>
                                     <option value="">Select Policy Type</option>
@@ -144,7 +144,7 @@ table.dataTable tbody td {
                                 </select>
                             </div>
 
-                            <div class="form-group col-md-2">
+                            <div class="form-group col-md-3">
                                 <label for="trigger_type">Trigger Type</label>
                                 <select class="form-control" id="trigger_type" name="trigger_type" required>
                                     <option value="">Select status</option>
@@ -158,7 +158,7 @@ table.dataTable tbody td {
                                 </select> <input id="primaryKey" type="hidden">
                             </div>
 
-                            <div class="form-group col-md-4">
+                            <div class="form-group col-md-2">
                                 <div>
                                     <div id="statusSwitchWrapper" class="dt-switch-wrapper"
                                         style="padding-top: 40px;padding-left: 10px;">
@@ -480,7 +480,7 @@ function getMailTemplateData(id) {
                     $('#template_name').val(res.data.template_name);
                     $('#primaryKey').val(res.data.id);
                     $('#policy_type').val(res.data.ticket_type).change();
-                    $('#trigger_type').val(res.data.ticket_type).change();
+                    $('#trigger_type').val(res.data.trigger_type).change();
                     $('.jodit-wysiwyg').html(res.data.mail_content);
 
                     // Set the auto mail switch
diff --git a/app/Views/ticket_reply.php b/app/Views/ticket_reply.php
index c3faa0b4..f26143fd 100644
--- a/app/Views/ticket_reply.php
+++ b/app/Views/ticket_reply.php
@@ -7,7 +7,7 @@
                         <!-- Email To Field -->
                         <div class="form-group col-md-4">
                             <label for="emp_mail_for_to">To</label>
-                            <input type="text" value="<?= isset($reply_data['emp_mail'])?$reply_data['emp_mail']:'' ?>" class="form-control" id="emp_mail_for_to" name="emp_mail" placeholder="Recipient email" readonly>
+                            <input type="text" value="<?= isset($ticket_data['emp_mail'])?$ticket_data['emp_mail']:'' ?>" class="form-control" id="emp_mail_for_to" name="emp_mail" placeholder="Recipient email" readonly>
                         </div>
 
                         <!-- Subject Field -->