Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/add-lastname-historicticket' into 'master'

Browse Source 
add lastname and filtering to historicticket

See merge request fronk/thetool!293
This commit is contained in:
Frank Schubert
2024-03-12 18:25:13 +00:00
parent 62ee336788 0d60d93ab1
commit 223d6fd7b7
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/HistoricTicket/Index.php
View File

@@ -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>

9
application/HistoricTicket/HistoricTicketModel.php
View File

@@ -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;
}