From 4e72925c21f1a4e3b2818d095125409be49d671e Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Thu, 31 Oct 2024 15:40:02 -0400
Subject: [PATCH] BIG FIX: When accessing ticket, invoice, recurring invoice or
 quote details while in the client section of ITFlow keep the Client Side Nav
 instead of redirecting back to the Main Nav. This caused much confusion in
 the past. This will improve naviagtion in those areas greatly

---
 client_invoices.php           | 2 +-
 client_quotes.php             | 2 +-
 client_recurring_invoices.php | 4 ++--
 client_side_nav.php           | 8 ++++----
 client_tickets.php            | 4 ++--
 invoice.php                   | 8 ++++++--
 quote.php                     | 7 ++++++-
 recurring_invoice.php         | 7 ++++++-
 ticket.php                    | 8 +++++++-
 9 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/client_invoices.php b/client_invoices.php
index 319a65f4..7685317e 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -161,7 +161,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
 
                         <tr>
-                            <td class="text-bold"><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
+                            <td class="text-bold"><a href="invoice.php?client_id=<?php echo $client_id; ?>&invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
                             <td><?php echo $invoice_scope_display; ?></td>
                             <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
                             <td><?php echo $invoice_date; ?></td>
diff --git a/client_quotes.php b/client_quotes.php
index 74ce8d6a..afcda941 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -147,7 +147,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         ?>
 
                         <tr>
-                            <td class="text-bold"><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
+                            <td class="text-bold"><a href="quote.php?client_id=<?php echo $client_id; ?>&quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
                             <td><?php echo $quote_scope_display; ?></td>
                             <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
                             <td><?php echo $quote_date; ?></td>
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index df200297..9395cb3d 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -144,7 +144,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
 
                     <tr>
-                        <td class="text-bold"><a href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>"><?php echo "$recurring_prefix$recurring_number"; ?></a></td>
+                        <td class="text-bold"><a href="recurring_invoice.php?client_id=<?php echo $client_id; ?>&recurring_id=<?php echo $recurring_id; ?>"><?php echo "$recurring_prefix$recurring_number"; ?></a></td>
                         <td><?php echo $recurring_scope; ?></td>
                         <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $recurring_amount, $recurring_currency_code); ?></td>
                         <td><?php echo ucwords($recurring_frequency); ?>ly</td>
@@ -162,7 +162,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>">
+                                    <a class="dropdown-item" href="recurring_invoice.php?client_id=<?php echo $client_id; ?>&recurring_id=<?php echo $recurring_id; ?>">
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <?php if ($status !== 'Active') { ?>
diff --git a/client_side_nav.php b/client_side_nav.php
index 0b5093e5..0dfba8ba 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -55,7 +55,7 @@
                     <li class="nav-header mt-3">SUPPORT</li>
 
                     <li class="nav-item">
-                        <a href="client_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_tickets.php") { echo "active"; } ?>">
+                        <a href="client_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>
                                 Tickets
@@ -259,7 +259,7 @@
                     <?php if (lookupUserPermission("module_sales") >= 1) { ?>
 
                         <li class="nav-item">
-                            <a href="client_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_invoices.php") { echo "active"; } ?>">
+                            <a href="client_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-file-invoice"></i>
                                 <p>
                                     Invoices
@@ -272,7 +272,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "client_recurring_invoice.php") { echo "active"; } ?>">
+                            <a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-redo-alt"></i>
                                 <p>
                                     Recurring Invoices
@@ -285,7 +285,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="client_quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_quotes.php") { echo "active"; } ?>">
+                            <a href="client_quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-comment-dollar"></i>
                                 <p>
                                     Quotes
diff --git a/client_tickets.php b/client_tickets.php
index f332e08c..fba87df6 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -255,12 +255,12 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
 
                         <!-- Ticket Number -->
                         <td>
-                            <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a>
+                            <a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a>
                         </td>
 
                         <!-- Ticket Subject -->
                         <td>
-                            <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
+                            <a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
                         </td>
 
                         <!-- Ticket Contact -->
diff --git a/invoice.php b/invoice.php
index c4b7d938..c1849e27 100644
--- a/invoice.php
+++ b/invoice.php
@@ -1,7 +1,11 @@
 <?php
 
-require_once "inc_all.php";
-
+// If client_id is in URI then show client Side Bar and client header
+if (isset($_GET['client_id'])) {
+    require_once "inc_all_client.php";
+} else { 
+    require_once "inc_all.php";
+}
 
 if (isset($_GET['invoice_id'])) {
 
diff --git a/quote.php b/quote.php
index 092f1a0f..3f6a7add 100644
--- a/quote.php
+++ b/quote.php
@@ -1,6 +1,11 @@
 <?php
-require_once "inc_all.php";
 
+// If client_id is in URI then show client Side Bar and client header
+if (isset($_GET['client_id'])) {
+    require_once "inc_all_client.php";
+} else { 
+    require_once "inc_all.php";
+}
 
 if (isset($_GET['quote_id'])) {
 
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 697219f2..c396199b 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -1,6 +1,11 @@
 <?php
-require_once "inc_all.php";
 
+// If client_id is in URI then show client Side Bar and client header
+if (isset($_GET['client_id'])) {
+    require_once "inc_all_client.php";
+} else { 
+    require_once "inc_all.php";
+}
 
 if (isset($_GET['recurring_id'])) {
 
diff --git a/ticket.php b/ticket.php
index f873c6da..22abe41c 100644
--- a/ticket.php
+++ b/ticket.php
@@ -1,5 +1,11 @@
 <?php
-require_once "inc_all.php";
+
+// If client_id is in URI then show client Side Bar and client header
+if (isset($_GET['client_id'])) {
+    require_once "inc_all_client.php";
+} else { 
+    require_once "inc_all.php";
+}
 
 // Perms
 enforceUserPermission('module_support');