From 0d60d93ab1068bd4c31b6146de779aa6b4c304c6 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 12 Mar 2024 19:24:34 +0100
Subject: [PATCH] add lastname and filtering to historicticket

---
 Layout/default/HistoricTicket/Index.php            | 4 ++++
 application/HistoricTicket/HistoricTicketModel.php | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Layout/default/HistoricTicket/Index.php b/Layout/default/HistoricTicket/Index.php
index 5fa77b806..c7c3d19a7 100644
--- a/Layout/default/HistoricTicket/Index.php
+++ b/Layout/default/HistoricTicket/Index.php
@@ -44,6 +44,10 @@ include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php")
             </div>
         </template>
 
+        <template v-slot:first_name="{ row }">
+            {{ row.first_name }} {{ row.last_name }}
+        </template>
+
         <template v-slot:ticket_number="{ row }">
             <a href="#" @click="clickTicketNumber(row.ticket_number)">{{ row.ticket_number }}</a>
         </template>
diff --git a/application/HistoricTicket/HistoricTicketModel.php b/application/HistoricTicket/HistoricTicketModel.php
index 6be6d317f..d7f645673 100644
--- a/application/HistoricTicket/HistoricTicketModel.php
+++ b/application/HistoricTicket/HistoricTicketModel.php
@@ -64,7 +64,6 @@ class HistoricTicketModel {
         $sql .= isset($filters['contact_id']) ? " AND `contact_id` = " . $filters['contact_id'] : "";
         $sql .= isset($filters['company']) ? self::generateFilterCondition($filters['company'], "company") : "";
         $sql .= isset($filters['company_id']) ? " AND `company_id` = " . $filters['company_id'] : "";
-        $sql .= isset($filters['first_name']) ? self::generateFilterCondition($filters['first_name'], "first_name") : "";
         $sql .= isset($filters['middle_name']) ? self::generateFilterCondition($filters['middle_name'], "middle_name") : "";
         $sql .= isset($filters['last_name']) ? self::generateFilterCondition($filters['last_name'], "last_name") : "";
         $sql .= isset($filters['email']) ? " AND `email` LIKE '%" . $filters['email'] . "%'" : "";
@@ -78,6 +77,14 @@ class HistoricTicketModel {
         $sql .= isset($filters['order_id']) ? " AND `order_id` = " . $filters['order_id'] : "";
         $sql .= isset($filters['last_response_time']) ? " AND `last_response_time` = " . $filters['last_response_time'] : "";
         $sql .= isset($filters['cc_addresses']) ? self::generateFilterCondition($filters['cc_addresses'], "cc_addresses") : "";
+
+        if (isset($filters['first_name'])) {
+            $filterItems = explode(" ", $filters['first_name']);
+            foreach ($filterItems as $item) {
+                $sql .= " AND (`first_name` LIKE '%" . $item . "%' OR `middle_name` LIKE '%" . $item . "%' OR `last_name` LIKE '%" . $item . "%')";
+            }
+        }
+
         return $sql;
     }