From 84366cc1b9c290a2431b8e63c99f5d023ae552bf Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 16 Jun 2024 12:31:45 -0400 Subject: [PATCH] Small UI Comment Cleanup of dashboard --- dashboard.php | 376 ++++++++++++-------------------------------------- 1 file changed, 90 insertions(+), 286 deletions(-) diff --git a/dashboard.php b/dashboard.php index 90903fe2..c875fcea 100644 --- a/dashboard.php +++ b/dashboard.php @@ -1,12 +1,10 @@ +
- + - - - + + - +
> - +
= 2 && $config_module_enable_ticketing == 1) { ?>
> - +
-
window.location.href = \'dashboard_technical.php\';'); } - - //Define var so it doesnt throw errors in logs + // Fetch financial data for the dashboard + // Define variables to avoid errors in logs $largest_income_month = 0; - - //Get Total income $sql_total_payments_to_invoices = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments_to_invoices FROM payments WHERE YEAR(payment_date) = $year"); $row = mysqli_fetch_array($sql_total_payments_to_invoices); $total_payments_to_invoices = floatval($row['total_payments_to_invoices']); - //Do not grab transfer payment as these have a category_id of 0 + $sql_total_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE YEAR(revenue_date) = $year AND revenue_category_id > 0"); $row = mysqli_fetch_array($sql_total_revenues); $total_revenues = floatval($row['total_revenues']); $total_income = $total_payments_to_invoices + $total_revenues; - //Get Total expenses and do not grab transfer expenses as these have a vendor of 0 $sql_total_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_vendor_id > 0 AND YEAR(expense_date) = $year"); $row = mysqli_fetch_array($sql_total_expenses); $total_expenses = floatval($row['total_expenses']); - //Total up all the Invoices that are not draft or cancelled $sql_invoice_totals = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_totals FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' AND YEAR(invoice_date) = $year"); $row = mysqli_fetch_array($sql_invoice_totals); $invoice_totals = floatval($row['invoice_totals']); - //Quaeries from Receivables $sql_total_payments_to_invoices_all_years = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments_to_invoices_all_years FROM payments"); $row = mysqli_fetch_array($sql_total_payments_to_invoices_all_years); $total_payments_to_invoices_all_years = floatval($row['total_payments_to_invoices_all_years']); @@ -126,68 +114,55 @@ if ($user_config_dashboard_financial_enable == 1) { $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC"); - $sql_latest_invoice_payments = mysqli_query( - $mysqli, - "SELECT * FROM payments, invoices, clients - WHERE payment_invoice_id = invoice_id - AND invoice_client_id = client_id - ORDER BY payment_id DESC LIMIT 5" - ); + $sql_latest_invoice_payments = mysqli_query($mysqli, " + SELECT * FROM payments + JOIN invoices ON payment_invoice_id = invoice_id + JOIN clients ON invoice_client_id = client_id + ORDER BY payment_id DESC LIMIT 5 + "); - $sql_latest_expenses = mysqli_query( - $mysqli, - "SELECT * FROM expenses, vendors, categories - WHERE expense_vendor_id = vendor_id - AND expense_category_id = category_id - ORDER BY expense_id DESC LIMIT 5" - ); + $sql_latest_expenses = mysqli_query($mysqli, " + SELECT * FROM expenses + JOIN vendors ON expense_vendor_id = vendor_id + JOIN categories ON expense_category_id = category_id + ORDER BY expense_id DESC LIMIT 5 + "); - //Get Yearly Recurring Income Total + // Get recurring totals $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND YEAR(recurring_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_yearly_total); $recurring_yearly_total = floatval($row['recurring_yearly_total']); - //Get Monthly Recurring Income Total $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND YEAR(recurring_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_monthly_total); $recurring_monthly_total = floatval($row['recurring_monthly_total']) + ($recurring_yearly_total / 12); - //Get Yearly Recurring Expenses Total - $sql_recurring_expense_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_expense_amount) AS recurring_expense_yearly_total FROM recurring_expenses WHERE recurring_expense_status = 1 AND recurring_expense_frequency = 2 AND YEAR(recurring_expense_created_at) <= $year"); + $sql_recurring_expense_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_expense_amount) AS recurring_expense_yearly_total FROM recurring_expenses WHERE recurring_expense_status = 1 AND recurring_expense_frequency = 'year' AND YEAR(recurring_expense_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_expense_yearly_total); $recurring_expense_yearly_total = floatval($row['recurring_expense_yearly_total']); - //Get Monthly Recurring Expenses Total - $sql_recurring_expense_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_expense_amount) AS recurring_expense_monthly_total FROM recurring_expenses WHERE recurring_expense_status = 1 AND recurring_expense_frequency = 1 AND YEAR(recurring_expense_created_at) <= $year"); + $sql_recurring_expense_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_expense_amount) AS recurring_expense_monthly_total FROM recurring_expenses WHERE recurring_expense_status = 1 AND recurring_expense_frequency = 'month' AND YEAR(recurring_expense_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_expense_monthly_total); $recurring_expense_monthly_total = floatval($row['recurring_expense_monthly_total']) + ($recurring_expense_yearly_total / 12); - //Get Total Miles Driven $sql_miles_driven = mysqli_query($mysqli, "SELECT SUM(trip_miles) AS total_miles FROM trips WHERE YEAR(trip_date) = $year"); $row = mysqli_fetch_array($sql_miles_driven); $total_miles = floatval($row['total_miles']); if ($config_module_enable_ticketing && $config_module_enable_accounting) { - //Get Unbilled, closed tickets - $sql_unbilled_tickets = mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS unbilled_tickets FROM tickets WHERE ticket_closed_at IS NOT NULL AND ticket_billable = 1 AND ticket_invoice_id = 0 AND YEAR(ticket_created_at) = $year"); + $sql_unbilled_tickets = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS unbilled_tickets FROM tickets WHERE ticket_closed_at IS NOT NULL AND ticket_billable = 1 AND ticket_invoice_id = 0 AND YEAR(ticket_created_at) = $year"); $row = mysqli_fetch_array($sql_unbilled_tickets); $unbilled_tickets = intval($row['unbilled_tickets']); } else { - //Get Total Recurring Invoices added - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS recurring_invoices_added FROM recurring WHERE YEAR(recurring_created_at) = $year")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(recurring_id) AS recurring_invoices_added FROM recurring WHERE YEAR(recurring_created_at) = $year")); $recurring_invoices_added = intval($row['recurring_invoices_added']); } - - //Get Total Clients added - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('client_id') AS clients_added FROM clients WHERE YEAR(client_created_at) = $year AND client_archived_at IS NULL")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(client_id) AS clients_added FROM clients WHERE YEAR(client_created_at) = $year AND client_archived_at IS NULL")); $clients_added = intval($row['clients_added']); - - //Get Total Vendors added - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS vendors_added FROM vendors WHERE YEAR(vendor_created_at) = $year AND vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(vendor_id) AS vendors_added FROM vendors WHERE YEAR(vendor_created_at) = $year AND vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL")); $vendors_added = intval($row['vendors_added']); - ?>
@@ -199,7 +174,7 @@ if ($user_config_dashboard_financial_enable == 1) {

Income

- Receivables: + Receivables:
@@ -265,24 +240,19 @@ if ($user_config_dashboard_financial_enable == 1) { -

-

Unbilled Ticket 1 || $unbilled_tickets = 0) { - echo "s"; - } ?>

+

Unbilled Ticket 1 || $unbilled_tickets == 0) { echo "s"; } ?>
- -
@@ -295,7 +265,6 @@ if ($user_config_dashboard_financial_enable == 1) {
-
@@ -420,12 +389,10 @@ if ($user_config_dashboard_financial_enable == 1) {
- @@ -450,15 +417,13 @@ if ($user_config_dashboard_financial_enable == 1) { ?> - - +
+
@@ -480,8 +445,7 @@ if ($user_config_dashboard_financial_enable == 1) { - - +
+
@@ -523,13 +486,11 @@ if ($user_config_dashboard_financial_enable == 1) { - @@ -537,14 +498,13 @@ if ($user_config_dashboard_financial_enable == 1) { - +
+
@@ -564,100 +524,51 @@ if ($user_config_dashboard_financial_enable == 1) {
- + CURRENT_DATE - AND domain_expire < CURRENT_DATE + INTERVAL 30 DAY - AND domain_archived_at IS NULL" - )); + $sql_domains_expiring = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(domain_id) AS expiring_domains FROM domains WHERE domain_expire IS NOT NULL AND domain_expire > CURRENT_DATE AND domain_expire < CURRENT_DATE + INTERVAL 30 DAY AND domain_archived_at IS NULL")); $expiring_domains = $sql_domains_expiring['expiring_domains']; - // Expiring Certificates (but not ones that have already expired) - $sql_certs_expiring = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('certificate_id') as expiring_certs - FROM certificates - WHERE certificate_expire IS NOT NULL - AND certificate_expire > CURRENT_DATE - AND certificate_expire < CURRENT_DATE + INTERVAL 30 DAY - AND certificate_archived_at IS NULL" - )); + $sql_certs_expiring = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(certificate_id) AS expiring_certs FROM certificates WHERE certificate_expire IS NOT NULL AND certificate_expire > CURRENT_DATE AND certificate_expire < CURRENT_DATE + INTERVAL 30 DAY AND certificate_archived_at IS NULL")); $expiring_certificates = $sql_certs_expiring['expiring_certs']; - $sql_your_tickets = mysqli_query( - $mysqli, - "SELECT * FROM tickets - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - LEFT JOIN clients ON ticket_client_id = client_id - LEFT JOIN contacts ON ticket_contact_id = contact_id - WHERE ticket_assigned_to = $session_user_id - AND ticket_closed_at IS NULL - ORDER BY ticket_number DESC" - ); - + $sql_your_tickets = mysqli_query($mysqli, " + SELECT * FROM tickets + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + WHERE ticket_assigned_to = $session_user_id + AND ticket_closed_at IS NULL + ORDER BY ticket_number DESC + "); ?>
-
@@ -736,8 +647,7 @@ if ($user_config_dashboard_technical_enable == 1) {
- -
+
@@ -765,9 +675,7 @@ if ($user_config_dashboard_technical_enable == 1) { - Never

"; - } else { - $ticket_updated_at_display = "

Never

"; - } - } else { - $ticket_updated_at_display = "$ticket_updated_at_time_ago"; - } + + $ticket_updated_at_display = empty($ticket_updated_at) ? (empty($ticket_closed_at) ? "

Never

" : "

Never

") : $ticket_updated_at_time_ago; + $client_id = intval($row['ticket_client_id']); $client_name = nullable_htmlentities($row['client_name']); $contact_id = intval($row['ticket_contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); - - - if ($ticket_priority == "High") { - $ticket_priority_color = "danger"; - } elseif ($ticket_priority == "Medium") { - $ticket_priority_color = "warning"; - } else { - $ticket_priority_color = "info"; - } - - if (empty($contact_name)) { - $contact_display = "-"; - } else { - $contact_display = "$contact_name"; - } - + $ticket_priority_color = $ticket_priority == "High" ? "danger" : ($ticket_priority == "Medium" ? "warning" : "info"); + $contact_display = empty($contact_name) ? "-" : "$contact_name"; ?> - - "> + - - - - - - + + - - - + - - - +
- - - - - - - + - - - +