From e5a5aebc2c92405acec27157bab58ad44ceff378 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sat, 4 Feb 2023 16:59:30 +0000 Subject: [PATCH] Reporting - Add ticket summary & ticket by client report (#514) - General tidy --- report_expense_by_vendor.php | 6 -- report_expense_summary.php | 7 -- report_income_by_client.php | 8 +- report_income_summary.php | 6 -- report_recurring_by_client.php | 6 +- report_tax_summary.php | 20 ++--- report_ticket_by_client.php | 74 +++++++++++++++ report_ticket_summary.php | 159 +++++++++++++++++++++++++++++++++ reports_side_nav.php | 17 ++++ 9 files changed, 264 insertions(+), 39 deletions(-) create mode 100644 report_ticket_by_client.php create mode 100644 report_ticket_summary.php diff --git a/report_expense_by_vendor.php b/report_expense_by_vendor.php index 132c5432..694b4391 100644 --- a/report_expense_by_vendor.php +++ b/report_expense_by_vendor.php @@ -9,12 +9,6 @@ if (isset($_GET['year'])) { $year = date('Y'); } -if (isset($_GET['year'])) { - $year = intval($_GET['year']); -} else { - $year = date('Y'); -} - $sql_payment_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC"); $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $session_company_id"); diff --git a/report_expense_summary.php b/report_expense_summary.php index 20674a4e..11d162b4 100644 --- a/report_expense_summary.php +++ b/report_expense_summary.php @@ -9,12 +9,6 @@ if (isset($_GET['year'])) { $year = date('Y'); } -if (isset($_GET['year'])) { - $year = intval($_GET['year']); -} else { - $year = date('Y'); -} - $sql_expense_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(expense_date) AS expense_year FROM expenses WHERE expense_category_id > 0 AND company_id = $session_company_id ORDER BY expense_year DESC"); $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC"); @@ -140,7 +134,6 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_ Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif'; Chart.defaults.global.defaultFontColor = '#292b2c'; - // Area Chart Example var ctx = document.getElementById("cashFlow"); var myLineChart = new Chart(ctx, { type: 'line', diff --git a/report_income_by_client.php b/report_income_by_client.php index b4a774c6..e5a7a7fa 100644 --- a/report_income_by_client.php +++ b/report_income_by_client.php @@ -9,12 +9,6 @@ if (isset($_GET['year'])) { $year = date('Y'); } -if (isset($_GET['year'])) { - $year = intval($_GET['year']); -} else { - $year = date('Y'); -} - $sql_payment_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC"); $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id"); @@ -59,7 +53,7 @@ $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $s $client_id = $row['client_id']; $client_name = htmlentities($row['client_name']); - $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND invoice_client_id = $client_id"); + $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND invoice_client_id = $client_id"); $row = mysqli_fetch_array($sql_amount_paid); $amount_paid = floatval($row['amount_paid']); diff --git a/report_income_summary.php b/report_income_summary.php index 2bc59ac0..dfffedc7 100644 --- a/report_income_summary.php +++ b/report_income_summary.php @@ -9,12 +9,6 @@ if (isset($_GET['year'])) { $year = date('Y'); } -if (isset($_GET['year'])) { - $year = intval($_GET['year']); -} else { - $year = date('Y'); -} - $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC"); $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id ORDER BY category_name ASC"); diff --git a/report_recurring_by_client.php b/report_recurring_by_client.php index aeb295cd..3a493a70 100644 --- a/report_recurring_by_client.php +++ b/report_recurring_by_client.php @@ -3,7 +3,7 @@ require_once("inc_all_reports.php"); validateAccountantRole(); -$sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id"); +$sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id"); ?> @@ -31,13 +31,13 @@ $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $s $client_name = htmlentities($row['client_name']); //Get Monthly Recurring 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 recurring_client_id = $client_id AND company_id = $session_company_id"); + $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 recurring_client_id = $client_id AND company_id = $session_company_id"); $row = mysqli_fetch_array($sql_recurring_monthly_total); $recurring_monthly_total = $row['recurring_monthly_total']; //Get Yearly Recurring Total - $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 recurring_client_id = $client_id AND company_id = $session_company_id"); + $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 recurring_client_id = $client_id AND company_id = $session_company_id"); $row = mysqli_fetch_array($sql_recurring_yearly_total); $recurring_yearly_total = $row['recurring_yearly_total'] / 12; diff --git a/report_tax_summary.php b/report_tax_summary.php index 3c8438ef..a2ce2b84 100644 --- a/report_tax_summary.php +++ b/report_tax_summary.php @@ -10,9 +10,9 @@ if (isset($_GET['year'])) { } //GET unique years from expenses, payments and revenues -$sql_all_years = mysqli_query($mysqli,"SELECT DISTINCT(YEAR(item_created_at)) AS all_years FROM invoice_items WHERE company_id = $session_company_id ORDER BY all_years DESC"); +$sql_all_years = mysqli_query($mysqli, "SELECT DISTINCT(YEAR(item_created_at)) AS all_years FROM invoice_items WHERE company_id = $session_company_id ORDER BY all_years DESC"); -$sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session_company_id ORDER BY tax_name ASC"); +$sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $session_company_id ORDER BY tax_name ASC"); ?> @@ -67,7 +67,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 1; $month<=3; $month++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' @@ -91,7 +91,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 4; $month <= 6; $month ++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' @@ -115,7 +115,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 7; $month <= 9; $month ++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' @@ -139,7 +139,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 10; $month <= 12; $month ++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' @@ -176,7 +176,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 1; $month <= 3; $month ++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' @@ -199,7 +199,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 4; $month <= 6; $month ++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' @@ -222,7 +222,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 7; $month <= 9; $month ++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' @@ -245,7 +245,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session for($month = 10; $month <= 12; $month ++) { - $sql_tax_collected = mysqli_query($mysqli,"SELECT SUM(item_tax) AS tax_collected_for_month + $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month FROM invoices, invoice_items WHERE item_invoice_id = invoice_id AND invoice_status LIKE 'Paid' diff --git a/report_ticket_by_client.php b/report_ticket_by_client.php new file mode 100644 index 00000000..f2bf4941 --- /dev/null +++ b/report_ticket_by_client.php @@ -0,0 +1,74 @@ + + +
+
+

Tickets By Client

+
+ +
+
+
+
+ +
+ +
+ + + + + + + + + 0) { + + ?> + + + + + + + +
ClientTicket Count
+
+
+
+ + + +
+
+

Ticket Summary

+
+ +
+
+
+
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
JanuaryFebruaryMarchAprilMayJuneJulyAugustSeptemberOctoberNovemberDecemberTotal
+
+
+
+ + + + diff --git a/reports_side_nav.php b/reports_side_nav.php index 5e51c493..7ad1ec57 100644 --- a/reports_side_nav.php +++ b/reports_side_nav.php @@ -63,6 +63,23 @@ + +
  • TECHNICAL
    • +
  • + "> + +

    Tickets

    +     +
    • +
  • + "> + +

    Tickets by Client

    +     +
    • + + +