Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-25 03:43:33 +01:00
Code Issues Releases Wiki Activity

Search filters

Browse Source
This commit is contained in:
FreeScout 2019-07-27 05:51:05 -07:00
parent 83d5b26922
commit c478556c67
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ConversationsController.php
View File

@ -2042,7 +2042,7 @@ class ConversationsController extends Controller
$join->on('conversations.id', '=', 'threads.conversation_id'); $join->on('conversations.id', '=', 'threads.conversation_id');
}); });
if ($q) { if ($q) {
$query_conversations->where(function ($query) use ($like) { $query_conversations->where(function ($query) use ($like, $filters, $q) {
$query->where('conversations.subject', 'like', $like) $query->where('conversations.subject', 'like', $like)
->orWhere('conversations.customer_email', 'like', $like) ->orWhere('conversations.customer_email', 'like', $like)
->orWhere('conversations.number', 'like', $like) ->orWhere('conversations.number', 'like', $like)
@ -2052,6 +2052,8 @@ class ConversationsController extends Controller
->orWhere('threads.to', 'like', $like) ->orWhere('threads.to', 'like', $like)
->orWhere('threads.cc', 'like', $like) ->orWhere('threads.cc', 'like', $like)
->orWhere('threads.bcc', 'like', $like); ->orWhere('threads.bcc', 'like', $like);
$query = \Eventy::filter('search.conversations.or_where', $query, $filters, $q);
}); });
} }
@ -2098,7 +2100,7 @@ class ConversationsController extends Controller
$query_conversations->where('conversations.created_at', '<=', date('Y-m-d 23:59:59', strtotime($filters['before']))); $query_conversations->where('conversations.created_at', '<=', date('Y-m-d 23:59:59', strtotime($filters['before'])));
} }
$query_conversations = \Eventy::filter('search.apply_filters', $query_conversations, $filters, $q); $query_conversations = \Eventy::filter('search.conversations.apply_filters', $query_conversations, $filters, $q);
$query_conversations->orderBy('conversations.last_reply_at'); $query_conversations->orderBy('conversations.last_reply_at');