diff --git a/admin_settings_default.php b/admin_settings_default.php index fbca30d0..ac319af1 100644 --- a/admin_settings_default.php +++ b/admin_settings_default.php @@ -218,28 +218,6 @@ require_once "includes/inc_all_admin.php"; -
- -
-
- -
- -
-
-
diff --git a/database_updates.php b/database_updates.php index 76daec7e..1cc29ceb 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3419,10 +3419,15 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { 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 + if (CURRENT_DATABASE_VERSION == '2.1.1') { + mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_phone_mask`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.2'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.1.2') { + // // Insert queries here required to update to DB version 2.1.3 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.2'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.3'"); // } } else { diff --git a/db.sql b/db.sql index bca6d2c6..49b6cb53 100644 --- a/db.sql +++ b/db.sql @@ -2499,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-24 12:48:58 +-- Dump completed on 2025-03-26 11:10:26 diff --git a/post/admin/admin_settings_default.php b/post/admin/admin_settings_default.php index e50dad3e..3303aa2e 100644 --- a/post/admin/admin_settings_default.php +++ b/post/admin/admin_settings_default.php @@ -16,9 +16,8 @@ if (isset($_POST['edit_default_settings'])) { $calendar = intval($_POST['calendar']); $net_terms = intval($_POST['net_terms']); $hourly_rate = floatval($_POST['hourly_rate']); - $phone_mask = intval($_POST['phone_mask']); - mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms, config_default_hourly_rate = $hourly_rate, config_phone_mask = $phone_mask WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms, config_default_hourly_rate = $hourly_rate WHERE company_id = 1"); // Logging logAction("Settings", "Edit", "$session_name edited default settings"); diff --git a/scripts/setup_cli.php b/scripts/setup_cli.php index ed46d8f0..7e174076 100644 --- a/scripts/setup_cli.php +++ b/scripts/setup_cli.php @@ -328,7 +328,7 @@ mysqli_query($mysqli,"INSERT INTO custom_links SET custom_link_name = 'Docs', cu // Finalizing mysqli_query($mysqli,"UPDATE companies SET company_locale = '$locale', company_currency = '$currency_code' WHERE company_id = 1"); -mysqli_query($mysqli,"UPDATE settings SET config_timezone = '$timezone', config_phone_mask = 1 WHERE company_id = 1"); +mysqli_query($mysqli,"UPDATE settings SET config_timezone = '$timezone' WHERE company_id = 1"); mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', account_currency_code = '$currency_code'"); // Telemetry (optional if interactive) diff --git a/setup.php b/setup.php index 12393a13..0b46651c 100644 --- a/setup.php +++ b/setup.php @@ -344,11 +344,10 @@ if (isset($_POST['add_localization_settings'])) { $locale = sanitizeInput($_POST['locale']); $currency_code = sanitizeInput($_POST['currency_code']); $timezone = sanitizeInput($_POST['timezone']); - $phone_mask = intval($_POST['phone_mask']); mysqli_query($mysqli,"UPDATE companies SET company_locale = '$locale', company_currency = '$currency_code' WHERE company_id = 1"); - mysqli_query($mysqli,"UPDATE settings SET config_timezone = '$timezone', config_phone_mask = $phone_mask WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_timezone = '$timezone' WHERE company_id = 1"); // Create Default Cash Account mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', account_currency_code = '$currency_code'"); @@ -1058,7 +1057,7 @@ if (isset($_POST['add_telemetry'])) {
- + @@ -1146,19 +1145,6 @@ if (isset($_POST['add_telemetry'])) { -
- -
-
- -
- -
-
-