diff --git a/ajax/ajax_client_edit.php b/ajax/ajax_client_edit.php index 70b34235..3cfb7242 100644 --- a/ajax/ajax_client_edit.php +++ b/ajax/ajax_client_edit.php @@ -23,7 +23,7 @@ $client_archived_at = nullable_htmlentities($row['client_archived_at']); // Client Tags $client_tag_id_array = array(); -$sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); +$sql_client_tags = mysqli_query($mysqli, "SELECT tag_id FROM client_tags WHERE client_id = $client_id"); while ($row = mysqli_fetch_array($sql_client_tags)) { $client_tag_id = intval($row['tag_id']); $client_tag_id_array[] = $client_tag_id; diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php index f4ca64ce..b7841c3f 100644 --- a/ajax/ajax_contact_edit.php +++ b/ajax/ajax_contact_edit.php @@ -35,7 +35,7 @@ $contact_user_id = intval($row['contact_user_id']); // Tags $contact_tag_id_array = array(); -$sql_contact_tags = mysqli_query($mysqli, "SELECT contact_tags.tag_id FROM contact_tags LEFT JOIN tags ON contact_tags.tag_id = tags.tag_id WHERE contact_id = $contact_id ORDER BY tag_name ASC"); +$sql_contact_tags = mysqli_query($mysqli, "SELECT tag_id FROM contact_tags WHERE contact_id = $contact_id"); while ($row = mysqli_fetch_array($sql_contact_tags)) { $contact_tag_id = intval($row['tag_id']); $contact_tag_id_array[] = $contact_tag_id; diff --git a/ajax/ajax_credential_edit.php b/ajax/ajax_credential_edit.php new file mode 100644 index 00000000..7671517a --- /dev/null +++ b/ajax/ajax_credential_edit.php @@ -0,0 +1,300 @@ +Editing credential: $login_name"; + +// Generate the HTML form content using output buffering. +ob_start(); +?> +
+ + +
+ + + +
+ +
> + +
+ +
+ +
+
+ +
+ +
+
+ > +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+ + +
+
+ +Copying expense"; + +// Generate the HTML form content using output buffering. +ob_start(); +?> +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + + + + +
+ +
+
+ +
+ +
+
+ + + +
+ +
+ + +
+ +
+ +
+ + +
+
+ + + diff --git a/ajax/ajax_expense_edit.php b/ajax/ajax_expense_edit.php new file mode 100644 index 00000000..2036b2ee --- /dev/null +++ b/ajax/ajax_expense_edit.php @@ -0,0 +1,230 @@ +Editing expense"; + +// Generate the HTML form content using output buffering. +ob_start(); +?> +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ + + + + +
+ +
+
+ +
+ +
+
+ + + +
+ +
+ + +
+ + +
+ " + download=""> + + + + +
+
+ + +
+
+ + + diff --git a/ajax/ajax_expense_refund.php b/ajax/ajax_expense_refund.php new file mode 100644 index 00000000..f053d275 --- /dev/null +++ b/ajax/ajax_expense_refund.php @@ -0,0 +1,89 @@ +Refunding expense"; + +// Generate the HTML form content using output buffering. +ob_start(); +?> +
+
+ + + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+ +
+
+ + +
+
+ + + diff --git a/client_asset_details.php b/client_asset_details.php index a24679a6..103a328f 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -576,7 +576,10 @@ if (isset($_GET['asset_id'])) {
- + Edit )"> @@ -595,8 +598,6 @@ if (isset($_GET['asset_id'])) { diff --git a/client_contact_details.php b/client_contact_details.php index 8b4e8818..33ccf7ed 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -533,7 +533,10 @@ if (isset($_GET['contact_id'])) {
- + Edit )"> @@ -558,8 +561,6 @@ if (isset($_GET['contact_id'])) { diff --git a/client_logins.php b/client_logins.php index 56ff4800..f7eaa029 100644 --- a/client_logins.php +++ b/client_logins.php @@ -363,7 +363,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit
@@ -396,7 +399,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/expenses.php b/expenses.php index 0c0d8035..f4f6de40 100644 --- a/expenses.php +++ b/expenses.php @@ -323,14 +323,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit - + Copy
- + Refund
@@ -343,16 +355,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/modals/client_login_edit_modal.php b/modals/client_login_edit_modal.php deleted file mode 100644 index e7e8b991..00000000 --- a/modals/client_login_edit_modal.php +++ /dev/null @@ -1,268 +0,0 @@ - diff --git a/modals/expense_edit_modal.php b/modals/expense_edit_modal.php deleted file mode 100644 index b4bc7424..00000000 --- a/modals/expense_edit_modal.php +++ /dev/null @@ -1,208 +0,0 @@ - diff --git a/modals/expense_refund_modal.php b/modals/expense_refund_modal.php deleted file mode 100644 index 1eef11ec..00000000 --- a/modals/expense_refund_modal.php +++ /dev/null @@ -1,67 +0,0 @@ -