From 724540da337c64820e7a70c1b85c2dfe157ee01e Mon Sep 17 00:00:00 2001 From: o-psi Date: Thu, 15 Feb 2024 15:51:11 +0000 Subject: [PATCH] Make same changes to client pages as main recuring invoices and tickets --- client_invoices.php | 98 +++++++++++++++++++---------------- client_recurring_invoices.php | 3 ++ client_side_nav.php | 29 +---------- client_tickets.php | 10 ++++ tickets.php | 2 +- 5 files changed, 70 insertions(+), 72 deletions(-) diff --git a/client_invoices.php b/client_invoices.php index 0ebf2e8f..0fd91ab6 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -21,51 +21,61 @@ $sql = mysqli_query( $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL AND recurring_client_id = $client_id")); +$recurring_invoice_count = $row['num']; + ?> -
-
-

Invoices

-
-
- - -
- - Export - -
+
+
+

Invoices

+
+
+ + +
+ + Export +
-
-
- -
+
+
+ + +
-
-
- -
- -
+
+
+ +
+
+
-
-
- 0) { ?> - +
+
+
+ Recurring | + 0) { ?> +
-
- -
-
- - "> + + + +
+
+
+ "> @@ -76,8 +86,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - + + + ?> - + - - -
Number ScopeStatus Action
+
+ 		@@ -162,23 +174,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- + +
+
+
+
+ Back to Invoices +
diff --git a/client_side_nav.php b/client_side_nav.php index 054d8ec3..898465d2 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -51,7 +51,7 @@
  • SUPPORT
  • - "> + ">

    Tickets @@ -64,19 +64,6 @@

    • -
  • - "> - -

    - Recurring Tickets - 0) { ?> - - - -

    -     -
    • @@ -237,7 +224,7 @@
  • FINANCE
  • - "> + ">

    Invoices @@ -249,18 +236,6 @@

    • -
  • - "> - -

    - Recurring Invoices - 0) { ?> - - -

    -     -
  • "> diff --git a/client_tickets.php b/client_tickets.php index 47e9719d..e8643a0c 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -59,6 +59,11 @@ $sql_total_tickets_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS to $row = mysqli_fetch_array($sql_total_tickets_closed); $total_tickets_closed = intval($row['total_tickets_closed']); +//Get Total Scheduled tickets +$sql_total_scheduled_tickets = mysqli_query($mysqli, "SELECT COUNT(scheduled_ticket_id) AS total_scheduled_tickets FROM scheduled_tickets WHERE scheduled_ticket_client_id = $client_id"); +$row = mysqli_fetch_array($sql_total_scheduled_tickets); +$total_scheduled_tickets = intval($row['total_scheduled_tickets']); + ?>
    @@ -97,8 +102,13 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
    • + +
    + + Recurring Tickets | +
    diff --git a/tickets.php b/tickets.php index f3bb48d0..d53667db 100644 --- a/tickets.php +++ b/tickets.php @@ -77,7 +77,7 @@ $sql_total_tickets_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS to $row = mysqli_fetch_array($sql_total_tickets_closed); $total_tickets_closed = intval($row['total_tickets_closed']); -//Get Total Scheduled tickets +//Get Total Recurring (scheduled) tickets $sql_total_scheduled_tickets = mysqli_query($mysqli, "SELECT COUNT(scheduled_ticket_id) AS total_scheduled_tickets FROM scheduled_tickets"); $row = mysqli_fetch_array($sql_total_scheduled_tickets); $total_scheduled_tickets = intval($row['total_scheduled_tickets']);