From 39ba7d83fd44bfee8dec5a9099ee6be8a67eff7e Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 20:45:18 +0000 Subject: [PATCH 01/22] Add ticket status to invoice filter. --- invoice.php | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/invoice.php b/invoice.php index 1363bc62..9e17a79c 100644 --- a/invoice.php +++ b/invoice.php @@ -76,26 +76,36 @@ if (isset($_GET['invoice_id'])) { $sql_payments = mysqli_query($mysqli, "SELECT * FROM payments, accounts WHERE payment_account_id = account_id AND payment_invoice_id = $invoice_id ORDER BY payments.payment_id DESC"); $sql_tickets = mysqli_query($mysqli, " - SELECT - tickets.*, + SELECT + tickets.*, SEC_TO_TIME(SUM(TIME_TO_SEC(STR_TO_DATE(ticket_reply_time_worked, '%H:%i:%s')))) AS 'total_time_worked' - FROM - tickets - LEFT JOIN - ticket_replies ON tickets.ticket_id = ticket_replies.ticket_reply_ticket_id - WHERE - ticket_invoice_id = $invoice_id - GROUP BY - tickets.ticket_id - ORDER BY + FROM + tickets + LEFT JOIN + ticket_replies ON tickets.ticket_id = ticket_replies.ticket_reply_ticket_id + WHERE + ticket_invoice_id = $invoice_id + GROUP BY + tickets.ticket_id + ORDER BY ticket_id DESC "); //Get billable, and unbilled tickets to add to invoice - $sql_tickets_billable = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_client_id = $client_id AND ticket_billable = 1 AND ticket_invoice_id = 0;"); - - - + $sql_tickets_billable = mysqli_query( + $mysqli, " + SELECT + * + FROM + tickets + WHERE + ticket_client_id = $client_id + AND + ticket_billable = 1 + AND + ticket_invoice_id = 0 + AND + ticket_status LIKE '%close%';"); //Add up all the payments for the invoice and get the total amount paid to the invoice From c24aece0469eecd72bf4f7a79ba8ffdac7ae100b Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 20:56:31 +0000 Subject: [PATCH 02/22] Fix Parenthesis --- invoice.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/invoice.php b/invoice.php index 9e17a79c..92f72887 100644 --- a/invoice.php +++ b/invoice.php @@ -105,7 +105,8 @@ if (isset($_GET['invoice_id'])) { AND ticket_invoice_id = 0 AND - ticket_status LIKE '%close%';"); + ticket_status LIKE '%close%'; + "); //Add up all the payments for the invoice and get the total amount paid to the invoice From e5f892132264d3604a195fa0acbbed97729949a0 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 20:59:52 +0000 Subject: [PATCH 03/22] Invoice add ticket modal UI Fix --- invoice_add_ticket_modal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/invoice_add_ticket_modal.php b/invoice_add_ticket_modal.php index 37c07ced..afff2b96 100644 --- a/invoice_add_ticket_modal.php +++ b/invoice_add_ticket_modal.php @@ -8,7 +8,7 @@ × -
+
From 4ed2c7923cc91ddbc389d80dcb9dde003b2acc67 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 21:01:56 +0000 Subject: [PATCH 04/22] Change add button to a plus icon --- invoice_add_ticket_modal.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/invoice_add_ticket_modal.php b/invoice_add_ticket_modal.php index afff2b96..5fa8d2e6 100644 --- a/invoice_add_ticket_modal.php +++ b/invoice_add_ticket_modal.php @@ -23,7 +23,9 @@ - +
Ticket Number Add + +
From 945eb7c87a59dc42a94bde86582204b587a46bb1 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 21:09:07 +0000 Subject: [PATCH 05/22] Add Label to add column on invoice add ticket modal --- invoice_add_ticket_modal.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/invoice_add_ticket_modal.php b/invoice_add_ticket_modal.php index 5fa8d2e6..3839db71 100644 --- a/invoice_add_ticket_modal.php +++ b/invoice_add_ticket_modal.php @@ -13,7 +13,7 @@ Ticket Number Scope - + Add to Invoice - - + From cf87a232c412c225bf51105595ff76b650865b54 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 21:12:23 +0000 Subject: [PATCH 06/22] Invoice add ticket modal UI improvements. --- invoice_add_ticket_modal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/invoice_add_ticket_modal.php b/invoice_add_ticket_modal.php index 3839db71..d1b02122 100644 --- a/invoice_add_ticket_modal.php +++ b/invoice_add_ticket_modal.php @@ -13,7 +13,7 @@ Ticket Number Scope - Add to Invoice + Add to Invoice Date: Wed, 10 Jan 2024 21:15:12 +0000 Subject: [PATCH 07/22] Make table striped --- invoice_add_ticket_modal.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/invoice_add_ticket_modal.php b/invoice_add_ticket_modal.php index d1b02122..28c60968 100644 --- a/invoice_add_ticket_modal.php +++ b/invoice_add_ticket_modal.php @@ -9,25 +9,27 @@
- - - - - - - +
+
Ticket NumberScopeAdd to Invoice
- - - - + + + - -
- Ticket NumberScopeAdd to Invoice
+ + + + + + + + + + +
From 25c26cc2a6c217bff920cad9a830ffe5844d39d3 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 21:15:25 +0000 Subject: [PATCH 08/22] Fix striped Table --- invoice_add_ticket_modal.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/invoice_add_ticket_modal.php b/invoice_add_ticket_modal.php index 28c60968..7c022c68 100644 --- a/invoice_add_ticket_modal.php +++ b/invoice_add_ticket_modal.php @@ -11,11 +11,13 @@
- - - - - + + + + + + + Date: Wed, 10 Jan 2024 21:25:22 +0000 Subject: [PATCH 09/22] Update badge color based on status. --- invoice_add_ticket_modal.php | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/invoice_add_ticket_modal.php b/invoice_add_ticket_modal.php index 7c022c68..911c55a8 100644 --- a/invoice_add_ticket_modal.php +++ b/invoice_add_ticket_modal.php @@ -15,17 +15,37 @@ - + - + - From c7c6b08a1175617df78f1f5eecb44863c8686ee8 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 21:54:43 +0000 Subject: [PATCH 10/22] Add Basic Unbilled tickets report --- report_tickets_unbilled.php | 159 ++++++++++++++++++++++++++++++++++++ reports_side_nav.php | 6 ++ 2 files changed, 165 insertions(+) create mode 100644 report_tickets_unbilled.php diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php new file mode 100644 index 00000000..2e6e4840 --- /dev/null +++ b/report_tickets_unbilled.php @@ -0,0 +1,159 @@ + (int)$days, + 'hour' => (int)$hours, + 'minute' => (int)$minutes, + 'second' => (int)$seconds, + ]; + + foreach ($sections as $name => $value){ + if ($value > 0){ + $timeParts[] = $value. ' '.$name.($value == 1 ? '' : 's'); + } + } + + return implode(', ', $timeParts); +} + +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 ORDER BY ticket_year DESC"); + +$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC"); + +?> + +
+
+

Tickets By Client

+
+ +
+
+
+
+ + + +
+
Ticket NumberScopeAdd to Invoice
Ticket NumberScopeAdd to Invoice
Ticket Number ScopeAdd to InvoiceAdd to Invoice
+ + + +
+ + + + + + + + + + + 0) { + ?> + + + + + + + + + + + + +
ClientTickets RaisedBillable TicketsUnbilled TicketsInvoice Tickets
+ +
+
+
+ + +Tickets

 +
  • + "> + +

    Unbilled Tickets

    +     +
  • "> From 77d115d1f2b733d0dc5d6ea470c9f391b7841553 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:06:19 +0000 Subject: [PATCH 11/22] Update report to not have modal. Too many steps for UI. --- report_tickets_unbilled.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index 2e6e4840..f9fda38a 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -80,7 +80,6 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients Tickets Raised Billable Tickets Unbilled Tickets - Invoice Tickets @@ -124,7 +123,22 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients $ticket_closed_count = intval($row['ticket_closed_count']); // Calculate total tickets raised in period that are closed and billable, but not invoiced - $sql_ticket_unbilled_count = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_unbilled_count FROM tickets WHERE YEAR(ticket_created_at) = $year AND ticket_client_id = $client_id AND ticket_status = 'Closed' AND ticket_billable = 1 AND ticket_invoice_id IS NULL"); + $sql_ticket_unbilled_count = mysqli_query( + $mysqli, + "SELECT + COUNT(ticket_id) AS ticket_unbilled_count + FROM + tickets + WHERE + YEAR(ticket_created_at) = $year + AND + ticket_client_id = $client_id + AND + ticket_status = 'Closed' + AND + ticket_billable = 1 + AND + ticket_invoice_id = 0"); $row = mysqli_fetch_array($sql_ticket_unbilled_count); $ticket_unbilled_count = intval($row['ticket_unbilled_count']); @@ -136,13 +150,6 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients - - - - - Date: Wed, 10 Jan 2024 22:12:46 +0000 Subject: [PATCH 12/22] Add link to tickets screen on unbilled report --- client_tickets.php | 6 ++++++ report_tickets_unbilled.php | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client_tickets.php b/client_tickets.php index 8a02804d..605dd79a 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -18,6 +18,12 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Open') { $ticket_status_snippet = "ticket_status != 'Closed'"; } +if (isset($_GET['unbilled']) && ($_GET['billable']) == '1') { + $billable = '1'; + $ticket_billable_snippet = " AND ticket_billable = 1"; + $ticket_status_snippet = $ticket_status_snippet . $ticket_billable_snippet; +} + //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index f9fda38a..6253028f 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -142,11 +142,13 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients $row = mysqli_fetch_array($sql_ticket_unbilled_count); $ticket_unbilled_count = intval($row['ticket_unbilled_count']); - if ($ticket_raised_count > 0) { + if ($ticket_unbilled_count > 0) { ?> - + + + From b764506f287ad5d5471204bd917b51b1f4fbf7a3 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:15:00 +0000 Subject: [PATCH 13/22] Fix bug in client_tickets.php --- client_tickets.php | 1 - 1 file changed, 1 deletion(-) diff --git a/client_tickets.php b/client_tickets.php index 605dd79a..d1747a91 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -21,7 +21,6 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Open') { if (isset($_GET['unbilled']) && ($_GET['billable']) == '1') { $billable = '1'; $ticket_billable_snippet = " AND ticket_billable = 1"; - $ticket_status_snippet = $ticket_status_snippet . $ticket_billable_snippet; } //Rebuild URL From 87f1b9c0bee19d968d391e91e3cffc90ca75de4a Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:16:40 +0000 Subject: [PATCH 14/22] Add filter to Client Tickets --- client_tickets.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client_tickets.php b/client_tickets.php index d1747a91..7fcdd0e9 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -18,10 +18,11 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Open') { $ticket_status_snippet = "ticket_status != 'Closed'"; } -if (isset($_GET['unbilled']) && ($_GET['billable']) == '1') { +if (isset($_GET['billable']) && ($_GET['billable']) == '1') { $billable = '1'; $ticket_billable_snippet = " AND ticket_billable = 1"; -} + $ticket_status_snippet = $ticket_status . $ticket_billable_snippet; +} //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); From 59cf07bf4985fee86affd0fa85c095e019980ea5 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:23:29 +0000 Subject: [PATCH 15/22] Update filter to allow for closed and open when looking for unbilled. --- client_tickets.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client_tickets.php b/client_tickets.php index 7fcdd0e9..bc838a13 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -19,10 +19,13 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Open') { } if (isset($_GET['billable']) && ($_GET['billable']) == '1') { - $billable = '1'; - $ticket_billable_snippet = " AND ticket_billable = 1"; - $ticket_status_snippet = $ticket_status . $ticket_billable_snippet; -} + $billable = 1; + $ticket_billable_snippet = "ticket_billable = 1"; + $ticket_status_snippet = '1 = 1'; +} else { + $billable = 0; + $ticket_billable_snippet = '1 = 1'; +} //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); @@ -37,6 +40,7 @@ $sql = mysqli_query( LEFT JOIN vendors ON ticket_vendor_id = vendor_id WHERE ticket_client_id = $client_id AND $ticket_status_snippet + AND $ticket_billable_snippet AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%' OR contact_name LIKE '%$q%' OR asset_name LIKE '%$q%' OR vendor_name LIKE '%$q%' OR ticket_vendor_ticket_number LIKE '%q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); From d6454427bb822b240eb9c71496279b1d57b2b6b1 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:26:56 +0000 Subject: [PATCH 16/22] Validate Access to unbilled report. --- report_tickets_unbilled.php | 3 ++- reports_side_nav.php | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index 6253028f..57d5bf54 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -3,6 +3,7 @@ require_once "inc_all_reports.php"; validateTechRole(); +validateAccountantRole(); function secondsToTime($inputSeconds) { $secondsInAMinute = 60; @@ -56,7 +57,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
    -

    Tickets By Client

    +

    Unbilled Tickets By Client

    diff --git a/reports_side_nav.php b/reports_side_nav.php index 61fec13b..7eeafbf6 100644 --- a/reports_side_nav.php +++ b/reports_side_nav.php @@ -82,6 +82,12 @@

    Collections

    • +
  • + "> + +

    Unbilled Tickets

    +     +
    • @@ -92,12 +98,7 @@

    Tickets

    -
  • - "> - -

    Unbilled Tickets

    -     -
    • +
  • "> From e1cb9655d7b5d33593ec754869d80ceeb64f50a0 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:32:21 +0000 Subject: [PATCH 17/22] Add notice if there are no unbilled tickets. --- report_tickets_unbilled.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index 57d5bf54..a2d4b865 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -156,6 +156,19 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients + + You are all caught up! + + + There are no unbilled tickets for this year. + + From 9a649529d223056530e30eee7717585a398e2583 Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:33:24 +0000 Subject: [PATCH 18/22] Refactoring for better readability --- report_tickets_unbilled.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index a2d4b865..2a7be427 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -156,19 +156,17 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients - - You are all caught up! - - - There are no unbilled tickets for this year. - - + + You are all caught up! + + + There are no unbilled tickets for this year. + + From d7e8e606935c7a1b2df5181c510eaa3877a7167c Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 22:40:51 +0000 Subject: [PATCH 19/22] Update message for no tickets. --- report_tickets_unbilled.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index 2a7be427..c2952d5a 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -53,6 +53,9 @@ $sql_ticket_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(ticket_created_a $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC"); +$rows = 0; + + ?>
    @@ -144,6 +147,8 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients $ticket_unbilled_count = intval($row['ticket_unbilled_count']); if ($ticket_unbilled_count > 0) { + $rows = $rows++; + ?> @@ -156,15 +161,14 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients - You are all caught up! - - - There are no unbilled tickets for this year. + You are all caught up! There are no unbilled tickets for this year. + + Date: Wed, 10 Jan 2024 22:41:48 +0000 Subject: [PATCH 20/22] Remove Creepy smiley --- report_tickets_unbilled.php | 1 - 1 file changed, 1 deletion(-) diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index c2952d5a..1ff4ba8a 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -167,7 +167,6 @@ $rows = 0; ?> You are all caught up! There are no unbilled tickets for this year. - Date: Wed, 10 Jan 2024 23:01:34 +0000 Subject: [PATCH 21/22] Old Python Habits Die Hard (i++) --- report_tickets_unbilled.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php index 1ff4ba8a..7accfbbf 100644 --- a/report_tickets_unbilled.php +++ b/report_tickets_unbilled.php @@ -147,7 +147,7 @@ $rows = 0; $ticket_unbilled_count = intval($row['ticket_unbilled_count']); if ($ticket_unbilled_count > 0) { - $rows = $rows++; + $rows = $rows + 1; ?> From 3ea326b0ac6a0b1815ad0217e68b968c1a5db04f Mon Sep 17 00:00:00 2001 From: o-psi Date: Wed, 10 Jan 2024 23:05:42 +0000 Subject: [PATCH 22/22] Adjust filter to only show unbilled --- client_tickets.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client_tickets.php b/client_tickets.php index bc838a13..a7fb7b10 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -19,9 +19,11 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Open') { } if (isset($_GET['billable']) && ($_GET['billable']) == '1') { - $billable = 1; - $ticket_billable_snippet = "ticket_billable = 1"; - $ticket_status_snippet = '1 = 1'; + if (isset($_GET['unbilled'])) { + $billable = 1; + $ticket_billable_snippet = "ticket_billable = 1 AND ticket_invoice_id = 0"; + $ticket_status_snippet = '1 = 1'; + } } else { $billable = 0; $ticket_billable_snippet = '1 = 1';