From 19daa289b2db0c5842f2493653577e21e9547697 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 19 Feb 2025 14:18:16 -0500 Subject: [PATCH] Merged Files Vendors with Client Vendors seperated them with some header logic --- client_vendors.php | 280 ------------------ global_search.php | 2 +- includes/client_side_nav.php | 2 +- ...port_modal.php => vendor_export_modal.php} | 4 +- post/user/vendor.php | 22 +- vendors.php | 263 ++++++++++------ 6 files changed, 181 insertions(+), 392 deletions(-) delete mode 100644 client_vendors.php rename modals/{client_vendor_export_modal.php => vendor_export_modal.php} (79%) diff --git a/client_vendors.php b/client_vendors.php deleted file mode 100644 index da6a1b8a..00000000 --- a/client_vendors.php +++ /dev/null @@ -1,280 +0,0 @@ - - -
-
-

- Vendors -

-
-
- - -
- - Create from Template - - 0) { ?> -
- - Export - - -
-
-
-
-
-
- - -
- -
-
- -
- -
-
-
- -
-
- "> - Archived - - -
-
- -
-
-
-
- - -
- - "> - - - - - - - - - - - Account #: $vendor_account_number"; - } else { - $vendor_account_number_display = ''; - } - $vendor_contact_name = nullable_htmlentities($row['vendor_contact_name']); - if ($vendor_contact_name) { - $vendor_contact_name_display = $vendor_contact_name; - } else { - $vendor_contact_name_display = "-"; - } - $vendor_phone = formatPhoneNumber($row['vendor_phone']); - $vendor_extension = nullable_htmlentities($row['vendor_extension']); - $vendor_email = nullable_htmlentities($row['vendor_email']); - $vendor_website = nullable_htmlentities($row['vendor_website']); - if ($vendor_website) { - $vendor_website_display = "$vendor_website "; - } else { - $vendor_website_display = "-"; - } - $vendor_hours = nullable_htmlentities($row['vendor_hours']); - $vendor_sla = nullable_htmlentities($row['vendor_sla']); - $vendor_code = nullable_htmlentities($row['vendor_code']); - $vendor_notes = nullable_htmlentities($row['vendor_notes']); - $vendor_created_at = nullable_htmlentities($row['vendor_created_at']); - $vendor_archived_at = nullable_htmlentities($row['vendor_archived_at']); - $vendor_template_id = intval($row['vendor_template_id']); - - - ?> - - - - - - - - - - - -
-
- -
- 		- - Vendor - - - - Description - - - - Contact - - - - Website - - Action
-
- -
- 		- -
- -
-
- -
-
- - 		- - - - -
- - -
- - -
- - 		-
- -
- - Edit - - - -
- - Unarchive - - -
- - Delete - - - -
- - Archive - - - -
-
-
-
-
- -
-
- - - - - + diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 3f22cc87..02b6e611 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -85,7 +85,7 @@
  • - "> + ">

    Vendors diff --git a/modals/client_vendor_export_modal.php b/modals/vendor_export_modal.php similarity index 79% rename from modals/client_vendor_export_modal.php rename to modals/vendor_export_modal.php index 7cb1cf69..ab904b19 100644 --- a/modals/client_vendor_export_modal.php +++ b/modals/vendor_export_modal.php @@ -8,12 +8,14 @@

    + +
    - +
    diff --git a/post/user/vendor.php b/post/user/vendor.php index 1c7ff4b5..be4c0eb0 100644 --- a/post/user/vendor.php +++ b/post/user/vendor.php @@ -285,22 +285,22 @@ if (isset($_POST['bulk_delete_vendors'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['export_client_vendors_csv'])) { - $client_id = intval($_POST['client_id']); +if (isset($_POST['export_vendors_csv'])) { + + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND vendor_client_id = $client_id"; + } else { + $client_query = "AND vendor_client_id = 0"; + } - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; - - $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_template = 0 $client_query ORDER BY vendor_name ASC"); $count = mysqli_num_rows($sql); if ($count > 0) { $delimiter = ","; - $filename = $client_name . "-Vendors-" . date('Y-m-d') . ".csv"; + $filename = "Vendors-" . date('Y-m-d') . ".csv"; //create a file pointer $f = fopen('php://memory', 'w'); @@ -327,7 +327,7 @@ if (isset($_POST['export_client_vendors_csv'])) { } // Logging - logAction("Vendor", "Export", "$session_name exported $count vendor(s) to a CSV file", $client_id); + logAction("Vendor", "Export", "$session_name exported $count vendor(s) to a CSV file"); exit; } diff --git a/vendors.php b/vendors.php index 6b234e41..aae28e6f 100644 --- a/vendors.php +++ b/vendors.php @@ -1,23 +1,27 @@ -
    -
    -

    Vendors

    -
    - +
    +
    +

    + Vendors +

    +
    +
    + + +
    + + Create from Template + + 0) { ?> +
    +     + Export + + +
    +
    +
    +
    + + + + +
    -
    - -
    -
    -
    - -
    - - -
    +
    +
    + +
    +
    -
    -
    -
    - "> - Archived - +
    + +
    +
    + archived=" + class="btn btn-"> + Archived + +
    -
    " id="advancedFilter"> -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    + +
    + +
    +
    + +
    - - "> +
    + "> + + @@ -119,57 +148,76 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $vendor_id = intval($row['vendor_id']); $vendor_name = nullable_htmlentities($row['vendor_name']); $vendor_description = nullable_htmlentities($row['vendor_description']); - if (empty($vendor_description)) { - $vendor_description_display = "-"; - } else { + if ($vendor_description) { $vendor_description_display = $vendor_description; + } else { + $vendor_description_display = "-"; } $vendor_account_number = nullable_htmlentities($row['vendor_account_number']); - $vendor_contact_name = nullable_htmlentities($row['vendor_contact_name']); - if (empty($vendor_contact_name)) { - $vendor_contact_name_display = "-"; + if ($vendor_account_number) { + $vendor_account_number_display = "
    Account #: $vendor_account_number
    "; } else { + $vendor_account_number_display = ''; + } + $vendor_contact_name = nullable_htmlentities($row['vendor_contact_name']); + if ($vendor_contact_name) { $vendor_contact_name_display = $vendor_contact_name; + } else { + $vendor_contact_name_display = "-"; } $vendor_phone = formatPhoneNumber($row['vendor_phone']); $vendor_extension = nullable_htmlentities($row['vendor_extension']); $vendor_email = nullable_htmlentities($row['vendor_email']); $vendor_website = nullable_htmlentities($row['vendor_website']); + if ($vendor_website) { + $vendor_website_display = "$vendor_website "; + } else { + $vendor_website_display = "-"; + } $vendor_hours = nullable_htmlentities($row['vendor_hours']); $vendor_sla = nullable_htmlentities($row['vendor_sla']); $vendor_code = nullable_htmlentities($row['vendor_code']); $vendor_notes = nullable_htmlentities($row['vendor_notes']); + $vendor_created_at = nullable_htmlentities($row['vendor_created_at']); + $vendor_archived_at = nullable_htmlentities($row['vendor_archived_at']); $vendor_template_id = intval($row['vendor_template_id']); + ?> - - + + + +
    +
    + +
    +     		- + Vendor - + Description - + Contact + + Website + + Action
    + +
    + +
    +     		- +
    + +
    +
    + +
    +
    - -
    - - - - -     		+ - +
    - +

    -
    - -
    + +
    +
    + +