From 572f12eaef09695b9374573a03bcf6caaadc6157 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 1 Nov 2023 17:51:35 -0400 Subject: [PATCH 01/47] Removed num_format(),2 function for pricing and cost fields as it was putting in commas as this is unacceptable for floatvals --- budget_edit_modal.php | 2 +- expense_copy_modal.php | 2 +- expense_edit_modal.php | 2 +- expense_refund_modal.php | 2 +- invoice_payment_add_modal.php | 2 +- item_edit_modal.php | 2 +- recurring_expense_create_modal.php | 2 +- recurring_expense_edit_modal.php | 2 +- revenues.php | 2 +- ticket_invoice_add_modal.php | 2 +- transfer_edit_modal.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/budget_edit_modal.php b/budget_edit_modal.php index 913096bc..c17d9536 100644 --- a/budget_edit_modal.php +++ b/budget_edit_modal.php @@ -62,7 +62,7 @@
- + diff --git a/expense_copy_modal.php b/expense_copy_modal.php index ab69b03b..8e6273be 100644 --- a/expense_copy_modal.php +++ b/expense_copy_modal.php @@ -27,7 +27,7 @@
- + diff --git a/expense_edit_modal.php b/expense_edit_modal.php index 4140254c..1ef68edc 100644 --- a/expense_edit_modal.php +++ b/expense_edit_modal.php @@ -29,7 +29,7 @@
- + diff --git a/expense_refund_modal.php b/expense_refund_modal.php index c35cba77..d3414562 100644 --- a/expense_refund_modal.php +++ b/expense_refund_modal.php @@ -31,7 +31,7 @@
- + diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php index 7a25845d..7672edf1 100644 --- a/invoice_payment_add_modal.php +++ b/invoice_payment_add_modal.php @@ -36,7 +36,7 @@
- + diff --git a/item_edit_modal.php b/item_edit_modal.php index b623e1b2..21797af1 100644 --- a/item_edit_modal.php +++ b/item_edit_modal.php @@ -52,7 +52,7 @@
- + diff --git a/recurring_expense_create_modal.php b/recurring_expense_create_modal.php index b3b9be43..ba1f110c 100644 --- a/recurring_expense_create_modal.php +++ b/recurring_expense_create_modal.php @@ -68,7 +68,7 @@
- + diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php index 48b5fc85..cedcd108 100644 --- a/recurring_expense_edit_modal.php +++ b/recurring_expense_edit_modal.php @@ -69,7 +69,7 @@
- + diff --git a/revenues.php b/revenues.php index e56d00b6..6ff78a1c 100644 --- a/revenues.php +++ b/revenues.php @@ -105,7 +105,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } $revenue_date = nullable_htmlentities($row['revenue_date']); $revenue_payment_method = nullable_htmlentities($row['revenue_payment_method']); - $revenue_amount = number_format(floatval($row['revenue_amount']),2); + $revenue_amount = floatval($row['revenue_amount']); $revenue_currency_code = nullable_htmlentities($row['revenue_currency_code']); $revenue_created_at = nullable_htmlentities($row['revenue_created_at']); $account_id = intval($row['account_id']); diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php index 5d74fe99..45a4a765 100644 --- a/ticket_invoice_add_modal.php +++ b/ticket_invoice_add_modal.php @@ -155,7 +155,7 @@
- + diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php index 524997c5..b281b359 100644 --- a/transfer_edit_modal.php +++ b/transfer_edit_modal.php @@ -32,7 +32,7 @@
- + From 5a7c62c150dce76efff594dc4cf061c94a2e56a4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 1 Nov 2023 18:16:12 -0400 Subject: [PATCH 02/47] Added back number_format() function as there was a way to just remove the commas but keep the decimal place so 290.90 doesnt look like 290.9 --- budget_edit_modal.php | 2 +- client_edit_modal.php | 2 +- expense_copy_modal.php | 2 +- expense_edit_modal.php | 2 +- expense_refund_modal.php | 2 +- invoice_edit_modal.php | 2 +- invoice_payment_add_modal.php | 2 +- item_edit_modal.php | 2 +- product_edit_modal.php | 2 +- quote_edit_modal.php | 2 +- recurring_expense_edit_modal.php | 2 +- recurring_invoice_edit_modal.php | 2 +- revenue_edit_modal.php | 2 +- ticket_invoice_add_modal.php | 2 +- transfer_edit_modal.php | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/budget_edit_modal.php b/budget_edit_modal.php index c17d9536..b86f24f5 100644 --- a/budget_edit_modal.php +++ b/budget_edit_modal.php @@ -62,7 +62,7 @@
- + diff --git a/client_edit_modal.php b/client_edit_modal.php index f5ae5d7a..d2ee6917 100644 --- a/client_edit_modal.php +++ b/client_edit_modal.php @@ -129,7 +129,7 @@ + value=""> diff --git a/expense_copy_modal.php b/expense_copy_modal.php index 8e6273be..64351a67 100644 --- a/expense_copy_modal.php +++ b/expense_copy_modal.php @@ -27,7 +27,7 @@
- + diff --git a/expense_edit_modal.php b/expense_edit_modal.php index 1ef68edc..528e2904 100644 --- a/expense_edit_modal.php +++ b/expense_edit_modal.php @@ -29,7 +29,7 @@
- + diff --git a/expense_refund_modal.php b/expense_refund_modal.php index d3414562..aa7e82e6 100644 --- a/expense_refund_modal.php +++ b/expense_refund_modal.php @@ -31,7 +31,7 @@
- + diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php index abc451b7..879d04d5 100644 --- a/invoice_edit_modal.php +++ b/invoice_edit_modal.php @@ -67,7 +67,7 @@
- + diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php index 7672edf1..a7aa2a41 100644 --- a/invoice_payment_add_modal.php +++ b/invoice_payment_add_modal.php @@ -36,7 +36,7 @@
- + diff --git a/item_edit_modal.php b/item_edit_modal.php index 21797af1..136f974f 100644 --- a/item_edit_modal.php +++ b/item_edit_modal.php @@ -52,7 +52,7 @@
- + diff --git a/product_edit_modal.php b/product_edit_modal.php index af9b20f8..e1df979a 100644 --- a/product_edit_modal.php +++ b/product_edit_modal.php @@ -55,7 +55,7 @@
- + diff --git a/quote_edit_modal.php b/quote_edit_modal.php index 5188b69d..6e7c12de 100644 --- a/quote_edit_modal.php +++ b/quote_edit_modal.php @@ -54,7 +54,7 @@
- + ; ?>'> diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php index cedcd108..9318825f 100644 --- a/recurring_expense_edit_modal.php +++ b/recurring_expense_edit_modal.php @@ -69,7 +69,7 @@
- + diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php index 42654ec9..6e46562d 100644 --- a/recurring_invoice_edit_modal.php +++ b/recurring_invoice_edit_modal.php @@ -86,7 +86,7 @@
- + diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php index d439d0e0..4a372c89 100644 --- a/revenue_edit_modal.php +++ b/revenue_edit_modal.php @@ -44,7 +44,7 @@
- + diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php index 45a4a765..cf7f6f4e 100644 --- a/ticket_invoice_add_modal.php +++ b/ticket_invoice_add_modal.php @@ -155,7 +155,7 @@
- + diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php index b281b359..a32b5593 100644 --- a/transfer_edit_modal.php +++ b/transfer_edit_modal.php @@ -32,7 +32,7 @@
- + From cd99e91ac3c8409e9d233538ff4feeb4f9ebc88a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 1 Nov 2023 18:55:41 -0400 Subject: [PATCH 03/47] Bold the contact name in client listing --- clients.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients.php b/clients.php index 326f8188..e92fb24e 100644 --- a/clients.php +++ b/clients.php @@ -263,7 +263,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } if (!empty($contact_name)) { ?> -
+
Date: Thu, 2 Nov 2023 13:19:13 -0400 Subject: [PATCH 04/47] Fix Quotes duplicated php start close tags in edit quote discount field --- quote_edit_modal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quote_edit_modal.php b/quote_edit_modal.php index 6e7c12de..3b58eb94 100644 --- a/quote_edit_modal.php +++ b/quote_edit_modal.php @@ -54,7 +54,7 @@
- ; ?>'> +
From ef213e34d4e9e2384c1ae092abe2ada628869154 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 2 Nov 2023 16:12:06 -0400 Subject: [PATCH 05/47] Invoice UI Update: Bolded Due Date, Moved Subtotal to the top added - sign in front of discount, do not subtract the discount from the subtotal as this is reservered for total, do not show tax discount or paid in pdf if they are 0 --- guest_view_invoice.php | 60 ++++++++++++++++++++++++++++++---------- invoice.php | 63 ++++++++++++++++++++++++++++++++---------- quote.php | 2 +- 3 files changed, 95 insertions(+), 30 deletions(-) diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 0e1d19ae..981da396 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -185,7 +185,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it Date - + Due
@@ -212,7 +212,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it + + + + 0) { ?> - + - - - - - - 0) { ?> + + + + 0) { ?> @@ -397,11 +399,11 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it {}, { text: 'Due', - style: 'invoiceDateTitle' + style: 'invoiceDueDateTitle' }, { text: , - style: 'invoiceDateValue' + style: 'invoiceDueDateValue' }, ], ] @@ -520,7 +522,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it ], [ { - rowSpan: 5, + rowSpan: '*', text: , style: 'notesText' }, @@ -533,6 +535,20 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + 0) { ?> + [ + {}, + { + text: 'Discount', + style: 'itemsFooterSubTitle' + }, + { + text: , + style: 'itemsFooterSubValue' + } + ], + + 0) { ?> [ {}, { @@ -544,6 +560,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + [ {}, { @@ -555,6 +572,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + 0) { ?> [ {}, { @@ -566,6 +584,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it style: 'itemsFooterSubValue' } ], + [ {}, { @@ -631,7 +650,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it alignment: 'right', margin: [0,0,0,30] }, - // Invoice Dates + // Invoice Date invoiceDateTitle: { fontSize: 10, alignment: 'left', @@ -642,6 +661,19 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it alignment: 'right', margin: [0,5,0,5] }, + // Invoice Due Date + invoiceDueDateTitle: { + fontSize: 10, + bold: true, + alignment: 'left', + margin: [0,5,0,5] + }, + invoiceDueDateValue: { + fontSize: 10, + bold: true, + alignment: 'right', + margin: [0,5,0,5] + }, // Items Header itemsHeader: { fontSize: 10, diff --git a/invoice.php b/invoice.php index b5983fb6..8b1471eb 100644 --- a/invoice.php +++ b/invoice.php @@ -242,7 +242,7 @@ if (isset($_GET['invoice_id'])) { - + @@ -403,28 +403,31 @@ if (isset($_GET['invoice_id'])) {
Subtotal
Discount-
Subtotal
Tax
Total
Paid
Date
Due
+ + + + 0) { ?> - + - - - - - - 0) { ?> - + + + + + 0) { ?> @@ -680,11 +683,11 @@ require_once "footer.php"; {}, { text: 'Due', - style: 'invoiceDateTitle' + style: 'invoiceDueDateTitle' }, { text: , - style: 'invoiceDateValue' + style: 'invoiceDueDateValue' }, ], ] @@ -803,7 +806,7 @@ require_once "footer.php"; ], [ { - rowSpan: 5, + rowSpan: '*', text: , style: 'notesText' }, @@ -816,6 +819,20 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + 0) { ?> + [ + {}, + { + text: 'Discount', + style: 'itemsFooterSubTitle' + }, + { + text: , + style: 'itemsFooterSubValue' + } + ], + + 0) { ?> [ {}, { @@ -827,6 +844,7 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + [ {}, { @@ -838,6 +856,7 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + 0) { ?> [ {}, { @@ -849,6 +868,7 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + [ {}, { @@ -858,7 +878,7 @@ require_once "footer.php"; { text: , - style: 'itemsFooterTotalTitle' + style: 'itemsFooterTotalValue' } ], ] @@ -914,7 +934,7 @@ require_once "footer.php"; alignment: 'right', margin: [0,0,0,30] }, - // Invoice Dates + // Invoice Date invoiceDateTitle: { fontSize: 10, alignment: 'left', @@ -925,6 +945,19 @@ require_once "footer.php"; alignment: 'right', margin: [0,5,0,5] }, + // Invoice Due Date + invoiceDueDateTitle: { + fontSize: 10, + bold: true, + alignment: 'left', + margin: [0,5,0,5] + }, + invoiceDueDateValue: { + fontSize: 10, + bold: true, + alignment: 'right', + margin: [0,5,0,5] + }, // Items Header itemsHeader: { fontSize: 10, diff --git a/quote.php b/quote.php index 650a9034..c644944d 100644 --- a/quote.php +++ b/quote.php @@ -234,7 +234,7 @@ if (isset($_GET['quote_id'])) { - + From fbf535444b26142f0885c73528bf92ed611add5d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 2 Nov 2023 16:31:25 -0400 Subject: [PATCH 06/47] Updated Quote and Recurring to match invoice UI updates --- guest_view_quote.php | 57 ++++++++++++++++++++++++++++++------------- quote.php | 55 +++++++++++++++++++++++++++++------------ recurring_invoice.php | 24 +++++++----------- 3 files changed, 88 insertions(+), 48 deletions(-) diff --git a/guest_view_quote.php b/guest_view_quote.php index c8df34da..d1502026 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -154,7 +154,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie - + @@ -233,21 +233,16 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
Subtotal
Discount-
Subtotal
Tax
Total
Paid
Date
Expire
Date
Expire
- 0) { - ?> - - - - - + 0) { ?> + + + + + 0) { ?> @@ -378,11 +373,11 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie {}, { text: 'Expire', - style: 'invoiceDateTitle' + style: 'invoiceDueDateTitle' }, { text: , - style: 'invoiceDateValue' + style: 'invoiceDueDateValue' }, ], ] @@ -501,7 +496,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie ], [ { - rowSpan: 3, + rowSpan: '*', text: , style: 'notesText' }, @@ -514,6 +509,20 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie style: 'itemsFooterSubValue' } ], + 0) { ?> + [ + {}, + { + text: 'Discount', + style: 'itemsFooterSubTitle' + }, + { + text: , + style: 'itemsFooterSubValue' + } + ], + + 0) { ?> [ {}, { @@ -525,15 +534,16 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie style: 'itemsFooterSubValue' } ], + [ {}, { text: 'Total', - style: 'itemsFooterSubTitle' + style: 'itemsFooterTotalTitle' }, { text: , - style: 'itemsFooterSubValue' + style: 'itemsFooterTotalValue' } ], ] @@ -600,6 +610,19 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie alignment: 'right', margin: [0,5,0,5] }, + // Invoice Due Dates + invoiceDueDateTitle: { + fontSize: 10, + bold: true, + alignment: 'left', + margin: [0,5,0,5] + }, + invoiceDueDateValue: { + fontSize: 10, + bold: true, + alignment: 'right', + margin: [0,5,0,5] + }, // Items Header itemsHeader: { fontSize: 10, diff --git a/quote.php b/quote.php index c644944d..ade850d3 100644 --- a/quote.php +++ b/quote.php @@ -422,21 +422,16 @@ if (isset($_GET['quote_id'])) {
Discount
Subtotal
Discount
Tax
- 0) { - ?> - - - - - + 0) { ?> + + + + + 0) { ?> @@ -642,11 +637,11 @@ require_once "footer.php"; {}, { text: 'Expire', - style: 'invoiceDateTitle' + style: 'invoiceDueDateTitle' }, { text: , - style: 'invoiceDateValue' + style: 'invoiceDueDateValue' }, ], ] @@ -765,7 +760,7 @@ require_once "footer.php"; ], [ { - rowSpan: 3, + rowSpan: '*', text: , style: 'notesText' }, @@ -778,6 +773,20 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + 0) { ?> + [ + {}, + { + text: 'Discount', + style: 'itemsFooterSubTitle' + }, + { + text: , + style: 'itemsFooterSubValue' + } + ], + + 0) { ?> [ {}, { @@ -789,15 +798,16 @@ require_once "footer.php"; style: 'itemsFooterSubValue' } ], + [ {}, { text: 'Total', - style: 'itemsFooterSubTitle' + style: 'itemsFooterTotalTitle' }, { text: , - style: 'itemsFooterSubValue' + style: 'itemsFooterTotalValue' } ], ] @@ -864,6 +874,19 @@ require_once "footer.php"; alignment: 'right', margin: [0,5,0,5] }, + // Invoice Due Dates + invoiceDueDateTitle: { + fontSize: 10, + bold: true, + alignment: 'left', + margin: [0,5,0,5] + }, + invoiceDueDateValue: { + fontSize: 10, + bold: true, + alignment: 'right', + margin: [0,5,0,5] + }, // Items Header itemsHeader: { fontSize: 10, diff --git a/recurring_invoice.php b/recurring_invoice.php index 8bba5ac6..00329680 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -356,31 +356,25 @@ if (isset($_GET['recurring_id'])) {
Discount
Subtotal
Discount-
Tax
- 0) { - ?> - - - - - - + 0) { ?> + + + + + 0) { ?> - - - + + +
Discount
Subtotal
Discount
Tax
Total
Total
From 008ad76c68391de411adeab98ee2a17dc947de23 Mon Sep 17 00:00:00 2001 From: nellistc Date: Fri, 3 Nov 2023 18:22:24 +1100 Subject: [PATCH 07/47] Update global_search.php add domains to global search results --- global_search.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/global_search.php b/global_search.php index 86fe2b16..b24307d8 100644 --- a/global_search.php +++ b/global_search.php @@ -39,6 +39,13 @@ if (isset($_GET['query'])) { AND (vendor_name LIKE '%$query%' OR vendor_phone LIKE '%$phone_query%') ORDER BY vendor_id DESC LIMIT 5" ); + + $sql_domains = mysqli_query($mysqli, "SELECT * FROM domains + LEFT JOIN clients ON domain_client_id = client_id + WHERE domain_archived_at IS NULL + AND domain_name LIKE '%$query%' + ORDER BY domain_id DESC LIMIT 5" + ); $sql_products = mysqli_query($mysqli, "SELECT * FROM products WHERE product_archived_at IS NULL @@ -240,6 +247,46 @@ if (isset($_GET['query'])) { + 0) { ?> + + +
+
+
+
Domains
+
+
+ + + + + + + + + + + + + + + + +
NameExpiry
+
+
+
+
+ + + 0) { ?> From 7ab032fa3fbe48bbc554b8f15a6ff931660814af Mon Sep 17 00:00:00 2001 From: nellistc Date: Sat, 4 Nov 2023 07:31:21 +1100 Subject: [PATCH 08/47] Update global search, add client to domain search results Show client name and link to client overview in domain search results --- global_search.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/global_search.php b/global_search.php index b24307d8..70a3e552 100644 --- a/global_search.php +++ b/global_search.php @@ -261,6 +261,7 @@ if (isset($_GET['query'])) { Name Expiry + >Client @@ -271,10 +272,13 @@ if (isset($_GET['query'])) { $domain_expiry = nullable_htmlentities($row['domain_expire']); $domain_id = intval($row['domain_id']); $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + ?> + From 7ccd69a26f8163d1c119bca17ea716c713433541 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 5 Nov 2023 08:24:19 +0000 Subject: [PATCH 09/47] Fix trip export to csv --- post/trip.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/post/trip.php b/post/trip.php index 8d4567f5..b2f46d97 100644 --- a/post/trip.php +++ b/post/trip.php @@ -59,11 +59,11 @@ if (isset($_GET['delete_trip'])) { if (isset($_POST['export_trips_csv'])) { $date_from = sanitizeInput($_POST['date_from']); $date_to = sanitizeInput($_POST['date_to']); - if(!empty($date_from) && !empty($date_to)){ - $date_query = "AND DATE(trip_date) BETWEEN '$date_from' AND '$date_to'"; + if (!empty($date_from) && !empty($date_to)){ + $date_query = "DATE(trip_date) BETWEEN '$date_from' AND '$date_to'"; $file_name_date = "$date_from-to-$date_to"; - }else{ - $date_query = ""; + } else { + $date_query = "trip_date IS NOT NULL"; $file_name_date = date('Y-m-d'); } From 573eaf179b234bb34a87aa1b51148da72c5cfc53 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 5 Nov 2023 10:42:46 +0000 Subject: [PATCH 10/47] API - Documents - Add create and update methods --- api/v1/documents/create.php | 34 ++++++++++++++++ api/v1/documents/document_model.php | 43 ++++++++++++++++++++ api/v1/documents/read.php | 6 ++- api/v1/documents/update.php | 61 +++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 api/v1/documents/create.php create mode 100644 api/v1/documents/document_model.php create mode 100644 api/v1/documents/update.php diff --git a/api/v1/documents/create.php b/api/v1/documents/create.php new file mode 100644 index 00000000..9b540885 --- /dev/null +++ b/api/v1/documents/create.php @@ -0,0 +1,34 @@ + Date: Sun, 5 Nov 2023 11:03:49 +0000 Subject: [PATCH 11/47] Fix undefined client_is_lead errors - Defines client_is_lead within the general client include file to prevent the following error filling up logs on almost every page load. > "PHP Notice: Undefined variable: client_is_lead in itflow/client_edit_modal.php on line 111" --- inc_all_client.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc_all_client.php b/inc_all_client.php index 7dc50c58..7e895995 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -32,6 +32,7 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_array($sql); $client_name = nullable_htmlentities($row['client_name']); + $client_is_lead = intval($row['client_lead']); $client_type = nullable_htmlentities($row['client_type']); $client_website = nullable_htmlentities($row['client_website']); $client_referral = nullable_htmlentities($row['client_referral']); From 43b94ebddc9292bf6568a884ed14ae7111a6b32e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 12:44:44 -0500 Subject: [PATCH 12/47] Restored New Quote Functionality under clients this was disabled for debugging but never re-enabled back --- client_quotes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_quotes.php b/client_quotes.php index 65cb9efa..cc038769 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -163,7 +163,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Date: Mon, 6 Nov 2023 13:19:27 -0500 Subject: [PATCH 13/47] Do not show archived content when adding a service --- client_service_add_modal.php | 14 +++++++------- client_services.php | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client_service_add_modal.php b/client_service_add_modal.php index 7d91cf4d..24108134 100644 --- a/client_service_add_modal.php +++ b/client_service_add_modal.php @@ -99,7 +99,7 @@ Select related documents Select related logins Select related certificates + @@ -495,8 +495,8 @@ if (isset($_GET['asset_id'])) { jQuery.post( "ajax.php", { - contact_set_notes: 'TRUE', - contact_id: contact_id, + asset_set_notes: 'TRUE', + asset_id: asset_id, notes: notes } ) From c40be5686950617856793968637c41b9760f4a35 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 14:33:23 -0500 Subject: [PATCH 17/47] Disable Documentation section of Client Side Nav of IT Doclumentation is disabled --- client_side_nav.php | 54 +++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/client_side_nav.php b/client_side_nav.php index 58d7d0f8..9bb0f572 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -47,40 +47,39 @@ +
  • SUPPORT
    • - -
  • - "> - -

    - Tickets - 0) { ?> - - +

  • + "> + +

    + Tickets + 0) { ?> + + -

    -     -
    • +

    + + -
  • - "> - -

    - Schedule Ticket - 0) { ?> - - +

  • + "> + +

    + Schedule Ticket + 0) { ?> + + -

    -     -
    • +

    + + -
  • "> @@ -107,6 +106,8 @@
    • + +
  • DOCUMENTATION
  • @@ -229,6 +230,7 @@
    • + 2 && $config_module_enable_accounting == 1) { ?> From 76f20225f5d94eebdec17079c24c62110d7ef965 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 14:38:22 -0500 Subject: [PATCH 18/47] Fix IT Docs not showing, keep assets side nav active when viewing asset details page --- client_side_nav.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client_side_nav.php b/client_side_nav.php index 9bb0f572..1a21bf67 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -106,12 +106,12 @@ - +
  • DOCUMENTATION
  • - "> + ">

    Assets From 69e9691de9fb91a2d45db1d4a68b1356a5abd0d7 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 14:43:19 -0500 Subject: [PATCH 19/47] Remove elevation CSS tag from tickets as this was not consistent and unnessary --- tickets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tickets.php b/tickets.php index 53ee893a..16e2ac8e 100644 --- a/tickets.php +++ b/tickets.php @@ -98,7 +98,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); max-width: 600px; } -

    +

    Support Tickets From 1f0d2ff1ab3256380cfc73529fd344d04610411f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 14:52:01 -0500 Subject: [PATCH 20/47] Feature: Part 1 - DB Schemea update for Default Hourly Rate --- database_updates.php | 13 ++++++++++--- database_version.php | 2 +- db.sql | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/database_updates.php b/database_updates.php index 3395f2c5..9bf550a7 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1491,11 +1491,18 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } - //if (CURRENT_DATABASE_VERSION == '0.9.1') { - // Insert queries here required to update to DB version 0.9.0 + if (CURRENT_DATABASE_VERSION == '0.9.3') { + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_default_hourly_rate` DECIMAL(15,2) NOT NULL DEFAULT 0.00 AFTER `config_default_net_terms`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.4'"); + + } + + //if (CURRENT_DATABASE_VERSION == '0.9.4') { + // Insert queries here required to update to DB version 0.9.5 // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.2'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.5'"); //} } else { // Up-to-date diff --git a/database_version.php b/database_version.php index d7ebb9f0..102f8005 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.9.3"); +DEFINE("LATEST_DATABASE_VERSION", "0.9.4"); diff --git a/db.sql b/db.sql index 10c6f3b5..a0da4305 100644 --- a/db.sql +++ b/db.sql @@ -1233,6 +1233,7 @@ CREATE TABLE `settings` ( `config_default_expense_payment_method` varchar(200) DEFAULT NULL, `config_default_calendar` int(11) DEFAULT NULL, `config_default_net_terms` int(11) DEFAULT NULL, + `config_default_hourly_rate` decimal(15,2) NOT NULL DEFAULT 0.00, `config_invoice_prefix` varchar(200) DEFAULT NULL, `config_invoice_next_number` int(11) DEFAULT NULL, `config_invoice_footer` text DEFAULT NULL, @@ -1744,4 +1745,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-10-20 14:53:11 +-- Dump completed on 2023-11-06 14:51:28 From 91924bc2395391405fb471dc31aeb452c496202d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 15:05:07 -0500 Subject: [PATCH 21/47] Feature: Part 2 - Added Default Hourly rate to settings pane, default to the default hourly rate when adding a client --- client_add_modal.php | 2 +- get_settings.php | 1 + post/setting.php | 3 ++- settings_defaults.php | 10 ++++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/client_add_modal.php b/client_add_modal.php index ab084b5e..00da77b7 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -241,7 +241,7 @@
    - + ">

    diff --git a/get_settings.php b/get_settings.php index 783681ee..e3138317 100644 --- a/get_settings.php +++ b/get_settings.php @@ -36,6 +36,7 @@ $config_default_payment_method = $row['config_default_payment_method']; $config_default_expense_payment_method = $row['config_default_expense_payment_method']; $config_default_calendar = intval($row['config_default_calendar']); $config_default_net_terms = intval($row['config_default_net_terms']); +$config_default_hourly_rate = floatval($row['config_default_hourly_rate']); // Invoice $config_invoice_prefix = $row['config_invoice_prefix']; diff --git a/post/setting.php b/post/setting.php index c877999c..bba3113a 100644 --- a/post/setting.php +++ b/post/setting.php @@ -265,8 +265,9 @@ if (isset($_POST['edit_default_settings'])) { $transfer_to_account = intval($_POST['transfer_to_account']); $calendar = intval($_POST['calendar']); $net_terms = intval($_POST['net_terms']); + $hourly_rate = floatval($_POST['hourly_rate']); - mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms, config_default_hourly_rate = $hourly_rate WHERE company_id = 1"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified default settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); diff --git a/settings_defaults.php b/settings_defaults.php index 7bb782be..56de643c 100644 --- a/settings_defaults.php +++ b/settings_defaults.php @@ -197,6 +197,16 @@ require_once "inc_all_settings.php";
    +
    + +
    +
    + +
    + +
    +
    +
    From c18dbc5985a6f19d2c1605e26a3a1f83ac1091ac Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 15:22:51 -0500 Subject: [PATCH 22/47] Rename Events in Client Side Nav to Calendar --- client_side_nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_side_nav.php b/client_side_nav.php index 1a21bf67..158fc814 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -97,7 +97,7 @@     ">

    - Events + Calendar 0) { ?> From a9304a3784b3522923c80c43ef73bd0b7a5a71da Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 15:25:54 -0500 Subject: [PATCH 23/47] Move Calendar under support Move Trips under Finance --- side_nav.php | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/side_nav.php b/side_nav.php index aa0a9649..26b82b14 100644 --- a/side_nav.php +++ b/side_nav.php @@ -43,9 +43,16 @@

    • - - if ($config_module_enable_accounting == 1) { ?> +
  • + "> + +

    Calendar

    +     +
    • + +
  • SALES
  • @@ -126,25 +133,17 @@

    Budget

    • - - - -
  • MORE
    • - -
  • - "> - -

    Calendar

    -     -
    • - -
  • +
  • ">

    Trips
    • + + +
  • MORE
    • +
  • "> From d2e3c1e12dc95a1d6c748876b4b102e87918b9a6 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 17:03:34 -0500 Subject: [PATCH 24/47] Fix Domains Icon in Global Search, remove unnessesary > --- global_search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global_search.php b/global_search.php index 70a3e552..b059138c 100644 --- a/global_search.php +++ b/global_search.php @@ -253,7 +253,7 @@ if (isset($_GET['query'])) {
    -
    Domains
    +
    Domains
    @@ -261,7 +261,7 @@ if (isset($_GET['query'])) { - + From 3f2f40559689086e54dd6b49b69d99725b67db70 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 6 Nov 2023 19:37:48 -0500 Subject: [PATCH 25/47] Allow Manual Input of Trip Destination or select from client locations, Added Remember me checkbox for future implementation --- js/app.js | 6 ++++++ login.php | 6 ++++++ trip_add_modal.php | 27 ++++++++++++++++++++++++--- trip_edit_modal.php | 22 +++++++++++++++++++++- 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/js/app.js b/js/app.js index 1fdea279..6d783e27 100644 --- a/js/app.js +++ b/js/app.js @@ -13,6 +13,12 @@ $('.select2').select2({ theme: 'bootstrap4' }); +// Initialize Select2 Elements +$('.select2Tag').select2({ + theme: 'bootstrap4', + tags: true +}); + // Initialize TinyMCE tinymce.init({ selector: '.tinymce', diff --git a/login.php b/login.php index 0bb66c69..f78f6b54 100644 --- a/login.php +++ b/login.php @@ -310,6 +310,12 @@ if (isset($_POST['login'])) { +
    +
    + + +
    +
    diff --git a/trip_add_modal.php b/trip_add_modal.php index ee613ae3..112c5aff 100644 --- a/trip_add_modal.php +++ b/trip_add_modal.php @@ -53,7 +53,26 @@
    - + @@ -72,8 +91,10 @@ 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + ); while ($row = mysqli_fetch_array($sql)) { $user_id = intval($row['user_id']); $user_name = nullable_htmlentities($row['user_name']); diff --git a/trip_edit_modal.php b/trip_edit_modal.php index 2a520c92..2ef42a5d 100644 --- a/trip_edit_modal.php +++ b/trip_edit_modal.php @@ -56,7 +56,27 @@
    - + From afc040bfe6346ba0eccbe6a6cb533e684bb4d094 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 7 Nov 2023 16:02:15 -0500 Subject: [PATCH 26/47] Updated UI on add / edit Client moved the tagging functionality to using select2 to increase space and merge tags and notes tabs --- client_add_modal.php | 70 +++++++++++++++---------------------------- client_edit_modal.php | 67 +++++++++++++---------------------------- 2 files changed, 44 insertions(+), 93 deletions(-) diff --git a/client_add_modal.php b/client_add_modal.php index 00da77b7..919fe1e6 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -22,10 +22,10 @@ Contact
  • - Additional + Billing
  • - Tag + More
    • @@ -231,7 +231,7 @@ -
    +
    @@ -289,57 +289,35 @@ +
    + +
    +
    -
    +
    + +
    +
    + +
    + - -
    - - - - - - - - -
    - -

    No Tags Found!

    - Try adding a few Settings > Tags +
    - - +
    diff --git a/client_edit_modal.php b/client_edit_modal.php index d2ee6917..27ad927b 100644 --- a/client_edit_modal.php +++ b/client_edit_modal.php @@ -25,11 +25,7 @@
  • Notes -
    • -
  • - Tag + href="#pills-client-more">More
    • @@ -193,56 +189,33 @@ -
    +
    -
    +
    + +
    +
    + +
    + " name="tags[]" - value="" > - -
    - - - - - + +
    +
    From 51ec92c72e426656257c45a9e02df1ceec12c6de Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Tue, 7 Nov 2023 21:18:46 +0000 Subject: [PATCH 27/47] AAD SSO - Wording Slight change to the error wording when a user doesn't exist in ITFlow as a contact / has the wrong auth method set (blank/local rather than Azure) --- portal/login_microsoft.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal/login_microsoft.php b/portal/login_microsoft.php index 0428da25..b3d32273 100644 --- a/portal/login_microsoft.php +++ b/portal/login_microsoft.php @@ -110,7 +110,7 @@ if (isset($_POST['code']) && $_POST['state'] == session_id()) { header("Location: index.php"); } else { - $_SESSION['login_message'] = 'Something went wrong with login. Ensure you are setup for SSO.'; + $_SESSION['login_message'] = 'Something went wrong with logging you in: Your account is not configured for Azure SSO. Please ensure you are setup in ITFlow as a contact and have Azure SSO configured.'; header("Location: index.php"); } } From 5d1c28353351a02a504772bd34e3daf9918ebd8a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 7 Nov 2023 16:34:32 -0500 Subject: [PATCH 28/47] Do not show disabled or users that were before the trip creation date --- trip_add_modal.php | 1 - trip_copy_modal.php | 5 ++++- trip_edit_modal.php | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/trip_add_modal.php b/trip_add_modal.php index 112c5aff..6f29e6ba 100644 --- a/trip_add_modal.php +++ b/trip_add_modal.php @@ -57,7 +57,6 @@ 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + ); while ($row = mysqli_fetch_array($sql_trips)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); diff --git a/trip_edit_modal.php b/trip_edit_modal.php index 2ef42a5d..da8ec990 100644 --- a/trip_edit_modal.php +++ b/trip_edit_modal.php @@ -60,7 +60,6 @@ - Driver - 1 AND user_archived_at > trip_created_at ORDER BY user_name ASC" + ); while ($row = mysqli_fetch_array($sql_trips)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); From 3a61b56c6e4ecb299656a5074001d5225842bef7 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 7 Nov 2023 16:52:02 -0500 Subject: [PATCH 29/47] Fix SQL Syntax error --- trip_copy_modal.php | 5 ++--- trip_edit_modal.php | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/trip_copy_modal.php b/trip_copy_modal.php index 03f33e15..1952a7fa 100644 --- a/trip_copy_modal.php +++ b/trip_copy_modal.php @@ -73,12 +73,11 @@ 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql_trips)) { + while ($row = mysqli_fetch_array($sql_users)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); ?> diff --git a/trip_edit_modal.php b/trip_edit_modal.php index da8ec990..2530c19b 100644 --- a/trip_edit_modal.php +++ b/trip_edit_modal.php @@ -94,11 +94,11 @@ 1 AND user_archived_at > trip_created_at ORDER BY user_name ASC" + WHERE user_role > 1 AND user_archived_at > '$trip_created_at' ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql_trips)) { + while ($row = mysqli_fetch_array($sql_users)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); ?> From eb01e4b4d5d021478d094cbef916704dd78cd82b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 13:34:58 -0500 Subject: [PATCH 30/47] Clean up Logic for Client Add and Client Edit Modals, same for trip add copy edit --- client_add_modal.php | 89 ++++++++++++------------- client_edit_modal.php | 146 +++++++++++++++++++----------------------- js/app.js | 6 -- trip_add_modal.php | 4 +- trip_copy_modal.php | 23 ++++++- trip_edit_modal.php | 2 +- 6 files changed, 135 insertions(+), 135 deletions(-) diff --git a/client_add_modal.php b/client_add_modal.php index 919fe1e6..cb99bea9 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -9,6 +9,8 @@
    + +
    + +
    - - -
    - -
    -
    - -
    - "> +
    + +
    +
    +
    + ">
    +
    -
    - -
    -
    - -
    - +
    + +
    +
    +
    +
    +
    -
    - -
    -
    - -
    - +
    + +
    +
    +
    +
    +
    -
    - -
    -
    - -
    - +
    + +
    +
    +
    +
    - - - - - +
    + +
    diff --git a/client_edit_modal.php b/client_edit_modal.php index 27ad927b..66b535a8 100644 --- a/client_edit_modal.php +++ b/client_edit_modal.php @@ -12,20 +12,25 @@ + +
    @@ -113,82 +118,75 @@
    -
    + - +
    -
    - -
    -
    - -
    - +
    + +
    +
    +
    +
    +
    -
    - -
    -
    - -
    - +
    + +
    +
    +
    +
    +
    -
    - -
    -
    - -
    - +
    + +
    +
    +
    +
    +
    -
    - -
    -
    - -
    - +
    + +
    +
    +
    +
    - - - - - +
    + +
    @@ -217,25 +215,13 @@
    - - -
    - -

    No Tags Found!

    - Try adding a few Settings > Tags -
    - - -
    - - + +
    diff --git a/js/app.js b/js/app.js index 6d783e27..1fdea279 100644 --- a/js/app.js +++ b/js/app.js @@ -13,12 +13,6 @@ $('.select2').select2({ theme: 'bootstrap4' }); -// Initialize Select2 Elements -$('.select2Tag').select2({ - theme: 'bootstrap4', - tags: true -}); - // Initialize TinyMCE tinymce.init({ selector: '.tinymce', diff --git a/trip_add_modal.php b/trip_add_modal.php index 6f29e6ba..8b6e7651 100644 --- a/trip_add_modal.php +++ b/trip_add_modal.php @@ -53,8 +53,8 @@
    - +
    - +
    - +
    diff --git a/trip_edit_modal.php b/trip_edit_modal.php index 2530c19b..c9846ac1 100644 --- a/trip_edit_modal.php +++ b/trip_edit_modal.php @@ -56,7 +56,7 @@
    - Date: Wed, 8 Nov 2023 14:37:03 -0500 Subject: [PATCH 31/47] Add Function Select2 Multiple Capabilities to add ticket watchers in create client ticket --- client_add_modal.php | 2 +- client_edit_modal.php | 2 +- ticket_add_modal.php | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/client_add_modal.php b/client_add_modal.php index cb99bea9..8a4491dd 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -305,7 +305,7 @@
    -
    - -
    - +
    +
    + +
    + +
    From a300248f907f3548850a9f788a4adb1bcf064583 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 14:38:48 -0500 Subject: [PATCH 32/47] Remove the old add remove ticket watcher js code --- client_tickets.php | 2 -- js/ticket_add_remove_watchers.js | 41 -------------------------------- 2 files changed, 43 deletions(-) delete mode 100644 js/ticket_add_remove_watchers.js diff --git a/client_tickets.php b/client_tickets.php index 45d81c8e..30cb59b8 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -232,5 +232,3 @@ require_once "client_ticket_export_modal.php"; require_once "footer.php"; ?> - - diff --git a/js/ticket_add_remove_watchers.js b/js/ticket_add_remove_watchers.js deleted file mode 100644 index 50224e73..00000000 --- a/js/ticket_add_remove_watchers.js +++ /dev/null @@ -1,41 +0,0 @@ -function addWatcher(button) { - var container = button.previousElementSibling; - var textFieldWrapper = document.createElement("div"); - textFieldWrapper.className = "input-group mb-3"; - - var prependWrapper = document.createElement("div"); - prependWrapper.className = "input-group-prepend"; - var iconSpan = document.createElement("span"); - iconSpan.className = "input-group-text"; - iconSpan.innerHTML = ""; - prependWrapper.appendChild(iconSpan); - - var textField = document.createElement("input"); - textField.type = "email"; - textField.className = "form-control"; - textField.name = "watchers[]"; - textField.placeholder = "Enter an email"; - - var removeButtonWrapper = document.createElement("div"); - removeButtonWrapper.className = "input-group-append"; - - var removeButton = document.createElement("button"); - removeButton.className = "btn btn-danger"; - removeButton.type = "button"; - removeButton.innerHTML = ""; - removeButton.onclick = function() { - removeWatcher(this); - }; - - removeButtonWrapper.appendChild(removeButton); - textFieldWrapper.appendChild(prependWrapper); - textFieldWrapper.appendChild(textField); - textFieldWrapper.appendChild(removeButtonWrapper); - container.appendChild(textFieldWrapper); -} - -function removeWatcher(button) { - var container = button.parentNode.parentNode.parentNode; // Navigate to the container - var textFieldWrapper = button.parentNode.parentNode; - container.removeChild(textFieldWrapper); -} \ No newline at end of file From 5bd4c32f4dc57482cc5ac89d42f514bd46a4fb0d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 16:46:15 -0500 Subject: [PATCH 33/47] Reorganized Create Software License added multi select2 to assign asset and user licenses --- client_software_add_modal.php | 100 +++++++++++++++------------------- 1 file changed, 44 insertions(+), 56 deletions(-) diff --git a/client_software_add_modal.php b/client_software_add_modal.php index 06ba8aad..bd899b9a 100644 --- a/client_software_add_modal.php +++ b/client_software_add_modal.php @@ -16,10 +16,7 @@ Details
  • - Device Licenses -
    • -
  • - User Licenses + Licensing
  • Notes @@ -70,6 +67,10 @@
    • +
    + +
    +
    @@ -125,67 +126,54 @@
    -
    +
    + +
    +
    + +
    + +
    -
      +
      + +
      +
      + +
      + - -
      - - - - -
    - -
    - -
    - -
    - Select Users that are licensed for this software + +
    -
      - - -
    • -
      - - -
      -
      • - - - -
    -
    From 88a6fdd36df6aa40090032a573738e6e5e94a1ed Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 22:17:51 -0500 Subject: [PATCH 34/47] Start page is a required select box with the option of putting in a custom value --- get_settings.php | 32 ++++++++++++++++++++++---------- settings_defaults.php | 12 +++++++++++- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/get_settings.php b/get_settings.php index e3138317..d4978ed0 100644 --- a/get_settings.php +++ b/get_settings.php @@ -107,7 +107,10 @@ $config_theme_mode = "dark_mode"; // Telemetry $config_telemetry = intval($row['config_telemetry']); -$colors_array = array( + +// Select Arrays + +$colors_array = array ( 'blue', 'green', 'cyan', @@ -129,7 +132,7 @@ $colors_array = array( 'olive' ); -$net_terms_array = array( +$net_terms_array = array ( '0'=>'On Receipt', '7'=>'7 Days', '10'=>'10 Days', @@ -140,19 +143,19 @@ $net_terms_array = array( '90'=>'90 Days' ); -$records_per_page_array = array('5','10','15','20','30','50','100'); +$records_per_page_array = array ('5','10','15','20','30','50','100'); include_once "settings_localization_array.php"; -$category_types_array = array( +$category_types_array = array ( 'Expense', 'Income', 'Payment Method', 'Referral' ); -$asset_types_array = array( +$asset_types_array = array ( 'Laptop'=>'fa-laptop', 'Desktop'=>'fa-desktop', 'Server'=>'fa-server', @@ -169,7 +172,7 @@ $asset_types_array = array( 'Other'=>'fa-tag' ); -$software_types_array = array( +$software_types_array = array ( 'SaaS', 'Application', 'Mobile', @@ -178,18 +181,18 @@ $software_types_array = array( 'Misc' ); -$license_types_array = array( +$license_types_array = array ( 'Device', 'User' ); -$document_types_array = array( +$document_types_array = array ( '0'=>'Document', '1'=>'Template', '2'=>'Global Template' ); -$asset_status_array = array( +$asset_status_array = array ( 'Ready to Deploy', 'Deployed', 'Out for Repair', @@ -198,7 +201,7 @@ $asset_status_array = array( 'Retired' ); -$ticket_status_array = array( +$ticket_status_array = array ( 'Pending-Assignment', 'Assigned', 'In-Progress', @@ -208,3 +211,12 @@ $ticket_status_array = array( 'Scheduled', 'Closed' ); + +$start_page_select_array = array ( + 'dashboard.php'=>'Personal Dashboard', + 'dashboard_financial.php'=>'Administrative Dashboard', + 'dashboard_technical.php' => 'Technical Dashboard', + 'clients.php'=> 'Client Management', + 'tickets.php'=> 'Support Tickets', + 'invoices.php' => 'Invoices' +); \ No newline at end of file diff --git a/settings_defaults.php b/settings_defaults.php index 56de643c..7557a3d8 100644 --- a/settings_defaults.php +++ b/settings_defaults.php @@ -16,7 +16,17 @@ require_once "inc_all_settings.php";
    - +
    From cbf15f4e81f71a237868fe827a04f3afac37f045 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 22:28:29 -0500 Subject: [PATCH 35/47] Updated button colors on accept decline quote --- quote.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quote.php b/quote.php index ade850d3..e2617045 100644 --- a/quote.php +++ b/quote.php @@ -135,10 +135,10 @@ if (isset($_GET['quote_id'])) { - + Accept - + Decline From 89cbdd103877510a6a11f6c83b5e0e4477eb58bc Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 22:54:33 -0500 Subject: [PATCH 36/47] Added industry select array --- get_settings.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/get_settings.php b/get_settings.php index d4978ed0..b05d5268 100644 --- a/get_settings.php +++ b/get_settings.php @@ -212,6 +212,32 @@ $ticket_status_array = array ( 'Closed' ); +$industry_select_array = array( + "Accounting", + "Agriculture", + "Automotive", + "Construction", + "Education", + "Entertainent", + "Finance", + "Government", + "Healthcare", + "Hospititality", + "Information Technology", + "Insurance", + "Pharmacy", + "Law", + "Manufacturing", + "Marketing & Advertising", + "Military", + "Non-Profit", + "Real Estate", + "Retail", + "Services", + "Transportation", + "Other" // An 'Other' option for industries not listed +); + $start_page_select_array = array ( 'dashboard.php'=>'Personal Dashboard', 'dashboard_financial.php'=>'Administrative Dashboard', @@ -219,4 +245,5 @@ $start_page_select_array = array ( 'clients.php'=> 'Client Management', 'tickets.php'=> 'Support Tickets', 'invoices.php' => 'Invoices' -); \ No newline at end of file +); + From 0103e05093ffe7fbd4458ea7249566b4cbd2158c Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 23:30:44 -0500 Subject: [PATCH 37/47] Ability to create a referral when adding a client --- client_add_modal.php | 5 +---- post/client.php | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/client_add_modal.php b/client_add_modal.php index 8a4491dd..dcc62e5b 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -65,7 +65,7 @@
    - -
    - -
    diff --git a/post/client.php b/post/client.php index efc99a47..e8be32a1 100644 --- a/post/client.php +++ b/post/client.php @@ -26,6 +26,13 @@ if (isset($_POST['add_client'])) { $extended_log_description = ''; + // Create Referral if it doesn't exist + $sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND category_name = '$referral'"); + if(mysqli_num_rows($sql) == 0) { + mysqli_query($mysqli, "INSERT INTO categories SET category_name = '$referral', category_type = 'Referral'"); + } + + // Create client mysqli_query($mysqli, "INSERT INTO clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_rate = $rate, client_currency_code = '$currency_code', client_net_terms = $net_terms, client_tax_id_number = '$tax_id_number', client_lead = $lead, client_notes = '$notes', client_accessed_at = NOW()"); $client_id = mysqli_insert_id($mysqli); @@ -35,7 +42,7 @@ if (isset($_POST['add_client'])) { file_put_contents("uploads/clients/$client_id/index.php", ""); } - //Add Location + // Create Location if (!empty($location_phone) || !empty($address) || !empty($city) || !empty($state) || !empty($zip)) { mysqli_query($mysqli, "INSERT INTO locations SET location_name = 'Primary', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$location_phone', location_country = '$country', location_primary = 1, location_client_id = $client_id"); @@ -44,7 +51,7 @@ if (isset($_POST['add_client'])) { } - //Add Contact + // Create Contact if (!empty($contact) || !empty($title) || !empty($contact_phone) || !empty($contact_mobile) || !empty($contact_email)) { mysqli_query($mysqli, "INSERT INTO contacts SET contact_name = '$contact', contact_title = '$title', contact_phone = '$contact_phone', contact_extension = '$contact_extension', contact_mobile = '$contact_mobile', contact_email = '$contact_email', contact_primary = 1, contact_important = 1, contact_client_id = $client_id"); @@ -52,7 +59,7 @@ if (isset($_POST['add_client'])) { $extended_log_description .= ", primary contact $contact added"; } - //Add Tags + // Add Tags if (isset($_POST['tags'])) { foreach($_POST['tags'] as $tag) { $tag = intval($tag); @@ -60,7 +67,7 @@ if (isset($_POST['add_client'])) { } } - //Add domain to domains/certificates + // Create domain in domains/certificates if (!empty($website) && filter_var($website, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { // Get domain expiry date $expire = getDomainExpirationDate($website); @@ -96,7 +103,7 @@ if (isset($_POST['add_client'])) { } - //Logging + // Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Create', log_description = '$session_name created client $name$extended_log_description', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $client_id"); $_SESSION['alert_message'] = "Client $name created"; @@ -110,7 +117,6 @@ if (isset($_POST['edit_client'])) { require_once 'post/client_model.php'; - validateAdminRole(); $client_id = intval($_POST['client_id']); From 408a596efa977d798eb8c5fb41e026954760afba Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 8 Nov 2023 23:35:00 -0500 Subject: [PATCH 38/47] Add logging if creating a referral via create client --- post/client.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/post/client.php b/post/client.php index e8be32a1..ab0e4490 100644 --- a/post/client.php +++ b/post/client.php @@ -30,6 +30,8 @@ if (isset($_POST['add_client'])) { $sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND category_name = '$referral'"); if(mysqli_num_rows($sql) == 0) { mysqli_query($mysqli, "INSERT INTO categories SET category_name = '$referral', category_type = 'Referral'"); + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Category', log_action = 'Create', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); } // Create client From 8975fcf2eef056cf82cdd053992121ca91d23888 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 9 Nov 2023 11:23:45 -0500 Subject: [PATCH 39/47] Place Advanced filter back on the left final decision was made to do so and I like it --- client_assets.php | 66 +++++++++++++++++++++++------------------------ clients.php | 5 ++-- invoices.php | 4 +-- quotes.php | 3 ++- 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/client_assets.php b/client_assets.php index 51980e6e..21c141de 100644 --- a/client_assets.php +++ b/client_assets.php @@ -109,43 +109,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    -
    - All Assets - 0) { ?> - Workstations +
    +
    +
    + All Assets 0) { ?> - Servers - 0) { ?> - Virtual - 0) { ?> - Network - 0) { ?> - Other - + if ($workstation_count > 0) { ?> + Workstations + 0) { ?> + Servers + 0) { ?> + Virtual + 0) { ?> + Network + 0) { ?> + Other + +
    +
    + + Archived + + Archived + +
    - -
    -
    - - Archived - - Archived - -
    -
    -
    diff --git a/clients.php b/clients.php index e92fb24e..a2d3e3b9 100644 --- a/clients.php +++ b/clients.php @@ -78,6 +78,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    " autofocus>
    +
    @@ -88,9 +89,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ">Clients ">Leads
    -
    - -
    + diff --git a/invoices.php b/invoices.php index f70a83b7..9881473b 100644 --- a/invoices.php +++ b/invoices.php @@ -162,13 +162,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    -
    - +
    diff --git a/quotes.php b/quotes.php index a8c3e1d1..4d708fa7 100644 --- a/quotes.php +++ b/quotes.php @@ -38,13 +38,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    - +
    From f6076ad97aa98eb410639e3fcca6cddaca1756d3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 9 Nov 2023 13:09:38 -0500 Subject: [PATCH 40/47] Remove Quick Add Instead redirect them to the categories settings page when plus is clicked --- calendar_event_add_modal.php | 3 - calendar_event_edit_modal.php | 2 +- calendar_events.php | 4 -- category_quick_add_modal.php | 96 ------------------------------ client_edit_modal.php | 7 +-- clients.php | 2 - expense_add_modal.php | 4 +- expense_edit_modal.php | 4 +- expenses.php | 3 - inc_client_top_head.php | 4 -- invoice_add_modal.php | 2 +- invoice_edit_modal.php | 2 +- invoices.php | 2 - post/client.php | 32 ++++++---- product_add_modal.php | 2 +- product_edit_modal.php | 2 +- products.php | 3 - quote_add_modal.php | 2 +- quote_edit_modal.php | 2 +- quotes.php | 2 - recurring_expense_create_modal.php | 4 +- recurring_expense_edit_modal.php | 4 +- recurring_invoice_add_modal.php | 2 +- recurring_invoice_edit_modal.php | 2 +- recurring_invoices.php | 5 -- revenue_add_modal.php | 2 +- revenue_edit_modal.php | 2 +- revenues.php | 6 -- 28 files changed, 40 insertions(+), 167 deletions(-) delete mode 100644 category_quick_add_modal.php diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php index d32c752b..9b7ad916 100644 --- a/calendar_event_add_modal.php +++ b/calendar_event_add_modal.php @@ -58,9 +58,6 @@ -
    - -
    diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php index 7ad9fe21..01b46cce 100644 --- a/calendar_event_edit_modal.php +++ b/calendar_event_edit_modal.php @@ -145,7 +145,7 @@
    - Delete + Delete
    diff --git a/calendar_events.php b/calendar_events.php index 984f022e..ad1a2370 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -25,9 +25,6 @@ require_once "calendar_event_add_modal.php"; require_once "calendar_add_modal.php"; -require_once "category_quick_add_modal.php"; - - //loop through IDs and create a modal for each $sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id"); while ($row = mysqli_fetch_array($sql)) { @@ -44,7 +41,6 @@ while ($row = mysqli_fetch_array($sql)) { require "calendar_event_edit_modal.php"; - } ?> diff --git a/category_quick_add_modal.php b/category_quick_add_modal.php deleted file mode 100644 index e8eee6f2..00000000 --- a/category_quick_add_modal.php +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - diff --git a/client_edit_modal.php b/client_edit_modal.php index 1b253698..5dbda1f8 100644 --- a/client_edit_modal.php +++ b/client_edit_modal.php @@ -68,7 +68,7 @@
    - -
    - -
    diff --git a/clients.php b/clients.php index a2d3e3b9..5c5b3e0e 100644 --- a/clients.php +++ b/clients.php @@ -347,7 +347,5 @@ require_once "client_add_modal.php"; require_once "client_export_modal.php"; -require_once "category_quick_add_modal.php"; - require_once "footer.php"; diff --git a/expense_add_modal.php b/expense_add_modal.php index e345e67d..1f59d60b 100644 --- a/expense_add_modal.php +++ b/expense_add_modal.php @@ -95,7 +95,7 @@ ?>
    - +
    @@ -140,7 +140,7 @@ ?>
    - +
    diff --git a/expense_edit_modal.php b/expense_edit_modal.php index 528e2904..f2e74ebe 100644 --- a/expense_edit_modal.php +++ b/expense_edit_modal.php @@ -102,7 +102,7 @@ ?>
    - +
    @@ -147,7 +147,7 @@ ?>
    - +
    diff --git a/expenses.php b/expenses.php index 85dcf1fa..50beb6f1 100644 --- a/expenses.php +++ b/expenses.php @@ -201,7 +201,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php index 879d04d5..8f5cbf5b 100644 --- a/invoice_edit_modal.php +++ b/invoice_edit_modal.php @@ -56,7 +56,7 @@ ?>
    - +
    diff --git a/invoices.php b/invoices.php index 9881473b..1b8c6bc6 100644 --- a/invoices.php +++ b/invoices.php @@ -326,7 +326,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $client_name updated"; diff --git a/product_add_modal.php b/product_add_modal.php index 07a38629..b62dd51a 100644 --- a/product_add_modal.php +++ b/product_add_modal.php @@ -42,7 +42,7 @@ ?>
    - +
    diff --git a/product_edit_modal.php b/product_edit_modal.php index e1df979a..aaf2beeb 100644 --- a/product_edit_modal.php +++ b/product_edit_modal.php @@ -42,7 +42,7 @@ ?>
    - +
    diff --git a/products.php b/products.php index 5ac07d1a..cd1214da 100644 --- a/products.php +++ b/products.php @@ -123,7 +123,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "product_add_modal.php"; -require_once "category_quick_add_modal.php"; - require_once "footer.php"; - diff --git a/quote_add_modal.php b/quote_add_modal.php index 08e232b6..fed4f2fc 100644 --- a/quote_add_modal.php +++ b/quote_add_modal.php @@ -71,7 +71,7 @@
    - +
    diff --git a/quote_edit_modal.php b/quote_edit_modal.php index 3b58eb94..90563cf4 100644 --- a/quote_edit_modal.php +++ b/quote_edit_modal.php @@ -42,7 +42,7 @@
    - +
    diff --git a/quotes.php b/quotes.php index 4d708fa7..fc8f10dc 100644 --- a/quotes.php +++ b/quotes.php @@ -207,7 +207,5 @@ require_once "quote_add_modal.php"; require_once "quote_edit_modal.php"; -require_once "category_quick_add_modal.php"; - require_once "footer.php"; diff --git a/recurring_expense_create_modal.php b/recurring_expense_create_modal.php index ba1f110c..811bff14 100644 --- a/recurring_expense_create_modal.php +++ b/recurring_expense_create_modal.php @@ -137,7 +137,7 @@ ?>
    - +
    @@ -182,7 +182,7 @@ ?>
    - +
    diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php index 9318825f..9ab5cb2f 100644 --- a/recurring_expense_edit_modal.php +++ b/recurring_expense_edit_modal.php @@ -141,7 +141,7 @@ ?>
    - +
    @@ -186,7 +186,7 @@ ?>
    - +
    diff --git a/recurring_invoice_add_modal.php b/recurring_invoice_add_modal.php index 324d8dd1..c3df89ca 100644 --- a/recurring_invoice_add_modal.php +++ b/recurring_invoice_add_modal.php @@ -98,7 +98,7 @@ ?>
    - +
    diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php index 6e46562d..0dfef318 100644 --- a/recurring_invoice_edit_modal.php +++ b/recurring_invoice_edit_modal.php @@ -75,7 +75,7 @@ ?>
    - +
    diff --git a/recurring_invoices.php b/recurring_invoices.php index 7e70acc3..7d5097be 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -183,9 +183,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "recurring_invoice_add_modal.php"; -require_once "category_quick_add_modal.php"; - require_once "footer.php"; - - -?> diff --git a/revenue_add_modal.php b/revenue_add_modal.php index 6aa58242..05fb8d7d 100644 --- a/revenue_add_modal.php +++ b/revenue_add_modal.php @@ -114,7 +114,7 @@ ?>
    - +
    diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php index 4a372c89..69f0a7cd 100644 --- a/revenue_edit_modal.php +++ b/revenue_edit_modal.php @@ -120,7 +120,7 @@ ?>
    - +
    diff --git a/revenues.php b/revenues.php index 6ff78a1c..738fb8ea 100644 --- a/revenues.php +++ b/revenues.php @@ -161,10 +161,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "revenue_add_modal.php"; -require_once "category_quick_add_modal.php"; - - require_once "footer.php"; - - -?> From 0de99fda611c71f70aedc3a9239856e1dd2da477 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Thu, 9 Nov 2023 22:18:57 +0000 Subject: [PATCH 41/47] Mail parse - Handle blank/unexpected emails better --- cron_ticket_email_parser.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php index efd33fc5..f36be614 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -61,7 +61,7 @@ $lock_file_path = "{$temp_dir}/itflow_email_parser_{$installation_id}.lock"; // Check for lock file to prevent concurrent script runs if (file_exists($lock_file_path)) { $file_age = time() - filemtime($lock_file_path); - + // If file is older than 10 minutes (600 seconds), delete and continue if ($file_age > 600) { unlink($lock_file_path); @@ -371,7 +371,13 @@ if ($emails) { $from_array = $parser->getAddresses('from')[0]; $from_name = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags($from_array['display'])))); - $from_email = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags($from_array['address'])))); + + // Handle blank 'From' emails + $from_email = "itflow-guest@example.com"; + if (filter_var($from_array['address'], FILTER_VALIDATE_EMAIL)) { + $from_email = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags($from_array['address'])))); + } + $from_domain = explode("@", $from_array['address']); $from_domain = trim(mysqli_real_escape_string($mysqli, nullable_htmlentities(strip_tags(end($from_domain))))); // Use the final element in the array (as technically legal to have multiple @'s) From 104bbee42273eaf4103061a30bbd65a2e3364de4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 Nov 2023 16:34:21 -0500 Subject: [PATCH 42/47] Converted Client Services Multiple Select Boxes to use Select2: --- client_service_add_modal.php | 126 ++++++++++------------- client_service_edit_modal.php | 185 +++++++++++++++------------------- 2 files changed, 139 insertions(+), 172 deletions(-) diff --git a/client_service_add_modal.php b/client_service_add_modal.php index 24108134..eaad688a 100644 --- a/client_service_add_modal.php +++ b/client_service_add_modal.php @@ -97,7 +97,7 @@
    - - - -
    - -
    -
    - - -
    -
    - -
    -
    - - -
    -
    + +
    + + + +
    + +
    +
    + + +
    -
    - -
    -
    - - -
    -
    - -
    -
    - - -
    -
    - +
    + +
    diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php index c431a5b3..fe82b5d5 100644 --- a/client_service_edit_modal.php +++ b/client_service_edit_modal.php @@ -96,9 +96,10 @@
    +
    - - - "> -
    +
    + + - '$service_created_at' OR asset_archived_at IS NULL) AND asset_client_id = $client_id"); - while ($row_all = mysqli_fetch_array($sql_all)) { - $asset_id = intval($row_all['asset_id']); - $asset_name = nullable_htmlentities($row_all['asset_name']); - - if (in_array($asset_id, $selected_ids)) { - echo ""; - } - else{ - echo ""; - } - } - ?> - -
    -
    - -
    -
    - - -
    -
    + $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE (asset_archived_at > '$service_created_at' OR asset_archived_at IS NULL) AND asset_client_id = $client_id"); + while ($row_all = mysqli_fetch_array($sql_all)) { + $asset_id = intval($row_all['asset_id']); + $asset_name = nullable_htmlentities($row_all['asset_name']); + if (in_array($asset_id, $selected_ids)) { + echo ""; + } + else{ + echo ""; + } + } + ?> +
    +
    + + - '$service_created_at' OR domain_archived_at IS NULL) AND domain_client_id = $client_id"); - while ($row_all = mysqli_fetch_array($sql_all)) { - $domain_id = intval($row_all['domain_id']); - $domain_name = nullable_htmlentities($row_all['domain_name']); - - if (in_array($domain_id, $selected_ids)) { - echo ""; - } - else{ - echo ""; - } - } - ?> - -
    -
    - -
    -
    - - -
    -
    + $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE (login_archived_at > '$service_created_at' OR login_archived_at IS NULL) AND login_client_id = $client_id"); + while ($row_all = mysqli_fetch_array($sql_all)) { + $login_id = intval($row_all['login_id']); + $login_name = nullable_htmlentities($row_all['login_name']); + if (in_array($login_id, $selected_ids)) { + echo ""; + } + else{ + echo ""; + } + } + ?> +
    +
    + + +
    + +
    + + +
    - +
    From efb47095199be1b6915b2d225c0e3dae61e3c543 Mon Sep 17 00:00:00 2001 From: Andrew Malsbury Date: Sun, 12 Nov 2023 21:23:06 +0000 Subject: [PATCH 43/47] Time tracking paused when pending --- js/ticket_time_tracking.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/js/ticket_time_tracking.js b/js/ticket_time_tracking.js index a49a8fb0..c50bf1a9 100644 --- a/js/ticket_time_tracking.js +++ b/js/ticket_time_tracking.js @@ -114,6 +114,16 @@ localStorage.removeItem(getLocalStorageKey("pausedTime")); } } + + + // Function to check status and pause timer + function checkStatusAndPauseTimer() { + var status = document.querySelector('select[name="status"]').value; + if (status.includes("Pending")) { + pauseTimer(); + } + } + document.getElementById("hours").addEventListener('change', updateTimeFromInput); document.getElementById("minutes").addEventListener('change', updateTimeFromInput); @@ -124,6 +134,9 @@ document.getElementById("minutes").addEventListener('focus', handleInputFocus); document.getElementById("seconds").addEventListener('focus', handleInputFocus); + document.querySelector('select[name="status"]').addEventListener('change', checkStatusAndPauseTimer); + + document.getElementById("startStopTimer").addEventListener('click', function() { if (timerInterval === null) { startTimer(); @@ -140,16 +153,17 @@ // Wait for other synchronous actions (if any) to complete before resetting the timer. setTimeout(forceResetTimer, 100); // 100ms delay should suffice, but you can adjust as needed. }); - + try { displayTime(); if (!localStorage.getItem(getLocalStorageKey("startTime")) && !localStorage.getItem(getLocalStorageKey("pausedTime"))) { - // If first time, start the timer automatically startTimer(); } else if (localStorage.getItem(getLocalStorageKey("startTime"))) { - // Continue timer if it was running before startTimer(); } + + // Check and pause timer if status is pending + checkStatusAndPauseTimer(); } catch (error) { console.error("There was an issue initializing the timer:", error); } From d837a100137ba121a36f973bd1c193ccd499d861 Mon Sep 17 00:00:00 2001 From: Andrew Malsbury Date: Mon, 13 Nov 2023 17:50:42 +0000 Subject: [PATCH 44/47] Fix editing of recurring and quotes --- quote.php | 569 ++++++++++++++++++++---------------------- recurring_invoice.php | 2 +- 2 files changed, 271 insertions(+), 300 deletions(-) diff --git a/quote.php b/quote.php index e2617045..4d5d7dbf 100644 --- a/quote.php +++ b/quote.php @@ -99,7 +99,7 @@ if (isset($_GET['quote_id'])) { $json_products = json_encode($products); } - ?> +?>
    1. @@ -167,8 +167,7 @@ if (isset($_GET['quote_id'])) { Print - ');"> + ');"> Download PDF @@ -207,7 +206,9 @@ if (isset($_GET['quote_id'])) {
        -

        • +
      • +

        +
        • @@ -216,7 +217,9 @@ if (isset($_GET['quote_id'])) {
        -

        • +
      • +

        +
        • @@ -250,151 +253,154 @@ if (isset($_GET['quote_id'])) {
    Name Expiry>ClientClient
    - - - - - - - - - + + + + + + + + + - - - - + - - - - - - - + + + + + + + + + - ?> + > + + + "> + + + + + + - - - - - - - - + } + ?> + + + + +
    ItemDescriptionQuantityPriceTaxTotal
    ItemDescriptionQuantityPriceTaxTotal
    - -
    - -
    -
    - - - - -
    '; }?> - - -
    - - Edit - -
    - - Delete - + if ($item_order == $min_item_order) { + $up_hidden = "hidden"; + } else { + $up_hidden = ""; + } ?> + +
    + +
    + +
    +
    + + + + +
    '; + } ?> + + +
    + + Edit + +
    + + Delete + +
    - - -
    + + + + + + + + + - "> - - - - - - - - - - - -
    + +
    @@ -422,26 +428,26 @@ if (isset($_GET['quote_id'])) {
    - - - - - 0) { ?> - - + + - - 0) { ?> + 0) { ?> + + + + + + 0) { ?> + + + + + - - + + - - - - -
    Subtotal
    Discount-Subtotal
    Discount-
    Tax
    TaxTotal
    Total
    @@ -470,29 +476,29 @@ if (isset($_GET['quote_id'])) {
    - - - - - + + + + + - - - - - - + + + + + + } + ?>
    DateStatusDescription
    DateStatusDescription
    @@ -501,7 +507,7 @@ if (isset($_GET['quote_id'])) {
    - + \ No newline at end of file diff --git a/recurring_invoice.php b/recurring_invoice.php index 00329680..77b03231 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -435,7 +435,7 @@ if (isset($_GET['recurring_id'])) { require_once "recurring_invoice_note_modal.php"; - require_once "category_quick_add_modal.php"; + include_once "category_quick_add_modal.php"; } From cdacb7735c18aa1fbd5630b3d74405249f0ce8d3 Mon Sep 17 00:00:00 2001 From: Andrew Malsbury Date: Mon, 13 Nov 2023 18:45:31 +0000 Subject: [PATCH 45/47] Update to remove --- quote.php | 2 -- recurring_invoice.php | 3 --- 2 files changed, 5 deletions(-) diff --git a/quote.php b/quote.php index 4d5d7dbf..81c51cf8 100644 --- a/quote.php +++ b/quote.php @@ -515,8 +515,6 @@ if (isset($_GET['quote_id'])) { require_once "quote_copy_modal.php"; require_once "quote_note_modal.php"; - - include_once "category_quick_add_modal.php"; } require_once "footer.php"; diff --git a/recurring_invoice.php b/recurring_invoice.php index 77b03231..57a63b24 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -435,9 +435,6 @@ if (isset($_GET['recurring_id'])) { require_once "recurring_invoice_note_modal.php"; - include_once "category_quick_add_modal.php"; - - } require_once "footer.php"; From 4a74d7b40229afa47448b7f830b9c27ae693d642 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 13 Nov 2023 19:52:03 -0500 Subject: [PATCH 46/47] Do not show other Assets if there are none --- client_assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_assets.php b/client_assets.php index 21c141de..7786a693 100644 --- a/client_assets.php +++ b/client_assets.php @@ -130,7 +130,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Network 0) { ?> + if ($other_count > 0) { ?> Other From f11ad402e9215539c9b73ac4b720fbdca7c65f1f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 13 Nov 2023 20:24:57 -0500 Subject: [PATCH 47/47] Moved the rest of the Import / Export Buttons into the Create and some exports in the Advanced filter button --- client_certificates.php | 32 ++++++++++++++++++-------------- client_documents.php | 17 +++++++++++++---- client_domains.php | 13 +++++++++---- client_invoices.php | 13 ++++++++++--- client_networks.php | 13 +++++++++++-- client_payments.php | 8 +++++--- client_quotes.php | 11 +++++++++-- client_recurring_invoices.php | 11 +++++++++-- client_services.php | 17 +++++++++++++---- client_trips.php | 12 ++++++++++-- expenses.php | 7 ++++++- trips.php | 7 ++++++- 12 files changed, 119 insertions(+), 42 deletions(-) diff --git a/client_certificates.php b/client_certificates.php index 2f6ea275..51adf31d 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -24,7 +24,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Certificates

    - +
    + + +
    + + Export + +
    +
    @@ -43,22 +51,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - -
    - - - -
    diff --git a/client_documents.php b/client_documents.php index 87cb35d9..67b3749c 100644 --- a/client_documents.php +++ b/client_documents.php @@ -155,10 +155,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    - -
    - +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    diff --git a/client_domains.php b/client_domains.php index 450bbde1..c6a027cf 100644 --- a/client_domains.php +++ b/client_domains.php @@ -25,7 +25,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Domains

    - +
    + + +
    + + Export + +
    +
    @@ -33,7 +41,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -45,10 +52,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    -
    diff --git a/client_invoices.php b/client_invoices.php index 9d10bf50..9ecef0a8 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -26,8 +26,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Invoices

    -
    - +
    +
    + + +
    + + Export + +
    +
    @@ -46,7 +54,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    diff --git a/client_networks.php b/client_networks.php index d18b8d89..b15a7a6d 100644 --- a/client_networks.php +++ b/client_networks.php @@ -28,7 +28,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Networks

    - +
    + + +
    + + Export + +
    +
    +
    @@ -47,7 +56,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    diff --git a/client_payments.php b/client_payments.php index 77071d90..a7e0f47d 100644 --- a/client_payments.php +++ b/client_payments.php @@ -25,8 +25,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
    -
    -

    Payments

    +
    +

    Payments

    +
    + +
    @@ -44,7 +47,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    diff --git a/client_quotes.php b/client_quotes.php index cc038769..d4a7022c 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -27,7 +27,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Quotes

    - +
    + + +
    + + Export + +
    +
    @@ -46,7 +54,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php index 2e4bb952..824af5e5 100644 --- a/client_recurring_invoices.php +++ b/client_recurring_invoices.php @@ -26,7 +26,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Recurring Invoices

    - +
    + + +
    + + Export + +
    +
    @@ -45,7 +53,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    diff --git a/client_services.php b/client_services.php index c06d0696..cb7ca1a5 100644 --- a/client_services.php +++ b/client_services.php @@ -34,10 +34,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
    - -
    - +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    +
    diff --git a/client_trips.php b/client_trips.php index a1b73a33..8debe53c 100644 --- a/client_trips.php +++ b/client_trips.php @@ -27,7 +27,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Trips

    - +
    + + +
    + + Export + +
    +
    +
    @@ -46,7 +55,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    diff --git a/expenses.php b/expenses.php index 50beb6f1..910d5ccf 100644 --- a/expenses.php +++ b/expenses.php @@ -49,7 +49,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -83,6 +82,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    +
    +
    + +
    +
    diff --git a/trips.php b/trips.php index fae2af1f..729f2796 100644 --- a/trips.php +++ b/trips.php @@ -47,7 +47,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -81,6 +80,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    +
    +
    + +
    +