diff --git a/admin_settings_default.php b/admin_settings_default.php index 29151e91..c162ac1b 100644 --- a/admin_settings_default.php +++ b/admin_settings_default.php @@ -231,10 +231,10 @@ require_once "inc_all_admin.php"; $phone_mask = intval($row['config_phone_mask']); } ?> diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php index da89a315..6001704e 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -543,4 +543,10 @@ $processed_info = "Processed: $processed_count email(s), Unprocessed: $unprocess // Remove the lock file unlink($lock_file_path); + +// DEBUG +echo "\nLock File Path: $lock_file_path\n"; +echo "Processed Emails into tickets: $processed_count\n"; +echo "Unprocessed Emails: $unprocessed_count\n"; + ?> diff --git a/setup.php b/setup.php index ffefeb7d..a64a9337 100644 --- a/setup.php +++ b/setup.php @@ -246,7 +246,7 @@ if (isset($_POST['add_company_settings'])) { $latest_database_version = LATEST_DATABASE_VERSION; - mysqli_query($mysqli,"INSERT INTO settings SET company_id = 1, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_default_net_terms = 30, config_ticket_next_number = 1, config_ticket_prefix = 'TCK-', config_timezone = '$timezone'"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = 1, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_default_net_terms = 30, config_ticket_next_number = 1, config_ticket_prefix = 'TCK-'"); # Used only for the install script to grab the generated cronkey and insert into the db if (file_exists("uploads/tmp/cronkey.php")) { @@ -258,9 +258,6 @@ if (isset($_POST['add_company_settings'])) { unlink('uploads/tmp/cronkey.php'); } - // Create Default Cash Account - mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', account_currency_code = '$currency_code'"); - // Create Categories // Expense Categories Examples mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Office Supplies', category_type = 'Expense', category_color = 'blue'"); @@ -319,6 +316,27 @@ if (isset($_POST['add_company_settings'])) { $_SESSION['alert_message'] = "Company $name created!"; + header("Location: setup.php?localization"); + +} + +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"); + + // Create Default Cash Account + mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', account_currency_code = '$currency_code'"); + + + $_SESSION['alert_message'] = "Localization Info saved"; + header("Location: setup.php?telemetry"); } @@ -467,6 +485,12 @@ if (isset($_POST['add_telemetry'])) {

Company

+