diff --git a/ajax/ajax_asset_details.php b/ajax/ajax_asset_details.php index 20ef5c29..62800d13 100644 --- a/ajax/ajax_asset_details.php +++ b/ajax/ajax_asset_details.php @@ -121,9 +121,7 @@ $sql_related_credentials = mysqli_query($mysqli, " logins.login_note, logins.login_important, logins.login_contact_id, - logins.login_vendor_id, - logins.login_asset_id, - logins.login_software_id + logins.login_asset_id FROM logins LEFT JOIN login_tags ON login_tags.login_id = logins.login_id LEFT JOIN tags ON tags.tag_id = login_tags.tag_id @@ -474,9 +472,7 @@ ob_start(); $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); - $login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); - $login_software_id = intval($row['login_software_id']); // Tags $login_tag_name_display_array = array(); diff --git a/ajax/ajax_category_add.php b/ajax/ajax_category_add.php new file mode 100644 index 00000000..0141b610 --- /dev/null +++ b/ajax/ajax_category_add.php @@ -0,0 +1,43 @@ + + +
+
New Category
+ +
+
+ + +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ + +
+
+ + +
+ +
@@ -157,6 +165,15 @@ ob_start(); +
+ +
diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index 07d9df15..85aed0d6 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -446,9 +446,7 @@ ob_start(); $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); - $login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); - $login_software_id = intval($row['login_software_id']); // Tags $login_tag_name_display_array = array(); diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php index 99ea1823..768a6081 100644 --- a/ajax/ajax_contact_edit.php +++ b/ajax/ajax_contact_edit.php @@ -311,6 +311,15 @@ ob_start(); +
+ +
diff --git a/ajax/ajax_credential_edit.php b/ajax/ajax_credential_edit.php index 8cdf0782..c6b50da8 100644 --- a/ajax/ajax_credential_edit.php +++ b/ajax/ajax_credential_edit.php @@ -242,6 +242,15 @@ ob_start(); +
+ +
diff --git a/ajax/ajax_expense_edit.php b/ajax/ajax_expense_edit.php index 5793ff39..00665cb4 100644 --- a/ajax/ajax_expense_edit.php +++ b/ajax/ajax_expense_edit.php @@ -131,7 +131,12 @@ ob_start(); ?>
- +
@@ -176,7 +181,12 @@ ob_start(); ?>
- +
diff --git a/ajax/ajax_invoice_edit.php b/ajax/ajax_invoice_edit.php index 87530848..d6a804f3 100644 --- a/ajax/ajax_invoice_edit.php +++ b/ajax/ajax_invoice_edit.php @@ -77,7 +77,12 @@ ob_start(); ?>
- +
diff --git a/ajax/ajax_location_edit.php b/ajax/ajax_location_edit.php index da39bb38..e97ba887 100644 --- a/ajax/ajax_location_edit.php +++ b/ajax/ajax_location_edit.php @@ -254,6 +254,15 @@ ob_start(); +
+ +
diff --git a/ajax/ajax_product_edit.php b/ajax/ajax_product_edit.php index f7093fae..61a74af2 100644 --- a/ajax/ajax_product_edit.php +++ b/ajax/ajax_product_edit.php @@ -59,7 +59,12 @@ ob_start(); ?>
- +
diff --git a/ajax/ajax_quote_edit.php b/ajax/ajax_quote_edit.php index a94f392f..51c7c8bd 100644 --- a/ajax/ajax_quote_edit.php +++ b/ajax/ajax_quote_edit.php @@ -73,7 +73,12 @@ ob_start();
- +
diff --git a/ajax/ajax_recurring_expense_edit.php b/ajax/ajax_recurring_expense_edit.php index 7d461ce6..3b857d01 100644 --- a/ajax/ajax_recurring_expense_edit.php +++ b/ajax/ajax_recurring_expense_edit.php @@ -214,7 +214,12 @@ ob_start(); ?>
- +
diff --git a/ajax/ajax_recurring_invoice_edit.php b/ajax/ajax_recurring_invoice_edit.php index 7d454b20..e0ab9d56 100644 --- a/ajax/ajax_recurring_invoice_edit.php +++ b/ajax/ajax_recurring_invoice_edit.php @@ -88,7 +88,12 @@ ob_start(); ?>
- +
diff --git a/ajax/ajax_revenue_edit.php b/ajax/ajax_revenue_edit.php index 11998bdd..593bb6ff 100644 --- a/ajax/ajax_revenue_edit.php +++ b/ajax/ajax_revenue_edit.php @@ -125,7 +125,12 @@ ob_start(); ?>
- +
diff --git a/ajax/ajax_tag_add.php b/ajax/ajax_tag_add.php new file mode 100644 index 00000000..30694dfb --- /dev/null +++ b/ajax/ajax_tag_add.php @@ -0,0 +1,61 @@ + + + + + + + +
+
New Tag
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ + +
+
+ + +
+ +
diff --git a/ajax/ajax_vendor_details.php b/ajax/ajax_vendor_details.php new file mode 100644 index 00000000..fe2e6025 --- /dev/null +++ b/ajax/ajax_vendor_details.php @@ -0,0 +1,43 @@ + + +
+
+ +
+
+
Description:
+ + +
+ +
+ +
-
- + +
+ +
+ +
diff --git a/contact_details.php b/contact_details.php index 02a5409e..0c1ca035 100644 --- a/contact_details.php +++ b/contact_details.php @@ -495,9 +495,7 @@ if (isset($_GET['contact_id'])) { $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); - $login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); - $login_software_id = intval($row['login_software_id']); // Tags $login_tag_name_display_array = array(); diff --git a/contacts.php b/contacts.php index 0ace4940..5c3eb349 100644 --- a/contacts.php +++ b/contacts.php @@ -117,7 +117,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+
+ +
diff --git a/credentials.php b/credentials.php index ee365fca..ae88576a 100644 --- a/credentials.php +++ b/credentials.php @@ -168,7 +168,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+
+ +
diff --git a/locations.php b/locations.php index 192f190a..858c8a5a 100644 --- a/locations.php +++ b/locations.php @@ -94,7 +94,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+
+ +
diff --git a/modals/admin_tag_add_modal.php b/modals/admin_tag_add_modal.php index 91e6dd78..6d4085be 100644 --- a/modals/admin_tag_add_modal.php +++ b/modals/admin_tag_add_modal.php @@ -1,68 +1,66 @@ @@ -120,6 +128,15 @@ +
+ +
diff --git a/modals/contact_add_modal.php b/modals/contact_add_modal.php index 4e55037a..d13be9f7 100644 --- a/modals/contact_add_modal.php +++ b/modals/contact_add_modal.php @@ -271,6 +271,15 @@ +
+ +
diff --git a/modals/credential_add_modal.php b/modals/credential_add_modal.php index 1d33905b..dc0907aa 100644 --- a/modals/credential_add_modal.php +++ b/modals/credential_add_modal.php @@ -228,6 +228,15 @@ +
+ +
diff --git a/modals/credential_bulk_assign_tags_modal.php b/modals/credential_bulk_assign_tags_modal.php index 3819db74..a9f0f516 100644 --- a/modals/credential_bulk_assign_tags_modal.php +++ b/modals/credential_bulk_assign_tags_modal.php @@ -34,6 +34,15 @@ +
+ +
diff --git a/modals/expense_add_modal.php b/modals/expense_add_modal.php index 8b5e3dbe..8b6f71a8 100644 --- a/modals/expense_add_modal.php +++ b/modals/expense_add_modal.php @@ -140,7 +140,12 @@ ?>
- +
diff --git a/modals/invoice_add_modal.php b/modals/invoice_add_modal.php index 392a8b71..9dab27fe 100644 --- a/modals/invoice_add_modal.php +++ b/modals/invoice_add_modal.php @@ -73,7 +73,12 @@ ?>
- +
diff --git a/modals/location_add_modal.php b/modals/location_add_modal.php index b9fce811..025f605d 100644 --- a/modals/location_add_modal.php +++ b/modals/location_add_modal.php @@ -232,6 +232,15 @@ +
+ +
diff --git a/modals/product_add_modal.php b/modals/product_add_modal.php index 8df44e19..5da9fed2 100644 --- a/modals/product_add_modal.php +++ b/modals/product_add_modal.php @@ -42,7 +42,12 @@ ?>
- +
diff --git a/modals/quote_add_modal.php b/modals/quote_add_modal.php index cbacc62a..df80d3a4 100644 --- a/modals/quote_add_modal.php +++ b/modals/quote_add_modal.php @@ -71,7 +71,12 @@
- +
diff --git a/modals/recurring_expense_create_modal.php b/modals/recurring_expense_create_modal.php index a6e27710..60ab6ff7 100644 --- a/modals/recurring_expense_create_modal.php +++ b/modals/recurring_expense_create_modal.php @@ -182,7 +182,12 @@ ?>
- +
diff --git a/modals/recurring_invoice_add_modal.php b/modals/recurring_invoice_add_modal.php index 54cad7ff..e194178f 100644 --- a/modals/recurring_invoice_add_modal.php +++ b/modals/recurring_invoice_add_modal.php @@ -97,7 +97,12 @@ ?>
- +
diff --git a/modals/revenue_add_modal.php b/modals/revenue_add_modal.php index 29a96a0a..9ed411a6 100644 --- a/modals/revenue_add_modal.php +++ b/modals/revenue_add_modal.php @@ -99,7 +99,12 @@ ?>
- +
diff --git a/modals/ticket_add_modal.php b/modals/ticket_add_modal.php index 7de8a529..de6e3f29 100644 --- a/modals/ticket_add_modal.php +++ b/modals/ticket_add_modal.php @@ -152,6 +152,14 @@ +
+ +
diff --git a/post/user/category.php b/post/user/category.php new file mode 100644 index 00000000..aeafd94d --- /dev/null +++ b/post/user/category.php @@ -0,0 +1,24 @@ +$name created"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} diff --git a/post/user/category_model.php b/post/user/category_model.php new file mode 100644 index 00000000..81b54a39 --- /dev/null +++ b/post/user/category_model.php @@ -0,0 +1,6 @@ +$name created"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} diff --git a/post/user/tag_model.php b/post/user/tag_model.php new file mode 100644 index 00000000..0380df8b --- /dev/null +++ b/post/user/tag_model.php @@ -0,0 +1,7 @@ + -
-
+
+
+
+ +
-
+
">