diff --git a/admin_settings_company.php b/admin_settings_company.php index 68fd853e..035b62ea 100644 --- a/admin_settings_company.php +++ b/admin_settings_company.php @@ -116,7 +116,7 @@ $company_initials = nullable_htmlentities(initials($company_name));
- + diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php index 768a6081..c5988796 100644 --- a/ajax/ajax_contact_edit.php +++ b/ajax/ajax_contact_edit.php @@ -16,8 +16,10 @@ $contact_name = nullable_htmlentities($row['contact_name']); $contact_title = nullable_htmlentities($row['contact_title']); $contact_department = nullable_htmlentities($row['contact_department']); $contact_extension = nullable_htmlentities($row['contact_extension']); -$contact_phone = formatPhoneNumber($row['contact_phone']); -$contact_mobile = formatPhoneNumber($row['contact_mobile']); +$contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); +$contact_phone = nullable_htmlentities($row['contact_phone']); +$contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); +$contact_mobile = nullable_htmlentities($row['contact_mobile']); $contact_email = nullable_htmlentities($row['contact_email']); $contact_pin = nullable_htmlentities($row['contact_pin']); $contact_photo = nullable_htmlentities($row['contact_photo']); @@ -111,20 +113,20 @@ ob_start(); - +
-
+
- +
-
- +
+
@@ -134,7 +136,7 @@ ob_start();
- +
diff --git a/ajax/ajax_location_edit.php b/ajax/ajax_location_edit.php index e97ba887..5c1622bb 100644 --- a/ajax/ajax_location_edit.php +++ b/ajax/ajax_location_edit.php @@ -15,6 +15,7 @@ $location_city = nullable_htmlentities($row['location_city']); $location_state = nullable_htmlentities($row['location_state']); $location_zip = nullable_htmlentities($row['location_zip']); $location_phone = formatPhoneNumber($row['location_phone']); +$location_extension = formatPhoneNumber($row['location_extension']); $location_fax = formatPhoneNumber($row['location_fax']); $location_hours = nullable_htmlentities($row['location_hours']); $location_photo = nullable_htmlentities($row['location_photo']); @@ -198,13 +199,20 @@ ob_start(); -
- -
-
- + +
+
+
+
+
+ +
+ +
- +
+
+
@@ -214,7 +222,7 @@ ob_start();
- +
diff --git a/ajax/ajax_vendor_edit.php b/ajax/ajax_vendor_edit.php index 85385479..9f58b1de 100644 --- a/ajax/ajax_vendor_edit.php +++ b/ajax/ajax_vendor_edit.php @@ -118,20 +118,20 @@ ob_start();
- +
-
+
- +
-
- +
+
diff --git a/ajax/ajax_vendor_template_edit.php b/ajax/ajax_vendor_template_edit.php index 954bde22..f31897b1 100644 --- a/ajax/ajax_vendor_template_edit.php +++ b/ajax/ajax_vendor_template_edit.php @@ -134,7 +134,7 @@ ob_start();
- +
diff --git a/database_updates.php b/database_updates.php index cd0c8564..76daec7e 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3413,10 +3413,16 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.0'"); } - // if (CURRENT_DATABASE_VERSION == '2.1.0') { - // // Insert queries here required to update to DB version 2.1.1 + if (CURRENT_DATABASE_VERSION == '2.1.0') { + mysqli_query($mysqli, "ALTER TABLE `user_settings` ADD `user_config_signature` TEXT DEFAULT NULL AFTER `user_config_calendar_first_day`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.1'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.1.1') { + // // Insert queries here required to update to DB version 2.1.2 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.1'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.2'"); // } } else { diff --git a/db.sql b/db.sql index 8d29576e..bca6d2c6 100644 --- a/db.sql +++ b/db.sql @@ -2371,6 +2371,7 @@ CREATE TABLE `user_settings` ( `user_config_dashboard_financial_enable` tinyint(1) NOT NULL DEFAULT 0, `user_config_dashboard_technical_enable` tinyint(1) NOT NULL DEFAULT 0, `user_config_calendar_first_day` tinyint(1) NOT NULL DEFAULT 0, + `user_config_signature` text DEFAULT NULL, PRIMARY KEY (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2498,4 +2499,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-03-21 12:46:56 +-- Dump completed on 2025-03-24 12:48:58 diff --git a/includes/database_version.php b/includes/database_version.php index 4257e3fb..8299f347 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.1.0"); +DEFINE("LATEST_DATABASE_VERSION", "2.1.1"); diff --git a/js/app.js b/js/app.js index 7ad81a74..6d23186c 100644 --- a/js/app.js +++ b/js/app.js @@ -451,6 +451,9 @@ $(document).ready(function() { window.intlTelInput(input, { initialCountry: "us", strictMode: true, + showFlags: false, + separateDialCode: true, + nationalMode: false, loadUtils: () => import("../plugins/intl-tel-input/js/utils.js") // for formatting/placeholders etc }); }); diff --git a/modals/client_add_modal.php b/modals/client_add_modal.php index db45d362..2d7001f9 100644 --- a/modals/client_add_modal.php +++ b/modals/client_add_modal.php @@ -116,7 +116,7 @@
-
- +
@@ -215,7 +215,7 @@
- +
@@ -251,7 +251,7 @@
- +
@@ -261,13 +261,12 @@ -
- +
diff --git a/modals/contact_add_modal.php b/modals/contact_add_modal.php index 6ce2b8cf..e8ea5b3c 100644 --- a/modals/contact_add_modal.php +++ b/modals/contact_add_modal.php @@ -93,20 +93,20 @@ - +
-
+
- +
-
- +
+
@@ -116,7 +116,7 @@
- +
diff --git a/modals/location_add_modal.php b/modals/location_add_modal.php index fa770c52..8aff7a8d 100644 --- a/modals/location_add_modal.php +++ b/modals/location_add_modal.php @@ -176,13 +176,20 @@ -
- -
-
- + +
+
+
+
+
+ +
+ +
- +
+
+
diff --git a/modals/vendor_add_modal.php b/modals/vendor_add_modal.php index 7676c91a..cae5d2ed 100644 --- a/modals/vendor_add_modal.php +++ b/modals/vendor_add_modal.php @@ -75,20 +75,20 @@
- +
-
+
- +
-
- +
+
diff --git a/post/user/contact_model.php b/post/user/contact_model.php index 40bcb127..9228f224 100644 --- a/post/user/contact_model.php +++ b/post/user/contact_model.php @@ -5,7 +5,7 @@ $client_id = intval($_POST['client_id']); $name = sanitizeInput($_POST['name']); $title = sanitizeInput($_POST['title']); $department = sanitizeInput($_POST['department']); -$phone = preg_replace("/[^0-9]/", '', $_POST['phone']); +$phone = sanitizeInput($_POST['phone']); $extension = preg_replace("/[^0-9]/", '', $_POST['extension']); $mobile = preg_replace("/[^0-9]/", '', $_POST['mobile']); $email = sanitizeInput($_POST['email']); diff --git a/post/user/location.php b/post/user/location.php index a30958ec..b4d150bc 100644 --- a/post/user/location.php +++ b/post/user/location.php @@ -17,7 +17,7 @@ if(isset($_POST['add_location'])){ mkdir("uploads/clients/$client_id"); } - mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_description = '$description', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_fax = '$fax', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact, location_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_description = '$description', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_phone_extension = '$extension', location_fax = '$fax', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact, location_client_id = $client_id"); $location_id = mysqli_insert_id($mysqli); @@ -79,7 +79,7 @@ if(isset($_POST['edit_location'])){ mkdir("uploads/clients/$client_id"); } - mysqli_query($mysqli,"UPDATE locations SET location_name = '$name', location_description = '$description', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_fax = '$fax', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact WHERE location_id = $location_id"); + mysqli_query($mysqli,"UPDATE locations SET location_name = '$name', location_description = '$description', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_phone_extension = '$extension', location_fax = '$fax', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact WHERE location_id = $location_id"); // Update Primay location in clients if primary location is checked if ($location_primary == 1) { diff --git a/post/user/location_model.php b/post/user/location_model.php index 35788818..6b33250c 100644 --- a/post/user/location_model.php +++ b/post/user/location_model.php @@ -10,6 +10,7 @@ $city = sanitizeInput($_POST['city']); $state = sanitizeInput($_POST['state']); $zip = sanitizeInput($_POST['zip']); $phone = preg_replace("/[^0-9]/", '',$_POST['phone']); +$extension = preg_replace("/[^0-9]/", '',$_POST['extension']); $fax = preg_replace("/[^0-9]/", '',$_POST['fax']); $hours = sanitizeInput($_POST['hours']); $notes = sanitizeInput($_POST['notes']); diff --git a/post/user/profile.php b/post/user/profile.php index 94138779..0d15b64d 100644 --- a/post/user/profile.php +++ b/post/user/profile.php @@ -13,6 +13,7 @@ if (isset($_POST['edit_your_user_details'])) { $name = sanitizeInput($_POST['name']); $email = sanitizeInput($_POST['email']); + $signature = sanitizeInput($_POST['signature']); $sql = mysqli_query($mysqli,"SELECT user_avatar FROM users WHERE user_id = $session_user_id"); $row = mysqli_fetch_array($sql); @@ -75,6 +76,8 @@ if (isset($_POST['edit_your_user_details'])) { mysqli_query($mysqli,"UPDATE users SET user_name = '$name', user_email = '$email' WHERE user_id = $session_user_id"); + mysqli_query($mysqli,"UPDATE user_settings SET user_config_signature = '$signature' WHERE user_id = $session_user_id"); + //Logging logAction("User Account", "Edit", "$session_name edited their account $extended_log_description"); diff --git a/ticket.php b/ticket.php index 73331cec..0979c706 100644 --- a/ticket.php +++ b/ticket.php @@ -663,7 +663,11 @@ if (isset($_GET['ticket_id'])) {
- +
diff --git a/user_details.php b/user_details.php index 5483da47..2108d1c1 100644 --- a/user_details.php +++ b/user_details.php @@ -55,6 +55,16 @@ require_once "includes/inc_all_user.php";
+ +
+ +
+
+ +
+ +
+