From d8bb6dd4c1ee9e7f01b5e9992695278bc84409f6 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 10 Apr 2024 14:06:25 -0400
Subject: [PATCH] Moved back Recurring Ticket, Invoices and Expense back to the
 main side nav and added bagdge counters for them. They were just to buried
 and were used often

---
 expenses.php           |  4 ----
 inc_all.php            | 11 +++++++++++
 invoices.php           |  4 ----
 recurring_expenses.php |  4 ++--
 recurring_invoices.php |  3 +--
 side_nav.php           | 39 ++++++++++++++++++++++++++++++++++++---
 6 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/expenses.php b/expenses.php
index 93106df2..7565f318 100644
--- a/expenses.php
+++ b/expenses.php
@@ -24,9 +24,6 @@ $sql = mysqli_query(
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
-$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_expense_id') AS num FROM recurring_expenses WHERE recurring_expense_archived_at IS NULL"));
-$recurring_expense_count = $row['num'];
-
 ?>
 
     <div class="card card-dark">
@@ -51,7 +48,6 @@ $recurring_expense_count = $row['num'];
                     </div>
                     <div class="col-sm-8">
                         <div class="btn-group float-right">
-                            <a href="recurring_expenses.php" class="btn btn-outline-primary"><i class="fa fa-fw fa-redo-alt mr-2"></i>Recurring | <b><?php echo $recurring_expense_count; ?></b></a>
                             <div class="dropdown ml-2" id="bulkActionButton" hidden>
                                 <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
                                     <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
diff --git a/inc_all.php b/inc_all.php
index e772d4a8..c1a7e7ea 100644
--- a/inc_all.php
+++ b/inc_all.php
@@ -16,6 +16,10 @@ require_once "top_nav.php";
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NULL AND ticket_status != 4"));
 $num_active_tickets = $row['num'];
 
+// Recurring Ticket Count
+$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('scheduled_ticket_id') AS num FROM scheduled_tickets"));
+$num_recurring_tickets = $row['num'];
+
 // Active Project Count
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('project_id') AS num FROM projects WHERE project_archived_at IS NULL AND project_completed_at IS NULL"));
 $num_active_projects = $row['num'];
@@ -24,10 +28,17 @@ $num_active_projects = $row['num'];
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL"));
 $num_open_invoices = $row['num'];
 
+// Recurring Invoice Count
+$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL"));
+$num_recurring_invoices = $row['num'];
+
 // Open Quotes Count
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE (quote_status = 'Sent' OR quote_status = 'Viewed') AND quote_archived_at IS NULL"));
 $num_open_quotes = $row['num'];
 
+// Recurring Expenses Count
+$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_expense_id') AS num FROM recurring_expenses WHERE recurring_expense_archived_at IS NULL"));
+$num_recurring_expenses = $row['num'];
 
 require_once "side_nav.php";
 
diff --git a/invoices.php b/invoices.php
index ce0856ff..e5f3eff1 100644
--- a/invoices.php
+++ b/invoices.php
@@ -6,9 +6,6 @@ $order = "DESC";
 
 require_once "inc_all.php";
 
-$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL"));
-$recurring_invoice_count = $row['num'];
-
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent'"));
 $sent_count = $row['num'];
 
@@ -159,7 +156,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                     <div class="col-sm-8">
                         <div class="btn-group float-right">
-                            <a href="recurring_invoices.php" class="btn btn-outline-primary"><i class="fa fa-fw fa-redo-alt mr-2"></i>Recurring | <b><?php echo $recurring_invoice_count; ?></b></a>
                         </div>
                     </div>
                 </div>
diff --git a/recurring_expenses.php b/recurring_expenses.php
index b2517640..3cc3696b 100644
--- a/recurring_expenses.php
+++ b/recurring_expenses.php
@@ -28,9 +28,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
     <div class="card card-dark">
         <div class="card-header py-2">
-            <h3 class="card-title mt-2"><a href="expenses.php"><i class="fas fa-fw fa-shopping-cart mr-2"></i>Expenses</a> / <i class="fas fa-fw fa-clock mr-2"></i>Recurring</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-redo-alt mr-2"></i>Recurring Expenses</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#createRecurringExpenseModal"><i class="fas fa-plus mr-2"></i>Create</button>
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#createRecurringExpenseModal"><i class="fas fa-plus mr-2"></i>New Recurring Expense</button>
             </div>
         </div>
 
diff --git a/recurring_invoices.php b/recurring_invoices.php
index 25a2efd5..e27154d4 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.php
@@ -26,7 +26,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-redo-alt mr-2"></i>Recurring Invoices</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus mr-2"></i>Create</button>
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus mr-2"></i>New Recurring Invoice</button>
         </div>
     </div>
 
@@ -44,7 +44,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </div>
                 <div class="col-sm-8">
                     <div class="btn-group float-right">
-                        <a href="invoices.php" class="btn btn-outline-primary"><i class="fa fa-fw fa-file-invoice mr-2"></i>Back to Invoices</a>
                     </div>
                 </div>
             </div>
diff --git a/side_nav.php b/side_nav.php
index ade8c9c4..65ae5a79 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -26,7 +26,7 @@
                 <?php if ($session_user_role >= 2 && $config_module_enable_ticketing == 1) { ?>
                     <li class="nav-header mt-3">SUPPORT</li>
                     <li class="nav-item">
-                        <a href="tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php" || basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") { echo "active"; } ?>">
+                        <a href="tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>
                                 Tickets
@@ -36,6 +36,17 @@
                             </p>
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a href="recurring_tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-redo-alt ml-1"></i>
+                            <p>
+                                Recurring
+                                <?php if ($num_recurring_tickets) { ?>
+                                    <span class="right badge text-light"><?php echo $num_recurring_tickets; ?></span>
+                                <?php } ?>
+                            </p>
+                        </a>
+                    </li>
                     <li class="nav-item">
                         <a href="projects.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "projects.php" || basename($_SERVER["PHP_SELF"]) == "project_details.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>
@@ -68,7 +79,7 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
+                        <a href="invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-file-invoice"></i>
                             <p>
                                 Invoices
@@ -78,6 +89,17 @@
                             </p>
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a href="recurring_invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-redo-alt ml-1"></i>
+                            <p>
+                                Recurring
+                                <?php if ($num_recurring_invoices) { ?>
+                                    <span class="right badge text-light"><?php echo $num_recurring_invoices; ?></span>
+                                <?php } ?>
+                            </p>
+                        </a>
+                    </li>
                     <li class="nav-item">
                         <a href="revenues.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "revenues.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
@@ -106,11 +128,22 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php" || basename($_SERVER["PHP_SELF"]) == "recurring_expenses.php") { echo "active"; } ?>">
+                        <a href="expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-shopping-cart"></i>
                             <p>Expenses</p>
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a href="recurring_expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_expenses.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-redo-alt ml-1"></i>
+                            <p>
+                                Recurring
+                                <?php if ($num_recurring_expenses) { ?>
+                                    <span class="right badge text-light"><?php echo $num_recurring_expenses; ?></span>
+                                <?php } ?>
+                            </p>
+                        </a>
+                    </li>
                     <li class="nav-item">
                         <a href="accounts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "accounts.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-piggy-bank"></i>