From 9f5f93b73e909a4c126af9a1ff4fff53eef41597 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Tue, 4 Nov 2025 11:29:40 +0530
Subject: [PATCH] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-01 11:29

---
 app/Views/bds_renewal_report_list.php | 29 ++++---------------
 app/Views/layout/header.php           | 40 ++++++++++++++-------------
 app/Views/mail_template.php           | 17 ++++++++++--
 app/Views/report_bds.php              | 35 +++++++++++++++--------
 4 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/app/Views/bds_renewal_report_list.php b/app/Views/bds_renewal_report_list.php
index e9cbb1c6..a3147bd1 100644
--- a/app/Views/bds_renewal_report_list.php
+++ b/app/Views/bds_renewal_report_list.php
@@ -154,35 +154,18 @@ $(document).ready(function() {
 // Global DataTables defaults
 $.extend(true, $.fn.dataTable.defaults, {
     language: {
-        search: "", // remove "Search:" label
+        search: `
+            <div class="datatable-search-wrapper">
+                _INPUT_
+                <i class="mdi mdi-magnify datatable-search-icon"></i>
+            </div>`,
         searchPlaceholder: "Search"
     },
+
     paging: true,
     pageLength: 10,
     ordering: false
 });
 
-// Global init hook
-$(document).on('init.dt', function (e, settings) {
-    let $filter = $(settings.nTableWrapper).find('.dataTables_filter');
-    let $input = $filter.find('input');
-
-    if (!$filter.hasClass('custom-search')) {
-        // Wrap in Bootstrap input-group
-        $input
-            .addClass('form-control')
-            .wrap('<div class="input-group"></div>');
-
-        // Append icon
-        $input.after(`
-            <span class="input-group-text bg-white border-0">
-                <i class="mdi mdi-magnify"></i>
-            </span>
-        `);
-
-        // Align to right
-        $filter.addClass('text-right custom-search');
-    }
-});
 
 </script>
\ No newline at end of file
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 5fe38d18..a1ab5d11 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -355,6 +355,7 @@
 
         .content-page {
             padding: 80px 15px 65px 15px !important;
+            height: 100vh;
         }
 
         /* Media query for small screens */
@@ -1861,25 +1862,6 @@
                         </li>
                     <?php } ?>
 
-                    <!-- leads -->
-                    <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())) { ?>
-                        <li class="li-seperate" id="leads-li">
-                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive">
-                                <img
-                                    src="<?= base_url() . "public"; ?>/assets/images/leads_sb.png" alt="Logo" height="20">
-                                <span> Leads </span>
-                            </a>
-                        </li>
-                    <?php } ?>
-                    <!-- Tickets -->
-                    <?php if (in_array(get_role_id(), [1, 2, 3, 4, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
-                        <li class="li-seperate" id="tickets-li">
-                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive">
-                                <img src="<?= base_url() . "public"; ?>/assets/images/ticket.png" alt="Logo" height="20">
-                                <span>Tickets</span>
-                            </a>
-                        </li>
-                    <?php } ?>
                     <!-- BDS -->
                     <?php if ((get_role_id() == 1 || get_role_id() == 5 || get_role_id() == 4) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
                         <li class="li-seperate" id="policy-transactions-li">
@@ -2034,6 +2016,26 @@
                         </li>
                     <?php } ?>
 
+                    <!-- leads -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="leads-li">
+                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive">
+                                <img
+                                    src="<?= base_url() . "public"; ?>/assets/images/leads_sb.png" alt="Logo" height="20">
+                                <span> Leads </span>
+                            </a>
+                        </li>
+                    <?php } ?>
+                    <!-- Tickets -->
+                    <?php if (in_array(get_role_id(), [1, 2, 3, 4, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
+                        <li class="li-seperate" id="tickets-li">
+                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive">
+                                <img src="<?= base_url() . "public"; ?>/assets/images/ticket.png" alt="Logo" height="20">
+                                <span>Tickets</span>
+                            </a>
+                        </li>
+                    <?php } ?>
+
                     <!-- Ad -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
                         <li class="li-seperate" id="app-content-mng-li">
diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
index 22582cf5..f2b322bd 100644
--- a/app/Views/mail_template.php
+++ b/app/Views/mail_template.php
@@ -32,6 +32,10 @@
   width: 100%;   /* default: allow full width */
 }
 
+p{
+  margin:0 !important;
+}
+
 /* On screens smaller than 600px → force 100% */
 @media screen and (max-width: 600px) {
   .mail-template-footer {
@@ -53,9 +57,16 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0" class="mail-template-header">
       <tr style="height:90px; background-color: #ffffff !important;">
         <td align="left" valign="middle" style="padding:20px;" width="50%">
-          <img src="<?= $client_logo?>"
-            alt="Client Logo"
-            style="max-height:80px; max-width: 160px;">
+        <div style="
+            width:160px;
+            height:80px;
+            background-image:url('<?= $client_logo ?>');
+            background-size:contain;
+            background-repeat:no-repeat;
+            background-position:center;
+        ">
+        </div>
+
         </td>
         <td align="right" valign="middle" style="padding:20px;" width="50%">
           <img src="<?= base_url('/public/assets/images/Nhance-Logo-Final.png'); ?>"
diff --git a/app/Views/report_bds.php b/app/Views/report_bds.php
index 198d203a..e33df6df 100644
--- a/app/Views/report_bds.php
+++ b/app/Views/report_bds.php
@@ -287,23 +287,36 @@ $(document).ready(function() {
 
                                 data = data.replace(/&nbsp;/g, '').replace(/\s+/g, ' ').trim();
 
-                                // If it's the first column (index 0), remove link and special chars
-                                if (column === 0 || column === 20 || column === 11 ) {
-                                    // Remove all <a> tags and their contents
-                                    data = data.replace(/<a[^>]*>(.*?)<\/a>/gi, '');
-                                    // Also remove other HTML tags and &nbsp;
-                                    data = $('<div>').html(data).text().replace(/\u00a0/g, ' ').trim();
+                                // If it's the first, 20th, 10th, or 11th column, clean the data
+                                if (column === 0 || column === 20 || column === 10 || column === 11) {
+                                    // Remove all <a> tags and their contents first
+                                    data = data.replace(/<a[^>]*>.*?<\/a>/gi, '');
+
+                                    // Convert any HTML entities / remaining tags to plain text
+                                    // (jQuery used only for HTML decoding; you can replace with DOMParser if you prefer)
+                                    data = $('<div>').html(data).text();
+
+                                    // Normalize NBSP to space
+                                    data = data.replace(/\u00A0/g, ' ');
+
+                                    // Remove BOM, zero-width, and control characters
+                                    data = data.replace(/[\u0000-\u001F\u007F-\u009F\u200B-\u200F\uFEFF]/g, '').trim();
                                 }
 
-                                // Force K and L columns to string
+                                // Do NOT prepend \u200C. Return raw cleaned value.
+                                // If you need to force Excel as string, use the formula trick or prepend a single apostrophe.
                                 if (column === 10 || column === 11) {
-                                    // Option 1: prepend single quote
-                                    return '\u200C' + data;
-
-                                    // Option 2: use Excel formula trick
+                                    // Option A: return as Excel formula to preserve formatting
                                     // return '="' + data + '"';
+
+                                    // Option B: prepend apostrophe (visible in Excel formula bar, not in cell)
+                                    // return "'" + data;
+
+                                    return data;
                                 }
+
                                 return data;
+
                             }
                         }
                     },