Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix search in sending status

Browse Source 
[MAILPOET-3050]
This commit is contained in:
Pavel Dohnal
2020-08-05 10:09:36 +02:00
committed by Veljko V
parent 2efdb22331
commit ebddfb07e3
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Models/ScheduledTaskSubscriber.php
View File

@ -76,7 +76,7 @@ class ScheduledTaskSubscriber extends Model {
public static function listingQuery($data) { public static function listingQuery($data) {
$group = isset($data['group']) ? $data['group'] : 'all'; $group = isset($data['group']) ? $data['group'] : 'all';
return self::join(Subscriber::$_table, ["subscriber_id", "=", "subscribers.id"], "subscribers") $query = self::join(Subscriber::$_table, ["subscriber_id", "=", "subscribers.id"], "subscribers")
->filter($group, $data['params']) ->filter($group, $data['params'])
->select('error', 'error') ->select('error', 'error')
->select('failed', 'failed') ->select('failed', 'failed')
@ -86,6 +86,19 @@ class ScheduledTaskSubscriber extends Model {
->select('subscribers.id', 'subscriberId') ->select('subscribers.id', 'subscriberId')
->select('subscribers.last_name', 'lastName') ->select('subscribers.last_name', 'lastName')
->select('subscribers.first_name', 'firstName'); ->select('subscribers.first_name', 'firstName');
if (isset($data['search'])) {
$search = trim($data['search']);
$search = str_replace(['\\', '%', '_'], ['\\\\', '\\%', '\\_'], $search); // escape for 'LIKE'
if (strlen($search) === 0) {
return $query;
}
$search = '%' . $search . '%';
return $query->whereRaw(
'(`subscribers`.`email` LIKE ? OR `subscribers`.`first_name` LIKE ? OR `subscribers`.`last_name` LIKE ?)',
[$search, $search, $search]
);
}
return $query;
} }
public static function groups($data) { public static function groups($data) {