diff --git a/transfers.php b/transfers.php index bf8b0667..5cc449d4 100644 --- a/transfers.php +++ b/transfers.php @@ -5,6 +5,24 @@ $order = "DESC"; require_once "inc_all.php"; +// Account Transfer From Filter +if (isset($_GET['account_from']) & !empty($_GET['account_from'])) { + $account_from_query = 'AND (expense_account_id = ' . intval($_GET['account_from']) . ')'; + $account_from = intval($_GET['account_from']); +} else { + // Default - any + $account_from_query = ''; +} + +// Account Transfer To Filter +if (isset($_GET['account_to']) & !empty($_GET['account_to'])) { + $account_to_query = 'AND (revenue_account_id = ' . intval($_GET['account_to']) . ')'; + $account_to = intval($_GET['account_to']); +} else { + // Default - any + $account_to_query = ''; +} + //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); @@ -12,8 +30,10 @@ $url_query_strings_sort = http_build_query($get_copy); $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS transfer_created_at, expense_date AS transfer_date, expense_amount AS transfer_amount, expense_account_id AS transfer_account_from, revenue_account_id AS transfer_account_to, transfer_expense_id, transfer_revenue_id , transfer_id, transfer_method, transfer_notes FROM transfers, expenses, revenues - WHERE transfer_expense_id = expense_id + WHERE transfer_expense_id = expense_id AND transfer_revenue_id = revenue_id + $account_from_query + $account_to_query AND DATE(expense_date) BETWEEN '$dtf' AND '$dtt' AND (transfer_notes LIKE '%$q%' OR transfer_method LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" @@ -44,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
" id="advancedFilter"> +
" id="advancedFilter">
@@ -74,6 +94,46 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+
+ + +
+
+
+
+ + +
+