From 066952ed045be93ce44531bf53ca421e3f7ffa5f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 22 Aug 2025 17:36:07 -0400 Subject: [PATCH] Consolidate vendor modals to modals/vendor removed ajax_ and _modal prefixes from file names and use new ajax-modal syntax --- user/ajax/ajax_service_details.php | 2 +- user/client_document_details.php | 5 +---- user/domains.php | 12 ++++-------- .../vendor_add.php} | 0 .../vendor_add_from_template.php} | 0 .../vendor_contact_add.php} | 0 .../vendor_contact_edit.php} | 0 .../vendor/vendor_details.php} | 4 ++-- .../vendor/vendor_edit.php} | 4 ++-- .../vendor_export.php} | 0 user/software.php | 2 +- user/vendors.php | 18 +++++------------- 12 files changed, 16 insertions(+), 31 deletions(-) rename user/modals/{vendor_add_modal.php => vendor/vendor_add.php} (100%) rename user/modals/{vendor_add_from_template_modal.php => vendor/vendor_add_from_template.php} (100%) rename user/modals/{vendor_contact_add_modal.php => vendor/vendor_contact_add.php} (100%) rename user/modals/{vendor_contact_edit_modal.php => vendor/vendor_contact_edit.php} (100%) rename user/{ajax/ajax_vendor_details.php => modals/vendor/vendor_details.php} (96%) rename user/{ajax/ajax_vendor_edit.php => modals/vendor/vendor_edit.php} (98%) rename user/modals/{vendor_export_modal.php => vendor/vendor_export.php} (100%) diff --git a/user/ajax/ajax_service_details.php b/user/ajax/ajax_service_details.php index fed781e6..028bbc7f 100644 --- a/user/ajax/ajax_service_details.php +++ b/user/ajax/ajax_service_details.php @@ -220,7 +220,7 @@ ob_start(); while ($row = mysqli_fetch_array($sql_vendors)) { $vendor_id = intval($row['vendor_id']); $vendor_name = nullable_htmlentities($row['vendor_name']); - echo "
  • $vendor_name
    • "; + echo "
  • $vendor_name
    • "; } echo ""; } diff --git a/user/client_document_details.php b/user/client_document_details.php index 355eb416..5a6d3b14 100644 --- a/user/client_document_details.php +++ b/user/client_document_details.php @@ -339,10 +339,7 @@ $page_title = $row['document_name']; ?>
    - + diff --git a/user/domains.php b/user/domains.php index 59f82b9a..7c5c6897 100644 --- a/user/domains.php +++ b/user/domains.php @@ -266,23 +266,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $client_name = nullable_htmlentities($row['client_name']); // Add - if empty on the table $domain_registrar_name_display = $domain_registrar_name ? " - + $domain_registrar_name " : "-"; $domain_webhost_name_display = $domain_webhost_name ? " - + $domain_webhost_name " : "-"; $domain_dnshost_name_display = $domain_dnshost_name ? " - + $domain_dnshost_name " : "-"; $domain_mailhost_name_display = $domain_mailhost_name ? " - + $domain_mailhost_name " : "-"; diff --git a/user/modals/vendor_add_modal.php b/user/modals/vendor/vendor_add.php similarity index 100% rename from user/modals/vendor_add_modal.php rename to user/modals/vendor/vendor_add.php diff --git a/user/modals/vendor_add_from_template_modal.php b/user/modals/vendor/vendor_add_from_template.php similarity index 100% rename from user/modals/vendor_add_from_template_modal.php rename to user/modals/vendor/vendor_add_from_template.php diff --git a/user/modals/vendor_contact_add_modal.php b/user/modals/vendor/vendor_contact_add.php similarity index 100% rename from user/modals/vendor_contact_add_modal.php rename to user/modals/vendor/vendor_contact_add.php diff --git a/user/modals/vendor_contact_edit_modal.php b/user/modals/vendor/vendor_contact_edit.php similarity index 100% rename from user/modals/vendor_contact_edit_modal.php rename to user/modals/vendor/vendor_contact_edit.php diff --git a/user/ajax/ajax_vendor_details.php b/user/modals/vendor/vendor_details.php similarity index 96% rename from user/ajax/ajax_vendor_details.php rename to user/modals/vendor/vendor_details.php index cd143531..b33d7fe5 100644 --- a/user/ajax/ajax_vendor_details.php +++ b/user/modals/vendor/vendor_details.php @@ -1,6 +1,6 @@ $vendor_name"; + $vendor_display = "$vendor_name"; } else { $vendor_display = "N/A"; } diff --git a/user/vendors.php b/user/vendors.php index 0a5e6e67..8d6ab838 100644 --- a/user/vendors.php +++ b/user/vendors.php @@ -200,11 +200,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    @@ -243,11 +239,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit @@ -291,7 +283,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));