diff --git a/dashboard.php b/dashboard.php index 370f2e44..e0eaba60 100644 --- a/dashboard.php +++ b/dashboard.php @@ -5,10 +5,17 @@ $sql_total_income = mysqli_query($mysqli,"SELECT SUM(invoice_payment_amount) AS total_income FROM invoice_payments"); $row = mysqli_fetch_array($sql_total_income); $total_income = $row['total_income']; + $sql_total_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses"); $row = mysqli_fetch_array($sql_total_expenses); $total_expenses = $row['total_expenses']; +$sql_invoice_totals = mysqli_query($mysqli,"SELECT SUM(invoice_total) AS invoice_totals FROM invoices"); +$row = mysqli_fetch_array($sql_invoice_totals); +$invoice_totals = $row['invoice_totals']; + +$recievables = $invoice_totals - $total_income; + $profit = $total_income - $total_expenses; $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts ORDER BY account_id DESC"); @@ -19,9 +26,11 @@ $sql_latest_income_payments = mysqli_query($mysqli,"SELECT * FROM invoice_paymen ORDER BY invoice_payments.invoice_payment_id DESC LIMIT 5" ); -$sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, categories - WHERE expenses.category_id = categories.category_id - ORDER BY expense_id DESC LIMIT 5"); +$sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, categories + WHERE expenses.vendor_id = vendors.vendor_id + AND expenses.category_id = categories.category_id + ORDER BY expense_id DESC LIMIT 5" +); ?> @@ -34,6 +43,8 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, categories