From 97ab1df76220299468f25a506c3af072c62b96aa Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 21 Jul 2026 13:21:23 -0400 Subject: [PATCH] Feature: Add Transactions, reorg Main side nav --- agent/includes/side_nav.php | 70 ++- .../modals/transaction/transaction_export.php | 250 ++++++++ agent/post/transaction.php | 216 +++++++ agent/transactions.php | 554 ++++++++++++++++++ 4 files changed, 1058 insertions(+), 32 deletions(-) create mode 100644 agent/modals/transaction/transaction_export.php create mode 100644 agent/post/transaction.php create mode 100644 agent/transactions.php diff --git a/agent/includes/side_nav.php b/agent/includes/side_nav.php index 22a9605a..ccb60cbf 100644 --- a/agent/includes/side_nav.php +++ b/agent/includes/side_nav.php @@ -30,8 +30,29 @@

+
  • + + +

    All Client Docs

    + +     +
    • +
  • + "> + +

    Vendors

    +     +
    • + +
  • + "> + +

    Calendar

    +     +
    • + = 1) { ?>
  • SUPPORT
    • @@ -71,12 +92,6 @@ -
  • - "> - -

    Calendar

    -     -
    • = 1) { ?>
  • BILLING
  • @@ -112,12 +127,6 @@

    • -
  • - "> - -

    Revenues

    -     -
  • "> @@ -136,9 +145,9 @@
  • - "> - -

    Vendors

    +     "> + +

    Revenues
  • @@ -158,12 +167,24 @@

    • +
  • + "> + +

    Trips

    +     +
  • ">

    Accounts
    • +
  • + "> + +

    Transactions

    +     +
  • "> @@ -171,26 +192,11 @@
    • -
  • - "> - -

    Trips

    -     -
    • - - - = 1) { ?> -
  • - - -

    Client Overview

    - -     -
    • = 1) { ?> -
  • +
  • TOOLS
    • +

  • Reports

    diff --git a/agent/modals/transaction/transaction_export.php b/agent/modals/transaction/transaction_export.php new file mode 100644 index 00000000..aba81fb4 --- /dev/null +++ b/agent/modals/transaction/transaction_export.php @@ -0,0 +1,250 @@ + + +
    +
    Exporting Transactions to CSV
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + += ' . floatval($_POST['amount_min']) . ')'; + } else { + // Default - any + $amount_min_query = ''; + } + if (isset($_POST['amount_max']) && $_POST['amount_max'] != '') { + $amount_max_query = 'AND (ABS(transaction_amount) <= ' . floatval($_POST['amount_max']) . ')'; + } else { + // Default - any + $amount_max_query = ''; + } + + // Search Filter - mirrors the transactions page search box + $q = escapeSql($_POST['q']); + if (!empty($q)) { + $search_query = "AND (transaction_description LIKE '%$q%' OR transaction_category LIKE '%$q%' OR transaction_reference LIKE '%$q%' OR transaction_other_account LIKE '%$q%' OR transaction_amount LIKE '%$q%')"; + } else { + // Default - any + $search_query = ''; + } + + // Date Filter + if (!empty($date_from) && !empty($date_to)) { + $date_query = "AND DATE(transaction_date) BETWEEN '$date_from' AND '$date_to'"; + } else { + $date_query = ''; + } + + // Account is required - export is a per-account ledger + if ($account) { + + // Account details for the running balance and file name + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_id = $account LIMIT 1")); + $account_name = $row['account_name']; + $account_opening_balance = floatval($row['opening_balance']); + + // Same ledger as transactions.php - full unfiltered ledger for the balance, filters applied outside + $sql = mysqli_query( + $mysqli, + "SELECT * FROM ( + SELECT *, + $account_opening_balance + SUM(transaction_amount) OVER (ORDER BY transaction_date ASC, transaction_created_at ASC, transaction_type ASC, transaction_id ASC) AS transaction_balance + FROM ( + SELECT + CASE WHEN transfer_id IS NOT NULL THEN 'Transfer In' ELSE 'Revenue' END AS transaction_type, + revenue_id AS transaction_id, + revenue_date AS transaction_date, + revenue_created_at AS transaction_created_at, + CASE WHEN transfer_id IS NOT NULL THEN transfer_notes ELSE revenue_description END AS transaction_description, + from_account.account_name AS transaction_other_account, + revenue_reference AS transaction_reference, + revenue_client_id AS transaction_client_id, + CASE WHEN transfer_id IS NOT NULL THEN transfer_method ELSE revenue_payment_method END AS transaction_payment_method, + revenue_category_id AS transaction_category_id, + category_name AS transaction_category, + revenue_amount AS transaction_amount + FROM revenues + LEFT JOIN categories ON revenue_category_id = category_id + LEFT JOIN transfers ON transfer_revenue_id = revenue_id + LEFT JOIN expenses AS transfer_expense ON transfer_expense_id = transfer_expense.expense_id + LEFT JOIN accounts AS from_account ON transfer_expense.expense_account_id = from_account.account_id + WHERE revenue_account_id = $account + AND revenue_archived_at IS NULL + + UNION ALL + + SELECT + CASE WHEN transfer_id IS NOT NULL THEN 'Transfer Out' ELSE 'Expense' END, + expense_id, + expense_date, + expense_created_at, + CASE WHEN transfer_id IS NOT NULL THEN transfer_notes ELSE expense_description END, + to_account.account_name, + expense_reference, + expense_client_id, + CASE WHEN transfer_id IS NOT NULL THEN transfer_method ELSE expense_payment_method END, + expense_category_id, + category_name, + -expense_amount + FROM expenses + LEFT JOIN categories ON expense_category_id = category_id + LEFT JOIN transfers ON transfer_expense_id = expense_id + LEFT JOIN revenues AS transfer_revenue ON transfer_revenue_id = transfer_revenue.revenue_id + LEFT JOIN accounts AS to_account ON transfer_revenue.revenue_account_id = to_account.account_id + WHERE expense_account_id = $account + AND expense_archived_at IS NULL + + UNION ALL + + SELECT + 'Payment', + payment_id, + payment_date, + payment_created_at, + CONCAT('Payment for Invoice ', invoice_prefix, invoice_number), + NULL, + payment_reference, + invoice_client_id, + payment_method, + 0, + 'Invoice Payment', + payment_amount + FROM payments + LEFT JOIN invoices ON payment_invoice_id = invoice_id + WHERE payment_account_id = $account + AND payment_archived_at IS NULL + ) AS ledger + ) AS transactions + WHERE 1 = 1 + $date_query + $type_query + $category_query + $client_query + $payment_method_query + $amount_min_query + $amount_max_query + $search_query + ORDER BY transaction_date ASC, transaction_created_at ASC, transaction_type ASC, transaction_id ASC" + ); + + $num_rows = mysqli_num_rows($sql); + if ($num_rows > 0) { + $delimiter = ","; + $enclosure = '"'; + $escape = '\\'; // backslash + $filename = sanitizeFilename("$session_company_name-$account_name-Transactions-" . date('Y-m-d_H-i-s') . ".csv"); + + //create a file pointer + $f = fopen('php://memory', 'w'); + + //set column headers + $fields = array('Date', 'Type', 'Description', 'Transfer Account', 'Reference', 'Category', 'Payment Method', 'Amount', 'Balance'); + fputcsv($f, $fields, $delimiter, $enclosure, $escape); + + //output each row of the data, format line as csv and write to file pointer + while ($row = mysqli_fetch_assoc($sql)) { + $lineData = array($row['transaction_date'], $row['transaction_type'], $row['transaction_description'], $row['transaction_other_account'], $row['transaction_reference'], $row['transaction_category'], $row['transaction_payment_method'], $row['transaction_amount'], $row['transaction_balance']); + fputcsv($f, $lineData, $delimiter, $enclosure, $escape); + } + + //move back to beginning of file + fseek($f, 0); + + //set headers to download file rather than displayed + header('Content-Type: text/csv'); + header('Content-Disposition: attachment; filename="' . $filename . '";'); + + //output all remaining data on a file pointer + fpassthru($f); + } + + logAudit("Transaction", "Export", "$session_name exported $num_rows transaction(s) to CSV file"); + + } + + exit; + +} diff --git a/agent/transactions.php b/agent/transactions.php new file mode 100644 index 00000000..914faf70 --- /dev/null +++ b/agent/transactions.php @@ -0,0 +1,554 @@ += ' . floatval($_GET['amount_min']) . ')'; + $amount_min_filter = floatval($_GET['amount_min']); +} else { + // Default - any + $amount_min_query = ''; + $amount_min_filter = ''; +} +if (isset($_GET['amount_max']) && $_GET['amount_max'] != '') { + $amount_max_query = 'AND (ABS(transaction_amount) <= ' . floatval($_GET['amount_max']) . ')'; + $amount_max_filter = floatval($_GET['amount_max']); +} else { + // Default - any + $amount_max_query = ''; + $amount_max_filter = ''; +} + +// Balance only makes sense in chronological order - hide the column under any other sort +if ($sort == 'transaction_date') { + $balance_visible = true; +} else { + $balance_visible = false; +} + +if ($account_filter) { + + // Account details - opening balance feeds the running balance, currency feeds the summary + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_id = $account_filter LIMIT 1")); + $account_currency_code = escapeHtml($row['account_currency_code']); + $account_opening_balance = floatval($row['opening_balance']); + + // Transfers are stored as a linked expense (from account) + revenue (to account) pair, + // so we detect them via the transfers link table and relabel the row accordingly + // The running balance is calculated over the account's full ledger BEFORE any filters, + // so the balance per transaction stays accurate no matter what is filtered out + + $ledger_query = + "SELECT *, + $account_opening_balance + SUM(transaction_amount) OVER (ORDER BY transaction_date ASC, transaction_created_at ASC, transaction_type ASC, transaction_id ASC) AS transaction_balance + FROM ( + SELECT + CASE WHEN transfer_id IS NOT NULL THEN 'Transfer In' ELSE 'Revenue' END AS transaction_type, + revenue_id AS transaction_id, + transfer_id AS transaction_transfer_id, + 0 AS transaction_invoice_id, + revenue_date AS transaction_date, + revenue_created_at AS transaction_created_at, + CASE WHEN transfer_id IS NOT NULL THEN transfer_notes ELSE revenue_description END AS transaction_description, + from_account.account_name AS transaction_other_account, + revenue_reference AS transaction_reference, + revenue_client_id AS transaction_client_id, + CASE WHEN transfer_id IS NOT NULL THEN transfer_method ELSE revenue_payment_method END AS transaction_payment_method, + revenue_category_id AS transaction_category_id, + category_name AS transaction_category, + revenue_amount AS transaction_amount, + revenue_currency_code AS transaction_currency_code + FROM revenues + LEFT JOIN categories ON revenue_category_id = category_id + LEFT JOIN transfers ON transfer_revenue_id = revenue_id + LEFT JOIN expenses AS transfer_expense ON transfer_expense_id = transfer_expense.expense_id + LEFT JOIN accounts AS from_account ON transfer_expense.expense_account_id = from_account.account_id + WHERE revenue_account_id = $account_filter + AND revenue_archived_at IS NULL + + UNION ALL + + SELECT + CASE WHEN transfer_id IS NOT NULL THEN 'Transfer Out' ELSE 'Expense' END, + expense_id, + transfer_id, + 0, + expense_date, + expense_created_at, + CASE WHEN transfer_id IS NOT NULL THEN transfer_notes ELSE expense_description END, + to_account.account_name, + expense_reference, + expense_client_id, + CASE WHEN transfer_id IS NOT NULL THEN transfer_method ELSE expense_payment_method END, + expense_category_id, + category_name, + -expense_amount, + expense_currency_code + FROM expenses + LEFT JOIN categories ON expense_category_id = category_id + LEFT JOIN transfers ON transfer_expense_id = expense_id + LEFT JOIN revenues AS transfer_revenue ON transfer_revenue_id = transfer_revenue.revenue_id + LEFT JOIN accounts AS to_account ON transfer_revenue.revenue_account_id = to_account.account_id + WHERE expense_account_id = $account_filter + AND expense_archived_at IS NULL + + UNION ALL + + SELECT + 'Payment', + payment_id, + NULL, + payment_invoice_id, + payment_date, + payment_created_at, + CONCAT('Payment for Invoice ', invoice_prefix, invoice_number), + NULL, + payment_reference, + invoice_client_id, + payment_method, + 0, + 'Invoice Payment', + payment_amount, + payment_currency_code + FROM payments + LEFT JOIN invoices ON payment_invoice_id = invoice_id + WHERE payment_account_id = $account_filter + AND payment_archived_at IS NULL + ) AS ledger"; + + $transaction_filter_query = + "WHERE DATE(transaction_date) BETWEEN '$dtf' AND '$dtt' + AND (transaction_description LIKE '%$q%' OR transaction_category LIKE '%$q%' OR transaction_reference LIKE '%$q%' OR transaction_other_account LIKE '%$q%' OR transaction_amount LIKE '%$q%') + $type_query + $category_query + $client_query + $payment_method_query + $amount_min_query + $amount_max_query"; + + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM ( + $ledger_query + ) AS transactions + $transaction_filter_query + ORDER BY $sort $order LIMIT $record_from, $record_to" + ); + + $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + // Summary - money in / money out / net for the current filtered view, plus current account balance + $sql_summary = mysqli_query( + $mysqli, + "SELECT + SUM(CASE WHEN transaction_amount > 0 THEN transaction_amount ELSE 0 END) AS total_in, + SUM(CASE WHEN transaction_amount < 0 THEN transaction_amount ELSE 0 END) AS total_out, + SUM(transaction_amount) AS total_net + FROM ( + $ledger_query + ) AS transactions + $transaction_filter_query" + ); + $row = mysqli_fetch_assoc($sql_summary); + $summary_total_in = floatval($row['total_in']); + $summary_total_out = floatval($row['total_out']); + $summary_total_net = floatval($row['total_net']); + +} else { + $num_rows = [0]; +} + +?> + +
    +
    +

    Transactions

    + +
    + +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    + + + + + +
    +
    +
    +
    +
    + + + +
    +
    + +
    +
    +

    +

    Money In

    +
    +
    + +
    +
    +
    + + +
    + +
    +
    +

    +

    Money Out

    +
    +
    + +
    +
    +
    + + +
    + +
    "> +
    +

    +

    Net

    +
    +
    + +
    +
    +
    + +
    + +
    + + "> + + + + + + + + + + + + From $transaction_other_account"; + } elseif ($transaction_type == 'Transfer Out') { + $transaction_category_display = "To $transaction_other_account"; + } else { + $transaction_category_display = $transaction_category; + } + + // Badge color based on type + if ($transaction_type == 'Revenue' || $transaction_type == 'Payment') { + $transaction_badge_color = "success"; + } elseif ($transaction_type == 'Expense') { + $transaction_badge_color = "danger"; + } else { + $transaction_badge_color = "secondary"; + } + + // Amount text color + if ($transaction_amount < 0) { + $transaction_amount_color = "text-danger"; + } else { + $transaction_amount_color = "text-success"; + } + + // Balance text color + if ($transaction_balance < 0) { + $transaction_balance_color = "text-danger"; + } else { + $transaction_balance_color = ""; + } + + // Route the date link to the right edit modal based on type + if ($transaction_type == 'Transfer In' || $transaction_type == 'Transfer Out') { + $transaction_modal_url = "modals/transfer/transfer_edit.php?id=$transaction_transfer_id"; + } elseif ($transaction_type == 'Expense') { + $transaction_modal_url = "modals/expense/expense_edit.php?id=$transaction_id"; + } elseif ($transaction_type == 'Revenue') { + $transaction_modal_url = "modals/revenue/revenue_edit.php?id=$transaction_id"; + } else { + $transaction_modal_url = ""; + } + + ?> + + + + + + + + + + + + + + +
    + + Date + + + + Type + + + + Category + + / + + Description + + + + Amount + + Balance
    + + + + + + + + + + + +
    +
    +
    + + + + +

    Select an account above to view its transactions.

    + + + +
    +
    + +