diff --git a/ajax.php b/ajax.php index e8d81564..35bc752b 100644 --- a/ajax.php +++ b/ajax.php @@ -429,44 +429,6 @@ if (isset($_GET['recurring_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'])) { - enforceUserPermission('module_sales'); - - $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); - -} - /* * Returns sorted list of active clients */ diff --git a/ajax/ajax_project_edit.php b/ajax/ajax_project_edit.php new file mode 100644 index 00000000..71bf976a --- /dev/null +++ b/ajax/ajax_project_edit.php @@ -0,0 +1,102 @@ + + +
+
+ Editing Project: +
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+
+ + +
+
+ + + +
+
Editing quote: -
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ + +
+
+ + + +
+
Editing recurring expense
+ +
+
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ + + + + +
+ +
+
+ +
+ +
+
+ + + +
+ +
+
+ + +
+
+ + + +
+
Editing Transfer
+ +
+
+ + + + +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
- + Edit @@ -203,6 +207,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ">
- + + + + + + diff --git a/includes/ajax_footer.php b/includes/ajax_footer.php index 0f5b44ba..4bbe5766 100644 --- a/includes/ajax_footer.php +++ b/includes/ajax_footer.php @@ -5,5 +5,5 @@ $content = ob_get_clean(); // Return the title and content as a JSON response - echo json_encode(['title' => $title, 'content' => $content]); + echo json_encode(['content' => $content]); ?> \ No newline at end of file diff --git a/js/quote_edit_modal.js b/js/quote_edit_modal.js deleted file mode 100644 index 4c4898fd..00000000 --- a/js/quote_edit_modal.js +++ /dev/null @@ -1,49 +0,0 @@ -function populateQuoteEditModal(quote_id) { - - // Send a GET request to ajax.php as ajax.php?quote_get_json_details=true"e_id=NUM - jQuery.get( - "ajax.php", - {quote_get_json_details: 'true', quote_id: quote_id}, - function(data) { - - // If we get a response from ajax.php, parse it as JSON - const response = JSON.parse(data); - - // Access the quote info (one) and categories (multiple) - const quote = response.quote[0]; - const categories = response.categories; - - // Populate the quote modal fields - document.getElementById("editQuoteHeaderID").innerText = quote.quote_prefix + quote.quote_number; - document.getElementById("editQuoteHeaderClient").innerText = quote.client_name; - document.getElementById("editQuoteID").value = quote.quote_id; - document.getElementById("editQuoteDate").value = quote.quote_date; - document.getElementById("editQuoteExpire").value = quote.quote_expire; - document.getElementById("editQuoteScope").value = quote.quote_scope; - - /* DROPDOWNS */ - - // Category dropdown - var categoryDropdown = document.getElementById("editQuoteCategory"); - - // Clear Category dropdown - var i, L = categoryDropdown.options.length -1; - for (i = L; i >= 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/modals/project_edit_modal.php b/modals/project_edit_modal.php deleted file mode 100644 index 8c457d4d..00000000 --- a/modals/project_edit_modal.php +++ /dev/null @@ -1,77 +0,0 @@ - diff --git a/modals/quote_edit_modal.php b/modals/quote_edit_modal.php deleted file mode 100644 index f639f2e9..00000000 --- a/modals/quote_edit_modal.php +++ /dev/null @@ -1,79 +0,0 @@ - - diff --git a/modals/recurring_expense_edit_modal.php b/modals/recurring_expense_edit_modal.php deleted file mode 100644 index 3e8693b7..00000000 --- a/modals/recurring_expense_edit_modal.php +++ /dev/null @@ -1,234 +0,0 @@ - diff --git a/modals/transfer_edit_modal.php b/modals/transfer_edit_modal.php deleted file mode 100644 index a1988605..00000000 --- a/modals/transfer_edit_modal.php +++ /dev/null @@ -1,166 +0,0 @@ - diff --git a/project_details.php b/project_details.php index fd2591d8..f3339171 100644 --- a/project_details.php +++ b/project_details.php @@ -197,7 +197,11 @@ if (isset($_GET['project_id'])) {
- + Edit @@ -406,7 +410,6 @@ if (isset($_GET['project_id'])) {
- + Edit @@ -295,8 +299,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/quote.php b/quote.php index 816ea672..0fe9585b 100644 --- a/quote.php +++ b/quote.php @@ -175,7 +175,11 @@ if (isset($_GET['quote_id'])) {
- + Edit = 2) { ?> @@ -532,12 +536,8 @@ if (isset($_GET['quote_id'])) {
- + Edit = 2) { ?> @@ -228,7 +232,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require "modals/quote_copy_modal.php"; - } ?> @@ -244,8 +247,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + + + + @@ -197,7 +206,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit
@@ -211,9 +225,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/transfers.php b/transfers.php index 5566ed1f..1046b4d1 100644 --- a/transfers.php +++ b/transfers.php @@ -227,7 +227,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - + + + + + @@ -239,7 +247,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit
@@ -253,9 +265,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));