From cb7965a84f01002433ddecd01eafbdaa8a776060 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 17 Jan 2025 15:26:40 -0500 Subject: [PATCH] Stripe Var Passthru attempt --- client_asset_details.php | 51 ++++++++++++-------- js/autopay_setup_stripe.js | 2 + modals/client_asset_interface_add_modal.php | 26 +++++++++- modals/client_asset_interface_edit_modal.php | 28 ++++++++++- post/user/asset.php | 7 ++- post/user/asset_interface_model.php | 1 + 6 files changed, 91 insertions(+), 24 deletions(-) diff --git a/client_asset_details.php b/client_asset_details.php index 22a60760..010ff1b2 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -95,13 +95,31 @@ if (isset($_GET['asset_id'])) { $document_count = mysqli_num_rows($sql_related_documents); // Network Interfaces - $sql_related_interfaces = mysqli_query($mysqli, "SELECT * FROM asset_interfaces - LEFT JOIN assets ON asset_id = interface_asset_id - LEFT JOIN networks ON network_id = interface_network_id - WHERE asset_id = $asset_id - AND interface_archived_at IS NULL - ORDER BY interface_name ASC" - ); + $sql_related_interfaces = mysqli_query($mysqli, " + SELECT + ai.interface_id, + ai.interface_name, + ai.interface_mac, + ai.interface_ip, + ai.interface_ipv6, + ai.interface_port, + ai.interface_primary, + ai.interface_notes, + ai.interface_connected_asset_interface, + n.network_name, + n.network_id, + connected_assets.asset_name AS connected_asset_name, + connected_interfaces.interface_name AS connected_interface_name, + connected_interfaces.interface_port AS connected_interface_port + FROM asset_interfaces ai + LEFT JOIN assets a ON a.asset_id = ai.interface_asset_id + LEFT JOIN networks n ON n.network_id = ai.interface_network_id + LEFT JOIN asset_interfaces connected_interfaces ON connected_interfaces.interface_id = ai.interface_connected_asset_interface + LEFT JOIN assets connected_assets ON connected_assets.asset_id = connected_interfaces.interface_asset_id + WHERE ai.interface_asset_id = $asset_id + AND ai.interface_archived_at IS NULL + ORDER BY ai.interface_name ASC + "); $interface_count = mysqli_num_rows($sql_related_interfaces); // Related Files @@ -320,7 +338,7 @@ if (isset($_GET['asset_id'])) {
-

Network Interfaces

+

Network Interfaces

@@ -368,13 +386,14 @@ if (isset($_GET['asset_id'])) { $network_id = intval($row['network_id']); $network_name = nullable_htmlentities($row['network_name']); if ($network_name) { - $network_name_display = "$network_name"; + $network_name_display = "$network_name $network_id"; } else { $network_name_display = "-"; } $interface_notes = nullable_htmlentities($row['interface_notes']); - - + $connected_asset_interface = intval($row['interface_connected_asset_interface']); + $connected_asset_name = nullable_htmlentities($row['connected_asset_name']); + $connected_asset_port = nullable_htmlentities($row['connected_interface_port']); ?> @@ -387,7 +406,7 @@ if (isset($_GET['asset_id'])) { - - + $connected_asset_name - $connected_asset_port"; ?>