From d9f7a2d1283cb68c9acc85d4f5b1a7b5110ee820 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Sat, 10 Feb 2024 15:13:52 -0500
Subject: [PATCH] Moved Recurring Invoices Inside Invoices and same with
 Recurring Expenses inside expense to reduce side nav menu bloat similar to
 recurring tickets

---
 expenses.php           |  5 ++++-
 invoices.php           |  5 ++++-
 recurring_expenses.php |  2 +-
 recurring_invoices.php |  5 +++++
 side_nav.php           | 20 ++------------------
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/expenses.php b/expenses.php
index 90a2232f..4e3783c6 100644
--- a/expenses.php
+++ b/expenses.php
@@ -6,7 +6,6 @@ $order = "DESC";
 
 require_once "inc_all.php";
 
-
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
 
@@ -25,6 +24,9 @@ $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">
@@ -49,6 +51,7 @@ $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_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/invoices.php b/invoices.php
index 1b8c6bc6..db005b9b 100644
--- a/invoices.php
+++ b/invoices.php
@@ -6,6 +6,8 @@ $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'];
@@ -168,7 +170,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                     <div class="col-sm-8">
-                        <div class="float-right">   
+                        <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 4bde5fa5..b2517640 100644
--- a/recurring_expenses.php
+++ b/recurring_expenses.php
@@ -28,7 +28,7 @@ $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"><i class="fas fa-fw fa-clock mr-2"></i>Recurring Expenses</h3>
+            <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>
             <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>
             </div>
diff --git a/recurring_invoices.php b/recurring_invoices.php
index fb2d45cf..25a2efd5 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.php
@@ -42,6 +42,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </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>
             <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
                 <div class="row">
diff --git a/side_nav.php b/side_nav.php
index b8b01b4e..40ee8fb0 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -66,21 +66,13 @@
                         </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") {
+                        <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";
                                                                 } ?>">
                             <i class="nav-icon fas fa-file-invoice"></i>
                             <p>Invoices</p>
                         </a>
                     </li>
-                    <li class="nav-item">
-                        <a href="recurring_invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php") {
-                                                                                echo "active";
-                                                                            } ?>">
-                            <i class="nav-icon fas fa-redo-alt"></i>
-                            <p>Recurring Invoices</p>
-                        </a>
-                    </li>
                     <li class="nav-item">
                         <a href="revenues.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "revenues.php") {
                                                                     echo "active";
@@ -120,21 +112,13 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php") {
+                        <a href="expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php" || basename($_SERVER["PHP_SELF"]) == "recurring_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"></i>
-                            <p>Recurring Expenses</p>
-                        </a>
-                    </li>
                     <li class="nav-item">
                         <a href="accounts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "accounts.php") {
                                                                     echo "active";