Reporting

- Add ticket summary & ticket by client report (itflow-org#514) - General tidy
wrongecho · Feb 4, 2023 · e5a5aeb · e5a5aeb
1 parent aad55c6
commit e5a5aeb
Show file tree

Hide file tree

Showing 9 changed files with 264 additions and 39 deletions.
diff --git a/report_expense_by_vendor.php b/report_expense_by_vendor.php
@@ -9,12 +9,6 @@
     $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
@@ -9,12 +9,6 @@
     $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 @@
     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
@@ -9,12 +9,6 @@
     $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 @@
                     $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
@@ -9,12 +9,6 @@
     $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
@@ -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 @@
                     $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
@@ -10,9 +10,9 @@
 }
 
 //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 @@
 
                             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 @@
 
                             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 @@
 
                             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 @@
 
                             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 @@
 
                         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 @@
 
                         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 @@
 
                         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 @@
 
                         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
@@ -0,0 +1,74 @@
+<?php
+
+require_once("inc_all_reports.php");
+validateTechRole();
+
+if (isset($_GET['year'])) {
+    $year = intval($_GET['year']);
+} else {
+    $year = date('Y');
+}
+
+$sql_ticket_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(ticket_created_at) AS ticket_year FROM tickets WHERE company_id = $session_company_id ORDER BY ticket_year DESC");
+
+$sql_clients = mysqli_query($mysqli,"SELECT client_id, client_name FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+
+?>
+
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring"></i> Tickets By Client</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print"></i> Print</button>
+            </div>
+        </div>
+        <div class="card-body">
+            <form class="mb-3">
+                <select onchange="this.form.submit()" class="form-control" name="year">
+                    <?php
+                    while ($row = mysqli_fetch_array($sql_ticket_years)) {
+                        $ticket_year = $row['ticket_year']; ?>
+                        <option <?php if ($year == $ticket_year) { ?> selected <?php } ?> > <?php echo $ticket_year; ?></option>
+                    <?php } ?>
+                </select>
+            </form>
+
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th>Client</th>
+                        <th class="text-right">Ticket Count</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+                    while ($row = mysqli_fetch_array($sql_clients)) {
+                        $client_id = $row['client_id'];
+                        $client_name = htmlentities($row['client_name']);
+
+                        $sql_ticket_count = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_count FROM tickets WHERE YEAR(ticket_created_at) = $year AND ticket_client_id = '$client_id'");
+                        $row = mysqli_fetch_array($sql_ticket_count);
+
+                        $ticket_count = intval($row['ticket_count']);
+
+                        if ($ticket_count > 0) {
+
+                            ?>
+
+                            <tr>
+                                <td><?php echo $client_name; ?></td>
+                                <td class="text-right"><?php echo $ticket_count; ?></td>
+                            </tr>
+                            <?php
+                        }
+                    }
+                    ?>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+<?php
+require_once("footer.php");