From dffc1a8508f80f4088c1d08c82c3caf85915a3fa Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Sun, 6 Apr 2025 09:55:01 +0530
Subject: [PATCH] FIX_CLAIM_API_DATE_ISSUE_AND_USER_LOGIN_NAME_SHOWING_ISSUE :
 RV

---
 app/Controllers/EmployeeRestController.php | 12 ++++++++++++
 app/Controllers/TicketController.php       | 17 ++++++++++++-----
 app/Views/ticket_conversation.php          |  2 +-
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index e86f5de7..199505a7 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -3124,6 +3124,18 @@ class EmployeeRestController extends AdminController
         $client_policy_id = $received_data['client_policy_id'];
         $insured_emp_id = $received_data['insured_emp_id'];
 
+        if (empty($received_data['doa'])) {
+            $received_data['doa'] = null;
+        } else{
+            $ticket_data['doa'] = change_date_format($received_data['doa']);
+        }
+
+        if (empty($received_data['dod'])) {
+            $received_data['dod'] = null;
+        } else{
+            $ticket_data['dod'] = change_date_format($received_data['dod']);
+        }
+
         $sql = "
             select 
                 cp.policy_type_id,
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 03224684..f6999bdf 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -774,13 +774,20 @@ class TicketController extends BaseController
     {
         // log_message('error','Function called');die();
         // $ticket_master_id = $this->request->getPost('id');
-        $user_id =  get_session_userid();
-        $logged_user = $this->userModel->select('first_name,last_name,profile')->where('id', $user_id)->first();
         $dataToSend = [];
-        $dataToSend['user_name'] = $logged_user['first_name'] . ' ' . $logged_user['last_name'];
-        $dataToSend['messages'] = $this->ticketMessageModel->where('is_active', 1)
-            ->where('ticket_id', $ticket_master_id)->orderBy('created_at', 'DESC')
+
+        $user_id =  get_session_userid();
+        // $logged_user = $this->userModel->select('first_name,last_name,profile')->where('id', $user_id)->first();
+        // $dataToSend['user_name'] = $logged_user['first_name'] . ' ' . $logged_user['last_name'];
+
+        $dataToSend['messages'] = $this->ticketMessageModel
+            ->select('ticket_messages.*,up.first_name as user_name')
+            ->join('user_profiles up', 'up.id = ticket_messages.created_by', 'left')
+            ->where('ticket_messages.is_active', 1)
+            ->where('ticket_messages.ticket_id', $ticket_master_id)
+            ->orderBy('ticket_messages.created_at', 'DESC')
             ->findAll();
+
         foreach ($dataToSend['messages'] as $message) {
             $mail_content_converted = $this->convertHtmlToText($message['mail_content']);
             $message['mail_content'] = $mail_content_converted;
diff --git a/app/Views/ticket_conversation.php b/app/Views/ticket_conversation.php
index e0e67c6a..d2fa00c3 100644
--- a/app/Views/ticket_conversation.php
+++ b/app/Views/ticket_conversation.php
@@ -49,7 +49,7 @@
                     <div class="row">
                     <img src="https://venbait.in/nhance/helpdesk/dev/assets/helpdeskz/images/agent.jpg"
                             class="user-avatar rounded-circle img-fluid col-mb-6" style="max-width: 70px">
-                            <div style="padding-left: 10px;padding-top: 15px;" class="col-mb-6"><?= $message_data['user_name'] ?></div>
+                            <div style="padding-left: 10px;padding-top: 15px;" class="col-mb-6"><?= $message['user_name'] ?? "Auto Mail" ?></div>
 
                     </div>
                         <span style="text-align: center;    position: relative;text-align: center;bottom: 28px;left: 15px;" class="badge badge-primary">Staff</span>