diff --git a/recurring_invoices.php b/recurring_invoices.php index a94f1f24..a7f79656 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -18,8 +18,14 @@ if (isset($_GET['client_id'])) { // Perms enforceUserPermission('module_sales'); -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); +// Status Filter +if (isset($_GET['status']) && $_GET['status'] == "inactive") { + $status_filter = "inactive"; + $status_query = "AND recurring_status = 0"; +} else { + $status_filter = "active"; + $status_query = "AND recurring_status = 1"; +} $sql = mysqli_query( $mysqli, @@ -29,6 +35,7 @@ $sql = mysqli_query( LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_id WHERE (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') AND DATE(recurring_created_at) BETWEEN '$dtf' AND '$dtt' + $status_query $client_query ORDER BY $sort $order LIMIT $record_from, $record_to"); @@ -49,6 +56,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +
@@ -60,7 +68,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+