From 7d1cfc586dee4e8cfe5d1858d2749f4c71698036 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 12 Sep 2023 11:31:23 -0400 Subject: [PATCH] Revert last commit invoice quote and recurring were already searchable by its concat prefix and number --- client_invoices.php | 2 +- client_quotes.php | 2 +- client_recurring_invoices.php | 2 +- invoices.php | 2 +- quotes.php | 2 +- recurring_invoices.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client_invoices.php b/client_invoices.php index b5edc1bf..dabaf39d 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -14,7 +14,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM invoices LEFT JOIN categories ON invoice_category_id = category_id WHERE invoice_client_id = $client_id - AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%') + AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); diff --git a/client_quotes.php b/client_quotes.php index 47921c7f..951e0bd5 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -14,7 +14,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM quotes LEFT JOIN categories ON category_id = quote_category_id WHERE quote_client_id = $client_id - AND (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_number LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%') + AND (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php index 106e865a..74d47c76 100644 --- a/client_recurring_invoices.php +++ b/client_recurring_invoices.php @@ -14,7 +14,7 @@ $sql = mysqli_query( "SELECT * FROM recurring LEFT JOIN categories ON recurring_category_id = category_id WHERE recurring_client_id = $client_id - AND (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_number LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR category_name LIKE '%$q%') + AND (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR category_name LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/invoices.php b/invoices.php index 6efd46de..9711ee50 100644 --- a/invoices.php +++ b/invoices.php @@ -78,7 +78,7 @@ $sql = mysqli_query( LEFT JOIN categories ON invoice_category_id = category_id WHERE (invoice_status LIKE '$status_query') AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt' - AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%' OR category_name LIKE '%$q%') + AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%' OR category_name LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); diff --git a/quotes.php b/quotes.php index 9d62627b..8d65c3d4 100644 --- a/quotes.php +++ b/quotes.php @@ -14,7 +14,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM quotes LEFT JOIN clients ON quote_client_id = client_id LEFT JOIN categories ON quote_category_id = category_id - WHERE (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_number LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%' OR quote_amount LIKE '%$q%' OR client_name LIKE '%$q%') + WHERE (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%' OR quote_amount LIKE '%$q%' OR client_name LIKE '%$q%') AND DATE(quote_date) BETWEEN '$dtf' AND '$dtt' ORDER BY $sort $order LIMIT $record_from, $record_to"); diff --git a/recurring_invoices.php b/recurring_invoices.php index 1717e337..4213e858 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -14,7 +14,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM recurring LEFT JOIN clients ON recurring_client_id = client_id LEFT JOIN categories ON recurring_category_id = category_id - WHERE (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_number LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') + 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' ORDER BY $sort $order LIMIT $record_from, $record_to");