From ada9f69af3330cd713ba9faf11d9fa52b4ed96d3 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Thu, 18 Aug 2022 13:13:50 -0600
Subject: [PATCH] Add status dropdown to Fax Queue search (#6459)

* Update fax_queue.php

* Update app_languages.php
---
 app/fax_queue/app_languages.php | 60 +++++++++++++++++++++++++++++++++
 app/fax_queue/fax_queue.php     | 30 +++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/app/fax_queue/app_languages.php b/app/fax_queue/app_languages.php
index 293018ecda..ed79394fa3 100644
--- a/app/fax_queue/app_languages.php
+++ b/app/fax_queue/app_languages.php
@@ -661,4 +661,64 @@
 		$text['description-fax_command']['sv-se'] = '';
 		$text['description-fax_command']['uk-ua'] = '';
 
+		$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/fax_queue/fax_queue.php b/app/fax_queue/fax_queue.php
index 23941f77c1..0ac1091b5a 100644
--- a/app/fax_queue/fax_queue.php
+++ b/app/fax_queue/fax_queue.php
@@ -116,6 +116,10 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
+	if (isset($_GET["fax_status"]) && $_GET["fax_status"] != '') {
+		$sql .= "and fax_status = :fax_status ";
+		$parameters['fax_status'] = $_GET["fax_status"];
+	}
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 	unset($sql, $parameters);
@@ -176,6 +180,10 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
+	if (isset($_GET["fax_status"]) && $_GET["fax_status"] != '') {
+		$sql .= "and fax_status = :fax_status ";
+		$parameters['fax_status'] = $_GET["fax_status"];
+	}
 	$sql .= order_by($order_by, $order, 'fax_date', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$parameters['time_zone'] = $time_zone;
@@ -208,6 +216,28 @@
 		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 		"<form id='form_search' class='inline' method='get'>\n";
+	echo "		<select class='formfld' name='fax_status'>\n";
+    echo "			<option value='' selected='selected' disabled hidden>".$text['label-fax_status']."...</option>";
+	echo "			<option value=''></option>\n";
+	if (isset($_GET["fax_status"]) && $_GET["fax_status"] == "waiting") {
+		echo "			<option value='waiting' selected='selected'>".$text['label-waiting']."</option>\n";
+	}
+	else {
+		echo "			<option value='waiting'>".$text['label-waiting']."</option>\n";
+	}
+	if (isset($_GET["fax_status"]) && $_GET["fax_status"] == "failed") {
+		echo "			<option value='failed' selected='selected'>".$text['label-failed']."</option>\n";
+	}
+	else {
+		echo "			<option value='failed'>".$text['label-failed']."</option>\n";
+	}
+	if (isset($_GET["fax_status"]) && $_GET["fax_status"] == "sent") {
+		echo "			<option value='sent' selected='selected'>".$text['label-sent']."</option>\n";
+	}
+	else {
+		echo "			<option value='sent'>".$text['label-sent']."</option>\n";
+	}
+	echo "		</select>\n";
 	if (permission_exists('fax_queue_all')) {
 		if ($_GET['show'] == 'all') {
 			echo "		<input type='hidden' name='show' value='all'>\n";