From bdf74e77baa6c66aade4dab6a9f6230a9b7b9253 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 9 Apr 2023 20:10:19 +0100 Subject: [PATCH] Convert quote edit modal to be dynamically populated --- ajax.php | 37 ++++++++++++- client_quotes.php | 4 +- js/quote_edit_modal.js | 48 +++++++++++++++++ quote.php | 8 +-- quote_edit_modal.php | 116 ++++++++++++++++++----------------------- quotes.php | 4 +- 6 files changed, 144 insertions(+), 73 deletions(-) create mode 100644 js/quote_edit_modal.js diff --git a/ajax.php b/ajax.php index 0ead3ee3..065e7110 100644 --- a/ajax.php +++ b/ajax.php @@ -120,7 +120,7 @@ if (isset($_GET['merge_ticket_get_json_details'])) { } else { //Return ticket, client and contact details for the given ticket number $response = mysqli_fetch_array($sql); - + echo json_encode($response); } } @@ -308,6 +308,41 @@ if (isset($_GET['scheduled_ticket_get_json_details'])) { } +/* + * Looks up info for a given quote ID from the database, used to dynamically populate modal fields + */ +if (isset($_GET['quote_get_json_details'])) { + $quote_id = intval($_GET['quote_id']); + + // Get quote details + $quote_sql = mysqli_query( + $mysqli, + "SELECT * FROM quotes + LEFT JOIN clients ON quote_client_id = client_id + WHERE quote_id = $quote_id LIMIT 1" + ); + + while ($row = mysqli_fetch_array($quote_sql)) { + $response['quote'][] = $row; + } + + + // Get all income-related categories for quoting + $quote_created_at = $response['quote'][0]['quote_created_at']; + $category_sql = mysqli_query( + $mysqli, + "SELECT category_id, category_name FROM categories + WHERE category_type = 'Income' AND (category_archived_at > '$quote_created_at' OR category_archived_at IS NULL) + ORDER BY category_name"); + + while ($row = mysqli_fetch_array($category_sql)) { + $response['categories'][] = $row; + } + + echo json_encode($response); + +} + /* * Dynamic TOTP for client login page * When provided with a TOTP secret, returns a 6-digit code diff --git a/client_quotes.php b/client_quotes.php index 7157c4c5..c13e13fb 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -120,7 +120,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit @@ -143,7 +143,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); = 0; i--) { + categoryDropdown.remove(i); + } + categoryDropdown[categoryDropdown.length] = new Option('- Category -', '0'); + + // Populate dropdown + categories.forEach(category => { + if (parseInt(category.category_id) == parseInt(quote.quote_category_id)) { + // Selected quote + categoryDropdown[categoryDropdown.length] = new Option(category.category_name, category.category_id, true, true); + } + else{ + categoryDropdown[categoryDropdown.length] = new Option(category.category_name, category.category_id); + } + }); + + } + ); +} diff --git a/quote.php b/quote.php index 6ea532d8..58d4f3f5 100644 --- a/quote.php +++ b/quote.php @@ -49,7 +49,7 @@ if (isset($_GET['quote_id'])) { if ($client_net_terms == 0) { $client_net_terms = $config_default_net_terms; } - + $sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); $row = mysqli_fetch_array($sql); @@ -153,7 +153,7 @@ if (isset($_GET['quote_id'])) {
- + Edit @@ -163,7 +163,7 @@ if (isset($_GET['quote_id'])) { Print - ');"> Download PDF @@ -289,7 +289,7 @@ if (isset($_GET['quote_id'])) { Remove
-
+ diff --git a/quote_edit_modal.php b/quote_edit_modal.php index d041eac0..cd0e13db 100644 --- a/quote_edit_modal.php +++ b/quote_edit_modal.php @@ -1,70 +1,58 @@ -