From d7090d32860a8fb1d02047fa0bae650a7135d0d4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 18 Sep 2022 14:00:31 -0400 Subject: [PATCH] Reworked Client Section URL routing to be standard with standard URL routing of ITFlow. It was just too confusing to mix to different URL routing operations --- calendar_events.php | 2 +- client.php | 352 ---------------------------------- client_assets.php | 9 +- client_certificates.php | 10 +- client_contacts.php | 7 +- client_document_details.php | 10 +- client_documents.php | 15 +- client_domains.php | 9 +- client_events.php | 4 + client_files.php | 6 +- client_invoices.php | 11 +- client_locations.php | 11 +- client_logins.php | 9 +- client_logs.php | 7 +- client_networks.php | 11 +- client_overview.php | 8 + client_payments.php | 11 +- client_quotes.php | 11 +- client_recurring_invoices.php | 11 +- client_routes.php | 123 ------------ client_scheduled_tickets.php | 13 +- client_services.php | 12 +- client_shared_items.php | 12 +- client_side_nav.php | 46 ++--- client_software.php | 9 +- client_test.php | 9 + client_tickets.php | 9 +- client_trips.php | 11 +- client_vendors.php | 11 +- clients.php | 2 +- global_search.php | 232 +++++++++++----------- inc_all_client.php | 223 +++++++++++++++++++++ inc_client_top_head.php | 129 +++++++++++++ invoice.php | 2 +- invoices.php | 2 +- payments.php | 2 +- quote.php | 2 +- quotes.php | 2 +- recurring_invoice.php | 2 +- recurring_invoices.php | 2 +- ticket.php | 2 +- tickets.php | 2 +- trips.php | 2 +- 43 files changed, 665 insertions(+), 710 deletions(-) delete mode 100644 client.php delete mode 100644 client_routes.php create mode 100644 client_test.php create mode 100644 inc_all_client.php create mode 100644 inc_client_top_head.php diff --git a/calendar_events.php b/calendar_events.php index 9bc7727a..66d715b8 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -134,7 +134,7 @@ while($row = mysqli_fetch_array($sql)){ $event_title = $row['vendor_name']; $event_start = $row['vendor_created_at']; - echo "{ id: '$event_id', title: ". json_encode($event_title) .", start: '$event_start', color: 'brown', url: 'client.php?client_id=$event_id&tab=vendors'},"; + echo "{ id: '$event_id', title: ". json_encode($event_title) .", start: '$event_start', color: 'brown', url: 'client_vendors.php?client_id=$event_id'},"; } ?> diff --git a/client.php b/client.php deleted file mode 100644 index 16b993fa..00000000 --- a/client.php +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - -

Nothing to see here

"; - }else{ - - $row = mysqli_fetch_array($sql); - $client_name = $row['client_name']; - $client_type = $row['client_type']; - $client_website = $row['client_website']; - $client_referral = $row['client_referral']; - $client_currency_code = $row['client_currency_code']; - $client_net_terms = $row['client_net_terms']; - if($client_net_terms == 0){ - $client_net_terms = $config_default_net_terms; - } - $client_notes = $row['client_notes']; - $client_created_at = $row['client_created_at']; - $primary_contact = $row['primary_contact']; - $primary_location = $row['primary_location']; - $contact_id = $row['contact_id']; - $contact_name = $row['contact_name']; - $contact_title = $row['contact_title']; - $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - $location_id = $row['location_id']; - $location_name = $row['location_name']; - $location_address = $row['location_address']; - $location_city = $row['location_city']; - $location_state = $row['location_state']; - $location_zip = $row['location_zip']; - $location_country = $row['location_country']; - $location_phone = $row['location_phone']; - - //Client Tags - - $client_tag_name_display_array = array(); - $client_tag_id_array = array(); - $sql_client_tags = mysqli_query($mysqli,"SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id"); - while($row = mysqli_fetch_array($sql_client_tags)){ - - $client_tag_id = $row['tag_id']; - $client_tag_name = $row['tag_name']; - $client_tag_color = $row['tag_color']; - $client_tag_icon = $row['tag_icon']; - if(empty($client_tag_icon)){ - $client_tag_icon = "tag"; - } - - $client_tag_id_array[] = $client_tag_id; - $client_tag_name_display_array[] = "$client_tag_name "; - } - $client_tags_display = " " . implode('', $client_tag_name_display_array); - - //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_invoice_amounts = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'"); - $row = mysqli_fetch_array($sql_invoice_amounts); - - $invoice_amounts = $row['invoice_amounts']; - - $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_amount_paid); - - $amount_paid = $row['amount_paid']; - - $balance = $invoice_amounts - $amount_paid; - - //Badge Counts - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id")); - $num_contacts = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id")); - $num_locations = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id")); - $num_assets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status != 'Closed' AND ticket_client_id = $client_id")); - $num_active_tickets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status = 'Closed' AND ticket_client_id = $client_id")); - $num_closed_tickets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id")); - $num_services = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id")); - $num_vendors = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('login_id') AS num FROM logins WHERE login_archived_at IS NULL AND login_client_id = $client_id")); - $num_logins = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id")); - $num_networks = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id")); - $num_domains = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id")); - $num_certificates = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND software_client_id = $client_id")); - $num_software = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_open = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_draft = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_sent = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_viewed = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_partial = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Paid' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_paid = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id")); - $num_quotes = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL AND recurring_client_id = $client_id")); - $num_recurring = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id")); - $num_payments = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_client_id = $client_id")); - $num_files = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id")); - $num_documents = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('event_id') AS num FROM events WHERE event_client_id = $client_id")); - $num_events = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); - $num_trips = $row['num']; - - // Expiring Items - - // Get Domains Expiring within 30 Days - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains - WHERE domain_client_id = $client_id - AND domain_expire != '0000-00-00' - AND domain_archived_at IS NULL - AND domain_expire < CURRENT_DATE + INTERVAL 30 DAY - AND company_id = $session_company_id" - )); - $num_domains_expiring = $row['num']; - - // Get Asset Warranties Expiring - $sql_asset_warranties_expiring = mysqli_query($mysqli,"SELECT * FROM assets - WHERE asset_client_id = $client_id - AND asset_warranty_expire != '0000-00-00' - AND asset_archived_at IS NULL - AND asset_warranty_expire < CURRENT_DATE + INTERVAL 90 DAY - AND company_id = $session_company_id ORDER BY asset_warranty_expire DESC" - ); - - // Get Assets Retiring - $sql_asset_retire = mysqli_query($mysqli,"SELECT * FROM assets - WHERE asset_client_id = $client_id - AND asset_install_date != '0000-00-00' - AND asset_archived_at IS NULL - AND asset_install_date + INTERVAL 7 YEAR < CURRENT_DATE + INTERVAL 90 DAY - AND company_id = $session_company_id ORDER BY asset_install_date DESC" - ); - - // Get Stale Tickets - $sql_tickets_stale = mysqli_query($mysqli,"SELECT * FROM tickets - WHERE ticket_client_id = $client_id - AND ticket_created_at < CURRENT_DATE - INTERVAL 14 DAY - AND ticket_status != 'Closed' - AND company_id = $session_company_id ORDER BY ticket_created_at DESC" - ); - -?> - - - - - -
-
-
-
-

- - " target="_blank"> -
-
-
- - - -
- - - -
- - - - -
-
-

Contact

- - -
- - - -
- - - - - x - -
- - - - -
- -
-

Billing

-
Paid
-
Balance
float-right">
-
Net Terms
Days
-
- - -
-

Support

-
Open Tickets
-
- - -
-
-
- - \ No newline at end of file diff --git a/client_assets.php b/client_assets.php index dddf55b3..20d4a008 100644 --- a/client_assets.php +++ b/client_assets.php @@ -1,3 +1,5 @@ + +
-
@@ -124,7 +125,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- Export + Export
@@ -362,4 +363,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); \ No newline at end of file +?> + + \ No newline at end of file diff --git a/client_certificates.php b/client_certificates.php index 65c2ad82..8d7affeb 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -1,5 +1,6 @@ - + -
- +
@@ -42,7 +42,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -197,3 +197,5 @@ include("client_certificate_add_modal.php"); ); } + + \ No newline at end of file diff --git a/client_contacts.php b/client_contacts.php index 8f349d0f..617cf5fa 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -1,3 +1,5 @@ + + -
@@ -56,7 +57,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- Export + Export
@@ -217,3 +218,5 @@ include("client_contact_add_modal.php"); include("client_contact_import_modal.php"); ?> + + \ No newline at end of file diff --git a/client_document_details.php b/client_document_details.php index 042c4b46..1f7ce828 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -1,3 +1,5 @@ + + Clients 0){ ?> @@ -81,3 +83,5 @@ include("client_document_edit_modal.php"); include("share_modal.php"); ?> + + \ No newline at end of file diff --git a/client_documents.php b/client_documents.php index 815866c3..f50e52bf 100644 --- a/client_documents.php +++ b/client_documents.php @@ -1,3 +1,5 @@ + +