diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php index c1cbd7d4..69852bca 100644 --- a/app/Controllers/PolicyTransactionController.php +++ b/app/Controllers/PolicyTransactionController.php @@ -244,34 +244,6 @@ class PolicyTransactionController extends BaseController // print_r($data); die; // var_dump($data); die; - // Format dates - // $data['policy_issue_date'] = change_date_format($this->request->getPost('policy_issue_date'), 'd/m/Y', 'Y-m-d') ?? null; - // $data['policy_start_date'] = change_date_format($this->request->getPost('policy_start_date'), 'd/m/Y', 'Y-m-d') ?? null; - // $data['policy_end_date'] = change_date_format($this->request->getPost('policy_end_date'), 'd/m/Y', 'Y-m-d') ?? null; - // $data['renewal_date'] = change_date_format($this->request->getPost('renewal_date'), 'd/m/Y', 'Y-m-d') ?? null; - // $data['rollover_date'] = change_date_format($this->request->getPost('rollover_date'), 'd/m/Y', 'Y-m-d') ?? null; - - // $data['policy_issue_date'] = (isset($data['policy_issue_date']) && $data['policy_issue_date'] !== null && $data['policy_issue_date'] !== '') - // ? date('d/m/Y', strtotime($data['policy_issue_date'])) - // : null; - - // $data['policy_start_date'] = (isset($data['policy_start_date']) && $data['policy_start_date'] !== null && $data['policy_start_date'] !== '') - // ? date('d/m/Y', strtotime($data['policy_start_date'])) - // : null; - - // $data['policy_end_date'] = (isset($data['policy_end_date']) && $data['policy_end_date'] !== null && $data['policy_end_date'] !== '') - // ? date('d/m/Y', strtotime($data['policy_end_date'])) - // : null; - - // $data['renewal_date'] = (isset($data['renewal_date']) && $data['renewal_date'] !== null && $data['renewal_date'] !== '') - // ? date('d/m/Y', strtotime($data['renewal_date'])) - // : null; - - // $data['rollover_date'] = (isset($data['rollover_date']) && $data['rollover_date'] !== null && $data['rollover_date'] !== '') - // ? date('d/m/Y', strtotime($data['rollover_date'])) - // : null; - - if(empty($data['policy_issue_date'])){ $data['policy_issue_date'] = null; } @@ -302,7 +274,7 @@ class PolicyTransactionController extends BaseController // Separate Insurer and TPA Branch IDs and IDs if(isset($data['insurer_id']) && !empty($data['insurer_id'])){ list($data['insurer_branch_id'], $data['insurer_id']) = explode('-', $data['insurer_id']); - if ($data['tpa']) { + if (isset($data['tpa'])) { list($data['tpa_branch_id'], $data['tpa_id']) = explode('-', $data['tpa']); } } diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 1c9dc253..72b53ea3 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -250,9 +250,10 @@ class TicketController extends BaseController $ticket_data = $this->formatDateForClaim($ticket_data, 'd/m/Y'); // dd($ticket_data); $template_data = $this->ticketMasterModel->getTemplateDataByTicketID($ticket_id); - $template_data['mail_content'] = $this->replacePlaceholders($template_data['mail_content'], $ticket_data); - $template_data['subject'] = $this->replacePlaceholders($template_data['subject'], $ticket_data); - + if(!empty($template_data)){ + $template_data['mail_content'] = $this->replacePlaceholders($template_data['mail_content'], $ticket_data); + $template_data['subject'] = $this->replacePlaceholders($template_data['subject'], $ticket_data); + } $data = $this->ticket_form_data($ticket_data['ticket_type_id']); $data['ticket_data'] = $ticket_data; $data['reply_data'] = $template_data; diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php index 98b275eb..f50859ab 100644 --- a/app/Views/ticket_mail_template.php +++ b/app/Views/ticket_mail_template.php @@ -50,7 +50,7 @@ table.dataTable tbody td { background-color: #f8f9fa !important; color: #16181b !important; cursor: pointer !important; -} +}
@@ -82,11 +82,16 @@ table.dataTable tbody td { -
- +
+
- Edit - Delete + Edit + Delete
@@ -116,19 +121,14 @@ table.dataTable tbody td {
+
-
+
- +
-
- - -
- -
-
@@ -141,10 +141,10 @@ table.dataTable tbody td { } } ?> - +
-
+
+
+
-
+
-
+
-
+
+
+ + +
+
+
-
- -
-
+
+ +
+
- +
@@ -237,32 +249,30 @@ $(document).ready(function() { console.error("Table atet found."); } var toolbar = "bold,italic,strikethrough,|,superscript,subscript,|,align,"; - const editorConfig = { - buttons: toolbar.concat(['fontsize']), - fontsize: [8, 10, 12, 14, 16, 18, 20, 22, 24], // Customize font sizes - showPlaceholder: false, - toolbarButtonSize: 'small', - toolbarAdaptive: false, - saveHeightInStorage: true, - minHeight: 400, - extraButtons: [ - { - name: 'info', - iconURL: '/assets/images/image-solid.svg', // Replace with the actual icon URL - exec: function (editor) { - const fileInput = document.getElementById("Question_title_fileInput"); - fileInput.click(); - }, - }, - ], - }; + const editorConfig = { + buttons: toolbar.concat(['fontsize']), + fontsize: [8, 10, 12, 14, 16, 18, 20, 22, 24], // Customize font sizes + showPlaceholder: false, + toolbarButtonSize: 'small', + toolbarAdaptive: false, + saveHeightInStorage: true, + minHeight: 400, + extraButtons: [{ + name: 'info', + iconURL: '/assets/images/image-solid.svg', // Replace with the actual icon URL + exec: function(editor) { + const fileInput = document.getElementById("Question_title_fileInput"); + fileInput.click(); + }, + }, ], + }; - const editor = Jodit.make("#ticket_mail_editor", editorConfig); + const editor = Jodit.make("#ticket_mail_editor", editorConfig); - let lastActiveField = null; + let lastActiveField = null; -// Track last active input field -$("#template_subject").on("focus", function() { + // Track last active input field + $("#template_subject").on("focus", function() { lastActiveField = this; }); @@ -270,8 +280,8 @@ $("#template_subject").on("focus", function() { editor.events.on("focus", function() { lastActiveField = editor; }); - -document.addEventListener('change', function(event) { + + document.addEventListener('change', function(event) { var target = event.target; if (target.matches('#ticket_mail_customButton')) { let placeholderValue = $(target).val(); @@ -297,7 +307,8 @@ document.addEventListener('change', function(event) { } else if (input.selectionStart || input.selectionStart === 0) { let startPos = input.selectionStart; let endPos = input.selectionEnd; - input.value = input.value.substring(0, startPos) + textToInsert + input.value.substring(endPos, input.value.length); + input.value = input.value.substring(0, startPos) + textToInsert + input.value.substring(endPos, + input.value.length); input.selectionStart = input.selectionEnd = startPos + textToInsert.length; } else { input.value += textToInsert; @@ -305,22 +316,22 @@ document.addEventListener('change', function(event) { } -$('.close').click(function () { - $('#template_subject').val(''); - $('#template_name').val(''); - $('#primaryKey').val(''); - $('#policy_type').val('').change(); - $('#trigger_type').val('').change(); - editor.setEditorValue(''); - $('#primaryKey').val(null); - $('#statusSwitch').prop('checked', false); + $('.close').click(function() { + $('#template_subject').val(''); + $('#template_name').val(''); + $('#primaryKey').val(''); + $('#policy_type').val('').change(); + $('#trigger_type').val('').change(); + editor.setEditorValue(''); + $('#primaryKey').val(null); + $('#statusSwitch').prop('checked', false); -}) -$('#ticket_mail_editor_modal').submit(function (event) { + }) + $('#ticket_mail_editor_modal').submit(function(event) { - event.preventDefault(); - let isValid = true; - $('#ticket_mail_editor_modal [required]').each(function () { + event.preventDefault(); + let isValid = true; + $('#ticket_mail_editor_modal [required]').each(function() { if (!this.value.trim()) { isValid = false; $(this).addClass('is-invalid'); // Add a red border for visibility @@ -333,58 +344,61 @@ $('#ticket_mail_editor_modal').submit(function (event) { toastr.error('Please fill all required fields.', 'Validation Error'); return; // Prevent submission } - var joditEditor = editor; - if (joditEditor) - { - var mailContent = $(joditEditor.currentPlace.container).find('.jodit-wysiwyg').html(); - var formData = $(this).serializeArray(); - formData.push({ name: 'mail_content', value: mailContent }); - // formData.push({ name: 'client_id', value: $('#general_PrimaryKey').val() }); - var isAutoMailEnabled = $('#statusSwitch').is(':checked') ? 1 : 0; - formData.push({ name: 'is_auto_mail', value: isAutoMailEnabled }); - var primary_key = $('#primaryKey').val(); - if (primary_key != null && primary_key != ''){ - formData.push({ name: 'id', value: primary_key}); - } - $('.loader').fadeIn(); - $('.loader-mask').fadeIn(); - var form_action = ''; - $.ajax({ - url: form_action, - type: "POST", - data: formData, - dataType: 'json', - success: function(res) - { - if(res.status == true){ - $('#new_mail_template').find('.close').click(); - $('.loader').fadeOut(); - $('.loader-mask').delay(350).fadeOut('slow'); - toastr.success('Template saved successfully!', 'Success'); - location.reload(); - }else if (res.status == false){ - toastr.error('Failed to Save Data', 'error'); - } - - }, - error: function (xhr, status, error) - { - console.error(xhr.responseText); - console.error(status, error); - setTimeout(function() - { - $('.loader').fadeOut(); - $('.loader-mask').delay(350).fadeOut('slow'); - toastr.error('Something Wrong!', 'warning'); - }, 1000); - } + var joditEditor = editor; + if (joditEditor) { + var mailContent = $(joditEditor.currentPlace.container).find('.jodit-wysiwyg').html(); + var formData = $(this).serializeArray(); + formData.push({ + name: 'mail_content', + value: mailContent + }); + // formData.push({ name: 'client_id', value: $('#general_PrimaryKey').val() }); + var isAutoMailEnabled = $('#statusSwitch').is(':checked') ? 1 : 0; + formData.push({ + name: 'is_auto_mail', + value: isAutoMailEnabled + }); + var primary_key = $('#primaryKey').val(); + if (primary_key != null && primary_key != '') { + formData.push({ + name: 'id', + value: primary_key }); - } - else - { - console.error("Jodit editor instance is not defined."); } -}) + $('.loader').fadeIn(); + $('.loader-mask').fadeIn(); + var form_action = ''; + $.ajax({ + url: form_action, + type: "POST", + data: formData, + dataType: 'json', + success: function(res) { + if (res.status == true) { + $('#new_mail_template').find('.close').click(); + $('.loader').fadeOut(); + $('.loader-mask').delay(350).fadeOut('slow'); + toastr.success('Template saved successfully!', 'Success'); + location.reload(); + } else if (res.status == false) { + toastr.error('Failed to Save Data', 'error'); + } + + }, + error: function(xhr, status, error) { + console.error(xhr.responseText); + console.error(status, error); + setTimeout(function() { + $('.loader').fadeOut(); + $('.loader-mask').delay(350).fadeOut('slow'); + toastr.error('Something Wrong!', 'warning'); + }, 1000); + } + }); + } else { + console.error("Jodit editor instance is not defined."); + } + }) }); @@ -393,9 +407,11 @@ function openModal() { myModal.show(); } -function deleteTemplate(id){ - const url = ''; - const data = { id: id }; // Ensure data is passed as an object +function deleteTemplate(id) { + const url = ''; + const data = { + id: id + }; // Ensure data is passed as an object Swal.fire({ title: "Are you sure?", @@ -437,13 +453,16 @@ function deleteTemplate(id){ } }); } + function getMailTemplateData(id) { const template_name = 'new_mail_template'; $('.loader').fadeIn(); $('.loader-mask').fadeIn(); - var form_action = ''; - var data = { id: id }; + var form_action = ''; + var data = { + id: id + }; $.ajax({ url: form_action, @@ -454,15 +473,15 @@ function getMailTemplateData(id) { if (res) { if (res.status == true) { // Open the modal - openModal(); + openModal(); // Populate the form fields $('#template_subject').val(res.data.subject); - $('#template_name').val(res.data.template_name); + $('#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(); - $('.jodit-wysiwyg').html(res.data.mail_content); + $('.jodit-wysiwyg').html(res.data.mail_content); // Set the auto mail switch if (res.data.is_auto_mail == 1) { @@ -486,7 +505,7 @@ function getMailTemplateData(id) { $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); }, - error: function (xhr, status, error) { + error: function(xhr, status, error) { console.error(xhr.responseText); console.error(status, error); setTimeout(function() { @@ -497,27 +516,24 @@ function getMailTemplateData(id) { } }); } - -