mirror of
https://github.com/itflow-org/itflow
synced 2026-03-27 07:45:37 +00:00
Merge pull request #954 from ssteeltm/phone-mask-option
Phone mask option
This commit is contained in:
@@ -1880,10 +1880,16 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
|
|||||||
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.8'");
|
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.8'");
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (CURRENT_DATABASE_VERSION == '1.2.8') {
|
if (CURRENT_DATABASE_VERSION == '1.2.8') {
|
||||||
// // Insert queries here required to update to DB version 1.2.9
|
|
||||||
|
mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_phone_mask` TINYINT(1) NOT NULL DEFAULT 1 AFTER `config_destructive_deletes_enable`");
|
||||||
|
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.9'");
|
||||||
|
}
|
||||||
|
|
||||||
|
// if (CURRENT_DATABASE_VERSION == '1.2.9') {
|
||||||
|
// // Insert queries here required to update to DB version 1.2.10
|
||||||
// // Then, update the database to the next sequential version
|
// // Then, update the database to the next sequential version
|
||||||
// mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.9");
|
// mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.10");
|
||||||
// }
|
// }
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -5,4 +5,4 @@
|
|||||||
* It is used in conjunction with database_updates.php
|
* It is used in conjunction with database_updates.php
|
||||||
*/
|
*/
|
||||||
|
|
||||||
DEFINE("LATEST_DATABASE_VERSION", "1.2.8");
|
DEFINE("LATEST_DATABASE_VERSION", "1.2.9");
|
||||||
|
|||||||
1
db.sql
1
db.sql
@@ -1375,6 +1375,7 @@ CREATE TABLE `settings` (
|
|||||||
`config_telemetry` tinyint(1) DEFAULT 0,
|
`config_telemetry` tinyint(1) DEFAULT 0,
|
||||||
`config_timezone` varchar(200) NOT NULL DEFAULT 'America/New_York',
|
`config_timezone` varchar(200) NOT NULL DEFAULT 'America/New_York',
|
||||||
`config_destructive_deletes_enable` tinyint(1) NOT NULL DEFAULT 0,
|
`config_destructive_deletes_enable` tinyint(1) NOT NULL DEFAULT 0,
|
||||||
|
`config_phone_number` tinyint(1) NOT NULL DEFAULT 1,
|
||||||
PRIMARY KEY (`company_id`)
|
PRIMARY KEY (`company_id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
|
||||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||||
|
|||||||
@@ -212,6 +212,16 @@ function truncate($text, $chars)
|
|||||||
|
|
||||||
function formatPhoneNumber($phoneNumber)
|
function formatPhoneNumber($phoneNumber)
|
||||||
{
|
{
|
||||||
|
global $mysqli;
|
||||||
|
|
||||||
|
// Get Phone Mask Option
|
||||||
|
$phone_mask = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_phone_mask FROM settings WHERE company_id = 1"))[0];
|
||||||
|
|
||||||
|
if ($phone_mask == 0) {
|
||||||
|
return $phoneNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$phoneNumber = $phoneNumber ? preg_replace('/[^0-9]/', '', $phoneNumber) : "";
|
$phoneNumber = $phoneNumber ? preg_replace('/[^0-9]/', '', $phoneNumber) : "";
|
||||||
|
|
||||||
if (strlen($phoneNumber) > 10) {
|
if (strlen($phoneNumber) > 10) {
|
||||||
|
|||||||
@@ -316,8 +316,9 @@ if (isset($_POST['edit_default_settings'])) {
|
|||||||
$calendar = intval($_POST['calendar']);
|
$calendar = intval($_POST['calendar']);
|
||||||
$net_terms = intval($_POST['net_terms']);
|
$net_terms = intval($_POST['net_terms']);
|
||||||
$hourly_rate = floatval($_POST['hourly_rate']);
|
$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 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, config_phone_mask = $phone_mask WHERE company_id = 1");
|
||||||
|
|
||||||
//Logging
|
//Logging
|
||||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified default settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
|
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified default settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
|
||||||
|
|||||||
@@ -218,6 +218,28 @@ require_once "inc_all_admin.php";
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Phone Mask</label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<span class="input-group-text"><i class="fa fa-phone"></i></span>
|
||||||
|
</div>
|
||||||
|
<select class="form-control select2" name="phone_mask">
|
||||||
|
<?php
|
||||||
|
$sql = mysqli_query($mysqli, "SELECT config_phone_mask FROM settings WHERE company_id = 1");
|
||||||
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
|
$phone_mask = intval($row['config_phone_mask']);
|
||||||
|
} ?>
|
||||||
|
<option <?php if ($phone_mask == 1) {
|
||||||
|
echo "selected";
|
||||||
|
}?> value=1>Enable</option>
|
||||||
|
<option <?php if ($phone_mask == 0) {
|
||||||
|
echo "selected";
|
||||||
|
}?> value=0>Disabled</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
|
<button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
|
||||||
@@ -228,4 +250,3 @@ require_once "inc_all_admin.php";
|
|||||||
|
|
||||||
<?php
|
<?php
|
||||||
require_once "footer.php";
|
require_once "footer.php";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user