From 67d03e83928a7cac19bc023cc82ee6ab4f0bdd2a Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 15 Oct 2025 17:30:26 +0530 Subject: [PATCH] CHANGE_Mail_template_filename_issue - VADIVEL J 2025-10-15 --- app/Controllers/ClientController.php | 76 ++++++++ app/Views/client_policy.php | 267 ++++++++++++++++++++++++++- 2 files changed, 337 insertions(+), 6 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index d2eb167..5afb6bb 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -684,6 +684,12 @@ class ClientController extends AdminController $insert = $this->clientModel->insert($data); if ($insert) { $client_data = $this->clientModel->where(['id' => $insert, 'is_active' => 1])->first(); + + $client_id = $insert; + $default_template_creation = $this->createDefaultMailTemplate($client_id , $client_data); + if($default_template_creation == false){ + $this->myLogger->logme('error', 'Default Mail Template Creation Failed for Client ID: {data}', ['data' => $client_id]); + } return $this->respond(['status' => true, 'code' => 200, 'data' => $client_data], 200); } else { return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200); @@ -5334,6 +5340,76 @@ class ClientController extends AdminController } + public function createDefaultMailTemplate($client_id , $client_data){ + + $member_welcome_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_welcome_mail')->get()->getResultArray()[0]??[]; + + $member_remainder_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_reminder_mail')->get()->getResultArray()[0]??[]; + + $member_review_and_summary_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_review_and_summary_mail')->get()->getResultArray()[0]??[]; + + $default_member_welcome_mail_template = [ + 'client_id' => $client_id, + 'template_name' => 'member_welcome_mail', + 'subject' => $member_welcome_mail_template['subject']??'', + 'mail_content' => $member_welcome_mail_template['mail_content']??'', + 'mail_content_json'=> $member_welcome_mail_template['mail_content_json']??'', + + 'created_by' => get_session_userid(), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_by' => null, + 'updated_at' => date('Y-m-d H:i:s'), + 'mail_content_copy'=> null + ]; + + $default_member_remainder_mail_template = [ + 'client_id' => $client_id, + 'template_name' => 'member_reminder_mail', + 'subject' => $member_remainder_mail_template['subject']??'', + 'mail_content' => $member_remainder_mail_template['mail_content']??'', + 'mail_content_json'=> $member_remainder_mail_template['mail_content_json']??'', + + 'created_by' => get_session_userid(), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_by' => null, + 'updated_at' => date('Y-m-d H:i:s'), + 'mail_content_copy'=> null + ]; + + $default_member_review_and_summary_mail_template = [ + 'client_id' => $client_id, + 'template_name' => 'member_review_and_summary_mail', + 'subject' => $member_review_and_summary_mail_template['subject']??'', + 'mail_content' => $member_review_and_summary_mail_template['mail_content']??'', + 'mail_content_json'=> $member_review_and_summary_mail_template['mail_content_json']??'', + + 'created_by' => get_session_userid(), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_by' => null, + 'updated_at' => date('Y-m-d H:i:s'), + 'mail_content_copy'=> null + ]; + + $this->myLogger->logme('error', 'Default Mail Template Data ' . json_encode([ + $default_member_welcome_mail_template, + $default_member_remainder_mail_template, + $default_member_review_and_summary_mail_template + ], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); + + + + $default_templates_inserted = $this->notificationModel->insertBatch([ + $default_member_welcome_mail_template, + $default_member_remainder_mail_template, + $default_member_review_and_summary_mail_template + ]); + + + return $default_templates_inserted ? true : false; + + + } + diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index 877077e..6b083d4 100755 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -1,3 +1,69 @@ + + + +
@@ -5,6 +71,18 @@
+ +
+ +
+ +
+
@@ -322,6 +400,9 @@ $(document).ready(function() { // Get today's date var today = new Date(); + + const showExpired = $('#chk-show-expired').is(':checked'); + var startDatePicker = flatpickr("#start_date", { dateFormat: "d-m-Y", defaultDate: today, @@ -436,7 +517,8 @@ $(document).ready(function() { si_mapping = ` SI Mapping`; } - + if(showExpired == false && checkDateStatus(item.policy_end_date) != 'Expired'){ + policyTable += ` @@ -457,7 +539,7 @@ $(document).ready(function() { ${auto_si_menu} ${si_mapping}`; // Conditionally render the delete option based on the role - if (role !== 3 && role !== 4) { + if (role != 3 && role != 4) { policyTable += ` Delete`; @@ -470,6 +552,7 @@ $(document).ready(function() { `; + } }); $('#policy_table').append(policyTable); @@ -478,9 +561,11 @@ $(document).ready(function() { $('#table-client-policy').DataTable({ - paging: true, - searching: false, - // ordering: false + paging: true, + searching: true, + autoWidth: false, + responsive: true, + }); @@ -710,7 +795,7 @@ $("#policy_form").submit(function(event) { ${auto_si_menu}`; // Conditionally render the delete option based on the role - if (role !== 3 && role !== 4) { + if (role != 3 && role != 4) { policyTable += ` Delete`; @@ -2142,4 +2227,174 @@ function featchClient() { //---------------------------------------------------------------------------------------------------- + + + \ No newline at end of file