From a517e185d5943d8b880229b100661aed08e15cb9 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Tue, 16 Aug 2022 15:58:05 -0600
Subject: [PATCH] Add status dropdown to search (#6455)
* Update app_languages.php
* Update email_queue.php
* Update app_languages.php
---
app/email_queue/app_languages.php | 62 ++++++++++++++++++++++++++++++-
app/email_queue/email_queue.php | 40 ++++++++++++++++++--
2 files changed, 97 insertions(+), 5 deletions(-)
diff --git a/app/email_queue/app_languages.php b/app/email_queue/app_languages.php
index fa0e6ba9db..783051c7fd 100644
--- a/app/email_queue/app_languages.php
+++ b/app/email_queue/app_languages.php
@@ -501,4 +501,64 @@
$text['description-email_retry_count']['sv-se'] = '';
$text['description-email_retry_count']['uk-ua'] = '';
-?>
\ No newline at end of file
+ $text['label-waiting']['en-us'] = 'waiting';
+ $text['label-waiting']['ar-eg'] = '';
+ $text['label-waiting']['de-at'] = '';
+ $text['label-waiting']['de-ch'] = '';
+ $text['label-waiting']['de-de'] = '';
+ $text['label-waiting']['es-cl'] = '';
+ $text['label-waiting']['es-mx'] = '';
+ $text['label-waiting']['fr-ca'] = '';
+ $text['label-waiting']['fr-fr'] = '';
+ $text['label-waiting']['he-il'] = '';
+ $text['label-waiting']['it-it'] = '';
+ $text['label-waiting']['nl-nl'] = '';
+ $text['label-waiting']['pl-pl'] = '';
+ $text['label-waiting']['pt-br'] = '';
+ $text['label-waiting']['pt-pt'] = '';
+ $text['label-waiting']['ro-ro'] = '';
+ $text['label-waiting']['ru-ru'] = '';
+ $text['label-waiting']['sv-se'] = '';
+ $text['label-waiting']['uk-ua'] = '';
+
+ $text['label-failed']['en-us'] = 'failed';
+ $text['label-failed']['ar-eg'] = '';
+ $text['label-failed']['de-at'] = '';
+ $text['label-failed']['de-ch'] = '';
+ $text['label-failed']['de-de'] = '';
+ $text['label-failed']['es-cl'] = '';
+ $text['label-failed']['es-mx'] = '';
+ $text['label-failed']['fr-ca'] = '';
+ $text['label-failed']['fr-fr'] = '';
+ $text['label-failed']['he-il'] = '';
+ $text['label-failed']['it-it'] = '';
+ $text['label-failed']['nl-nl'] = '';
+ $text['label-failed']['pl-pl'] = '';
+ $text['label-failed']['pt-br'] = '';
+ $text['label-failed']['pt-pt'] = '';
+ $text['label-failed']['ro-ro'] = '';
+ $text['label-failed']['ru-ru'] = '';
+ $text['label-failed']['sv-se'] = '';
+ $text['label-failed']['uk-ua'] = '';
+
+ $text['label-sent']['en-us'] = 'sent';
+ $text['label-sent']['ar-eg'] = '';
+ $text['label-sent']['de-at'] = '';
+ $text['label-sent']['de-ch'] = '';
+ $text['label-sent']['de-de'] = '';
+ $text['label-sent']['es-cl'] = '';
+ $text['label-sent']['es-mx'] = '';
+ $text['label-sent']['fr-ca'] = '';
+ $text['label-sent']['fr-fr'] = '';
+ $text['label-sent']['he-il'] = '';
+ $text['label-sent']['it-it'] = '';
+ $text['label-sent']['nl-nl'] = '';
+ $text['label-sent']['pl-pl'] = '';
+ $text['label-sent']['pt-br'] = '';
+ $text['label-sent']['pt-pt'] = '';
+ $text['label-sent']['ro-ro'] = '';
+ $text['label-sent']['ru-ru'] = '';
+ $text['label-sent']['sv-se'] = '';
+ $text['label-sent']['uk-ua'] = '';
+
+?>
diff --git a/app/email_queue/email_queue.php b/app/email_queue/email_queue.php
index 2163be62c5..6338f9eb80 100644
--- a/app/email_queue/email_queue.php
+++ b/app/email_queue/email_queue.php
@@ -100,8 +100,9 @@
//get the count
$sql = "select count(email_queue_uuid) ";
$sql .= "from v_email_queue ";
+ $sql .= "where true ";
if (isset($search)) {
- $sql .= "where (";
+ $sql .= "and (";
$sql .= " lower(email_from) like :search ";
$sql .= " or lower(email_to) like :search ";
$sql .= " or lower(email_subject) like :search ";
@@ -110,6 +111,10 @@
$sql .= ") ";
$parameters['search'] = '%'.$search.'%';
}
+ if (isset($_GET["email_status"]) && $_GET["email_status"] != '') {
+ $sql .= "and email_status = :email_status ";
+ $parameters['email_status'] = $_GET["email_status"];
+ }
//else {
// $sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
// $parameters['domain_uuid'] = $domain_uuid;
@@ -143,8 +148,9 @@
$sql .= "email_status, ";
$sql .= "email_retry_count ";
$sql .= "from v_email_queue ";
- if (isset($_GET["search"])) {
- $sql .= "where (";
+ $sql .= "where true ";
+ if (isset($search)) {
+ $sql .= "and (";
$sql .= " lower(email_from) like :search ";
$sql .= " or lower(email_to) like :search ";
$sql .= " or lower(email_subject) like :search ";
@@ -153,6 +159,10 @@
$sql .= ") ";
$parameters['search'] = '%'.$search.'%';
}
+ if (isset($_GET["email_status"]) && $_GET["email_status"] != '') {
+ $sql .= "and email_status = :email_status ";
+ $parameters['email_status'] = $_GET["email_status"];
+ }
$sql .= order_by($order_by, $order, 'email_date', 'desc');
$sql .= limit_offset($rows_per_page, $offset);
$parameters['time_zone'] = $time_zone;
@@ -184,7 +194,29 @@
if (permission_exists('email_queue_delete') && $email_queue) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
}
- echo "