From e943faecf0be76c514c8d764ad408c704269edb2 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 31 Dec 2022 15:54:34 -0500 Subject: [PATCH] Added Important Functionality to Contacts, Cleaned up UI elements in the contacts and users modals. Added partial User and contact Invite functionality. --- client_contact_add_modal.php | 17 +++++--- client_contact_edit_modal.php | 15 ++++--- client_contact_invite_modal.php | 51 +++++++++++++++++++++++ client_contacts.php | 12 +++++- client_logins.php | 2 +- post.php | 6 ++- user_invite_modal.php | 71 +++++++++++++++++++++++++++++++++ users.php | 11 ++++- 8 files changed, 169 insertions(+), 16 deletions(-) create mode 100644 client_contact_invite_modal.php create mode 100644 user_invite_modal.php diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php index 447d171c..dccdc4da 100644 --- a/client_contact_add_modal.php +++ b/client_contact_add_modal.php @@ -2,7 +2,7 @@
-
New Contact
+
New Contact
@@ -33,17 +33,22 @@
- +
+
+
+ > +
+
- +
@@ -51,7 +56,7 @@
- > +
@@ -169,8 +174,8 @@
- - + +
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php index 1c96f863..f7bff2aa 100644 --- a/client_contact_edit_modal.php +++ b/client_contact_edit_modal.php @@ -35,17 +35,22 @@
- +
+
+
+ > +
+
- +
@@ -53,7 +58,7 @@
- > + >
@@ -198,8 +203,8 @@
- - + +
diff --git a/client_contact_invite_modal.php b/client_contact_invite_modal.php new file mode 100644 index 00000000..6ac230cd --- /dev/null +++ b/client_contact_invite_modal.php @@ -0,0 +1,51 @@ + diff --git a/client_contacts.php b/client_contacts.php index 68877746..eeb82d08 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -38,7 +38,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));

Contacts

- +
+ + +
+ Invite Contact +
+
@@ -118,6 +126,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $contact_photo = htmlentities($row['contact_photo']); $contact_initials = initials($contact_name); $contact_notes = htmlentities($row['contact_notes']); + $contact_important = intval($row['contact_important']); $contact_created_at = $row['contact_created_at']; if($contact_id == $primary_contact){ $primary_contact_display = "Primary Contact"; @@ -215,6 +224,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); diff --git a/client_logins.php b/client_logins.php index 3c9eaf66..43416cf0 100644 --- a/client_logins.php +++ b/client_logins.php @@ -157,7 +157,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } function generatePassword(){ - document.getElementById("password").value = "" + document.getElementById("password").value = "" } diff --git a/post.php b/post.php index cb43dd71..f550f3d0 100644 --- a/post.php +++ b/post.php @@ -3807,6 +3807,7 @@ if(isset($_POST['add_contact'])){ $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email']))); $primary_contact = intval($_POST['primary_contact']); $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes']))); + $contact_important = intval($_POST['contact_important']); $location_id = intval($_POST['location']); $auth_method = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['auth_method']))); $password = password_hash(bin2hex(random_bytes(16)), PASSWORD_DEFAULT); @@ -3816,7 +3817,7 @@ if(isset($_POST['add_contact'])){ mkdir("uploads/clients/$session_company_id/$client_id"); } - mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_auth_method = '$auth_method', contact_password_hash = '$password', contact_department = '$department', contact_location_id = $location_id, contact_client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_important = $contact_important, contact_auth_method = '$auth_method', contact_password_hash = '$password', contact_department = '$department', contact_location_id = $location_id, contact_client_id = $client_id, company_id = $session_company_id"); $contact_id = mysqli_insert_id($mysqli); @@ -3891,6 +3892,7 @@ if(isset($_POST['edit_contact'])){ $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email']))); $primary_contact = intval($_POST['primary_contact']); $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes']))); + $contact_important = intval($_POST['contact_important']); $location_id = intval($_POST['location']); $auth_method = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['auth_method']))); @@ -3900,7 +3902,7 @@ if(isset($_POST['edit_contact'])){ mkdir("uploads/clients/$session_company_id/$client_id"); } - mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_auth_method = '$auth_method', contact_department = '$department', contact_location_id = $location_id WHERE contact_id = $contact_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_important = $contact_important, contact_auth_method = '$auth_method', contact_department = '$department', contact_location_id = $location_id WHERE contact_id = $contact_id AND company_id = $session_company_id"); // Update Primary contact in clients if primary contact is checked if($primary_contact > 0){ diff --git a/user_invite_modal.php b/user_invite_modal.php new file mode 100644 index 00000000..5344b906 --- /dev/null +++ b/user_invite_modal.php @@ -0,0 +1,71 @@ + \ No newline at end of file diff --git a/users.php b/users.php index d2f8462a..bc4b92d0 100644 --- a/users.php +++ b/users.php @@ -23,7 +23,15 @@

Users

- +
+ + +
+ Invite User +
+
@@ -151,6 +159,7 @@