From 365ed3a79a98e526505c255d5be47497014707d3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 31 Oct 2023 11:03:46 -0400 Subject: [PATCH] Merged Client Leads into Client Management --- client_add_modal.php | 9 ++ client_leads.php | 308 ------------------------------------------- clients.php | 34 ++++- side_nav.php | 6 - 4 files changed, 40 insertions(+), 317 deletions(-) delete mode 100644 client_leads.php diff --git a/client_add_modal.php b/client_add_modal.php index 324d8f7a..c54c3cab 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -90,6 +90,15 @@ +
+ +
+
+ +
+
+
+ diff --git a/client_leads.php b/client_leads.php deleted file mode 100644 index f6dc3d88..00000000 --- a/client_leads.php +++ /dev/null @@ -1,308 +0,0 @@ - - -
-
-

Lead Management

-
- - - -
-
- -
-
-
-
-
- -
- - -
-
-
-
-
- -
-
-
-
" id="advancedFilter"> -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
-
- - "> - - - - - - - - - $location_city $location_state $location_zip"; - } - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_title = nullable_htmlentities($row['contact_title']); - $contact_phone = formatPhoneNumber($row['contact_phone']); - $contact_extension = nullable_htmlentities($row['contact_extension']); - $contact_mobile = formatPhoneNumber($row['contact_mobile']); - $contact_email = nullable_htmlentities($row['contact_email']); - $client_website = nullable_htmlentities($row['client_website']); - $client_rate = floatval($row['client_rate']); - $client_currency_code = nullable_htmlentities($row['client_currency_code']); - $client_net_terms = intval($row['client_net_terms']); - $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); - $client_referral = nullable_htmlentities($row['client_referral']); - $client_notes = nullable_htmlentities($row['client_notes']); - $client_created_at = date('Y-m-d', strtotime($row['client_created_at'])); - $client_updated_at = nullable_htmlentities($row['client_updated_at']); - $client_archive_at = nullable_htmlentities($row['client_archived_at']); - $client_is_lead = intval($row['client_lead']); - - // 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.client_tag_tag_id = tags.tag_id WHERE client_tags.client_tag_client_id = $client_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_client_tags)) { - - $client_tag_id = intval($row['tag_id']); - $client_tag_name = nullable_htmlentities($row['tag_name']); - $client_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($client_tag_color)) { - $client_tag_color = "dark"; - } - $client_tag_icon = nullable_htmlentities($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 = floatval($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 = floatval($row['amount_paid']); - - $balance = $invoice_amounts - $amount_paid; - //set Text color on balance - if ($balance > 0) { - $balance_text_color = "text-danger font-weight-bold"; - } else { - $balance_text_color = ""; - } - - //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_monthly_total); - - $recurring_monthly_total = floatval($row['recurring_monthly_total']); - - //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_yearly_total); - - $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; - - $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; - - ?> - - - - - - - - - - - - - - -
NamePrimary address Primary contact Action
- - - -
- -
- - -
- -
- -
- Created: -
- - 		- -
- -
- -
- -
- -
- -
- -
- -
- - 		-
- -
- - Edit - -
- - Archive - -
-
-
-
- -
-
- -Client Management
- +
+ + +
+ + Export + +
+
+
@@ -60,7 +84,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + + Leads + + Leads +
diff --git a/side_nav.php b/side_nav.php index eb45d634..6bf3d75b 100644 --- a/side_nav.php +++ b/side_nav.php @@ -68,12 +68,6 @@ if ($config_module_enable_accounting == 1) { ?>
  • SALES
    • -
  • - "> - -

    Leads

    -     -
  • ">