diff --git a/agent/invoices.php b/agent/invoices.php index c457774e8..6c91b2630 100644 --- a/agent/invoices.php +++ b/agent/invoices.php @@ -101,10 +101,13 @@ $sql = mysqli_query( invoice_amount, invoice_created_at, invoice_currency_code, invoice_date, invoice_discount_amount, invoice_due, invoice_id, invoice_number, invoice_prefix, invoice_scope, invoice_status, recurring_invoice_id, recurring_invoice_number, - recurring_invoice_prefix FROM invoices + recurring_invoice_prefix, IFNULL(invoice_payments.amount_paid, 0) AS amount_paid FROM invoices LEFT JOIN clients ON invoice_client_id = client_id LEFT JOIN categories ON invoice_category_id = category_id LEFT JOIN recurring_invoices ON invoice_recurring_invoice_id = recurring_invoice_id + LEFT JOIN (SELECT payment_invoice_id, SUM(payment_amount) AS amount_paid + FROM payments + GROUP BY payment_invoice_id) AS invoice_payments ON payment_invoice_id = invoice_id WHERE ($status_query) $overdue_query $category_query @@ -342,6 +345,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $invoice_due = escapeHtml($row['invoice_due']); $invoice_discount = floatval($row['invoice_discount_amount']); $invoice_amount = floatval($row['invoice_amount']); + $amount_paid = floatval($row['amount_paid']); + $invoice_balance = $invoice_amount - $amount_paid; $invoice_currency_code = escapeHtml($row['invoice_currency_code']); $invoice_created_at = escapeHtml($row['invoice_created_at']); $client_id = intval($row['client_id']); @@ -398,7 +403,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + + 0 && $invoice_balance > 0) { ?> +
due + +