mirror of
https://github.com/itflow-org/itflow
synced 2026-03-04 21:04:50 +00:00
Allow searching by Invoice Quote Prefix and number ex inv-1
This commit is contained in:
@@ -42,7 +42,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
|
|||||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices, categories
|
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices, categories
|
||||||
WHERE invoices.client_id = $client_id
|
WHERE invoices.client_id = $client_id
|
||||||
AND invoices.category_id = categories.category_id
|
AND invoices.category_id = categories.category_id
|
||||||
AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status 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%')
|
||||||
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||||
|
|
||||||
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoice
|
|||||||
WHERE invoices.client_id = $client_id
|
WHERE invoices.client_id = $client_id
|
||||||
AND payments.invoice_id = invoices.invoice_id
|
AND payments.invoice_id = invoices.invoice_id
|
||||||
AND payments.account_id = accounts.account_id
|
AND payments.account_id = accounts.account_id
|
||||||
AND (invoice_number LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%')
|
AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%')
|
||||||
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||||
|
|
||||||
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
||||||
|
|||||||
@@ -558,6 +558,7 @@ if(isset($_GET['client_id'])){
|
|||||||
|
|
||||||
while($row = mysqli_fetch_array($sql_invoices)){
|
while($row = mysqli_fetch_array($sql_invoices)){
|
||||||
$invoice_id = $row['invoice_id'];
|
$invoice_id = $row['invoice_id'];
|
||||||
|
$invoice_prefix = $row['invoice_prefix'];
|
||||||
$invoice_number = $row['invoice_number'];
|
$invoice_number = $row['invoice_number'];
|
||||||
$invoice_status = $row['invoice_status'];
|
$invoice_status = $row['invoice_status'];
|
||||||
$invoice_date = $row['invoice_date'];
|
$invoice_date = $row['invoice_date'];
|
||||||
@@ -567,8 +568,8 @@ if(isset($_GET['client_id'])){
|
|||||||
?>
|
?>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo $invoice_number; ?></td>
|
<td><?php echo "$invoice_prefix$invoice_number"; ?></td>
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($invoice_amount,2); ?></td>
|
<td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
|
||||||
<td><?php echo $invoice_date; ?></td>
|
<td><?php echo $invoice_date; ?></td>
|
||||||
<td><?php echo $invoice_due; ?></td>
|
<td><?php echo $invoice_due; ?></td>
|
||||||
<td><?php echo $invoice_status; ?></td>
|
<td><?php echo $invoice_status; ?></td>
|
||||||
@@ -605,6 +606,7 @@ if(isset($_GET['client_id'])){
|
|||||||
|
|
||||||
while($row = mysqli_fetch_array($sql_payments)){
|
while($row = mysqli_fetch_array($sql_payments)){
|
||||||
$invoice_id = $row['invoice_id'];
|
$invoice_id = $row['invoice_id'];
|
||||||
|
$invoice_prefix = $row['invoice_prefix'];
|
||||||
$invoice_number = $row['invoice_number'];
|
$invoice_number = $row['invoice_number'];
|
||||||
$invoice_status = $row['invoice_status'];
|
$invoice_status = $row['invoice_status'];
|
||||||
$invoice_amount = $row['invoice_amount'];
|
$invoice_amount = $row['invoice_amount'];
|
||||||
@@ -621,10 +623,10 @@ if(isset($_GET['client_id'])){
|
|||||||
<tr>
|
<tr>
|
||||||
<td><?php echo $payment_date; ?></td>
|
<td><?php echo $payment_date; ?></td>
|
||||||
<td><?php echo $invoice_due; ?></td>
|
<td><?php echo $invoice_due; ?></td>
|
||||||
<td><?php echo $invoice_number; ?></td>
|
<td><?php echo "$invoice_prefix$invoice_number"; ?></td>
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($invoice_amount,2); ?></td>
|
<td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($payment_amount,2); ?></td>
|
<td class="text-right">$<?php echo number_format($payment_amount,2); ?></td>
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($invoice_balance,2); ?></td>
|
<td class="text-right">$<?php echo number_format($invoice_balance,2); ?></td>
|
||||||
<td><?php echo $payment_method; ?></td>
|
<td><?php echo $payment_method; ?></td>
|
||||||
<td><?php echo $payment_reference; ?></td>
|
<td><?php echo $payment_reference; ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -656,6 +658,7 @@ if(isset($_GET['client_id'])){
|
|||||||
|
|
||||||
while($row = mysqli_fetch_array($sql_quotes)){
|
while($row = mysqli_fetch_array($sql_quotes)){
|
||||||
$quote_id = $row['quote_id'];
|
$quote_id = $row['quote_id'];
|
||||||
|
$quote_prefix = $row['quote_prefix'];
|
||||||
$quote_number = $row['quote_number'];
|
$quote_number = $row['quote_number'];
|
||||||
$quote_status = $row['quote_status'];
|
$quote_status = $row['quote_status'];
|
||||||
$quote_date = $row['quote_date'];
|
$quote_date = $row['quote_date'];
|
||||||
@@ -665,7 +668,7 @@ if(isset($_GET['client_id'])){
|
|||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo $quote_number; ?></td>
|
<td><?php echo $quote_number; ?></td>
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($quote_amount,2); ?></td>
|
<td class="text-right">$<?php echo number_format($quote_amount,2); ?></td>
|
||||||
<td><?php echo $quote_date; ?></td>
|
<td><?php echo $quote_date; ?></td>
|
||||||
<td><?php echo $quote_status; ?></td>
|
<td><?php echo $quote_status; ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
|
|||||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, categories
|
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, categories
|
||||||
WHERE client_id = $client_id
|
WHERE client_id = $client_id
|
||||||
AND categories.category_id = quotes.category_id
|
AND categories.category_id = quotes.category_id
|
||||||
AND (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 $sb $o LIMIT $record_from, $record_to");
|
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||||
|
|
||||||
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
||||||
|
|||||||
@@ -104,7 +104,7 @@
|
|||||||
AND invoices.category_id = categories.category_id
|
AND invoices.category_id = categories.category_id
|
||||||
AND invoices.company_id = $session_company_id
|
AND invoices.company_id = $session_company_id
|
||||||
AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt'
|
AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt'
|
||||||
AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status 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 category_name LIKE '%$q%')
|
||||||
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||||
|
|
||||||
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoice
|
|||||||
AND payments.account_id = accounts.account_id
|
AND payments.account_id = accounts.account_id
|
||||||
AND payments.company_id = $session_company_id
|
AND payments.company_id = $session_company_id
|
||||||
AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt'
|
AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt'
|
||||||
AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
|
AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
|
||||||
ORDER BY $sb $o LIMIT $record_from, $record_to"
|
ORDER BY $sb $o LIMIT $record_from, $record_to"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, clients,
|
|||||||
WHERE quotes.client_id = clients.client_id
|
WHERE quotes.client_id = clients.client_id
|
||||||
AND quotes.category_id = categories.category_id
|
AND quotes.category_id = categories.category_id
|
||||||
AND quotes.company_id = $session_company_id
|
AND quotes.company_id = $session_company_id
|
||||||
AND (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 (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'
|
AND DATE(quote_date) BETWEEN '$dtf' AND '$dtt'
|
||||||
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user