From 16fb1467a2ccbd6f25df66f17bd47170767833d4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 8 Apr 2024 16:48:06 -0400 Subject: [PATCH] Added Project Prefix and Project Numbering System --- admin_side_nav.php | 8 ++++++++ database_updates.php | 23 +++++++++++++++++++--- database_version.php | 2 +- db.sql | 6 +++++- get_settings.php | 6 +++++- post/project.php | 11 ++++++++++- post/setting.php | 19 +++++++++++++++++++ project_details.php | 2 ++ projects.php | 4 ++++ settings_project.php | 44 +++++++++++++++++++++++++++++++++++++++++++ settings_side_nav.php | 8 ++++++++ 11 files changed, 126 insertions(+), 7 deletions(-) create mode 100644 settings_project.php diff --git a/admin_side_nav.php b/admin_side_nav.php index c9bb9039..092d1fe1 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -217,6 +217,14 @@ +
  • + " + href="settings_project.php"> + +

    Project

    +     +
    • +
  • " href="settings_ticket.php"> diff --git a/database_updates.php b/database_updates.php index 02564742..066342fb 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1850,10 +1850,27 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.4'"); } - // if (CURRENT_DATABASE_VERSION == '1.2.4') { - // // Insert queries here required to update to DB version 1.2.5 + if (CURRENT_DATABASE_VERSION == '1.2.4') { + + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_project_prefix` VARCHAR(200) NOT NULL DEFAULT 'PRJ-' AFTER `config_default_hourly_rate`"); + + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_project_next_number` INT(11) NOT NULL DEFAULT 1 AFTER `config_project_prefix`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.5'"); + } + + if (CURRENT_DATABASE_VERSION == '1.2.5') { + + mysqli_query($mysqli, "ALTER TABLE `projects` ADD `project_prefix` VARCHAR(200) DEFAULT NULL AFTER `project_id`"); + mysqli_query($mysqli, "ALTER TABLE `projects` ADD `project_number` INT(11) NOT NULL DEFAULT 1 AFTER `project_prefix`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.6'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.2.6') { + // // Insert queries here required to update to DB version 1.2.7 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.5"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.7"); // } } else { diff --git a/database_version.php b/database_version.php index c8d96e02..03840a87 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.2.4"); +DEFINE("LATEST_DATABASE_VERSION", "1.2.6"); diff --git a/db.sql b/db.sql index 29872f02..e04c503e 100644 --- a/db.sql +++ b/db.sql @@ -973,6 +973,8 @@ DROP TABLE IF EXISTS `projects`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `projects` ( `project_id` int(11) NOT NULL AUTO_INCREMENT, + `project_prefix` varchar(200) DEFAULT NULL, + `project_number` int(11) NOT NULL DEFAULT 1, `project_name` varchar(255) NOT NULL, `project_description` text DEFAULT NULL, `project_due` date DEFAULT NULL, @@ -1311,6 +1313,8 @@ CREATE TABLE `settings` ( `config_default_calendar` int(11) DEFAULT NULL, `config_default_net_terms` int(11) DEFAULT NULL, `config_default_hourly_rate` decimal(15,2) NOT NULL DEFAULT 0.00, + `config_project_prefix` varchar(200) NOT NULL DEFAULT 'PRJ-', + `config_project_next_number` int(11) NOT NULL DEFAULT 1, `config_invoice_prefix` varchar(200) DEFAULT NULL, `config_invoice_next_number` int(11) DEFAULT NULL, `config_invoice_footer` text DEFAULT NULL, @@ -1895,4 +1899,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-04-08 12:22:49 +-- Dump completed on 2024-04-08 16:47:46 diff --git a/get_settings.php b/get_settings.php index 7218ea27..0b53b9bc 100644 --- a/get_settings.php +++ b/get_settings.php @@ -47,7 +47,7 @@ $config_invoice_from_email = $row['config_invoice_from_email']; $config_invoice_late_fee_enable = intval($row['config_invoice_late_fee_enable']); $config_invoice_late_fee_percent = floatval($row['config_invoice_late_fee_percent']); -// Recurring +// Recurring Invoices $config_recurring_prefix = $row['config_recurring_prefix']; $config_recurring_next_number = intval($row['config_recurring_next_number']); @@ -58,6 +58,10 @@ $config_quote_footer = $row['config_quote_footer']; $config_quote_from_name = $row['config_quote_from_name']; $config_quote_from_email = $row['config_quote_from_email']; +// Projects +$config_project_prefix = $row['config_project_prefix']; +$config_project_next_number = intval($row['config_project_next_number']); + // Tickets $config_ticket_prefix = $row['config_ticket_prefix']; $config_ticket_next_number = intval($row['config_ticket_next_number']); diff --git a/post/project.php b/post/project.php index 054534de..1327be12 100644 --- a/post/project.php +++ b/post/project.php @@ -14,8 +14,17 @@ if (isset($_POST['add_project'])) { $project_manager = intval($_POST['project_manager']); $client_id = intval($_POST['client_id']); $project_template_id = intval($_POST['project_template_id']); + + // Sanitize Project Prefix + $config_project_prefix = sanitizeInput($config_project_prefix); + + // Get the next Project Number and add 1 for the new Project number + $project_number = $config_project_next_number; + $new_config_project_next_number = $config_project_next_number + 1; + + mysqli_query($mysqli, "UPDATE settings SET config_project_next_number = $new_config_project_next_number WHERE company_id = 1"); - mysqli_query($mysqli, "INSERT INTO projects SET project_name = '$project_name', project_description = '$project_description', project_due = '$due_date', project_manager = $project_manager, project_client_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO projects SET project_prefix = '$config_project_prefix', project_number = $project_number, project_name = '$project_name', project_description = '$project_description', project_due = '$due_date', project_manager = $project_manager, project_client_id = $client_id"); $project_id = mysqli_insert_id($mysqli); diff --git a/post/setting.php b/post/setting.php index e27da3b8..b78bcebf 100644 --- a/post/setting.php +++ b/post/setting.php @@ -260,6 +260,25 @@ if (isset($_POST['edit_quote_settings'])) { } +if (isset($_POST['edit_project_settings'])) { + + validateCSRFToken($_POST['csrf_token']); + validateAdminRole(); + + $config_project_prefix = sanitizeInput($_POST['config_project_prefix']); + $config_project_next_number = intval($_POST['config_project_next_number']); + + mysqli_query($mysqli,"UPDATE settings SET config_project_prefix = '$config_project_prefix', config_project_next_number = $config_project_next_number WHERE company_id = 1"); + + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified project settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + + $_SESSION['alert_message'] = "Project Settings updated"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if (isset($_POST['edit_ticket_settings'])) { validateAdminRole(); diff --git a/project_details.php b/project_details.php index df1a71dc..128f8274 100644 --- a/project_details.php +++ b/project_details.php @@ -24,6 +24,8 @@ if (isset($_GET['project_id'])) { $row = mysqli_fetch_array($sql_project); $project_id = intval($row['project_id']); + $project_prefix = nullable_htmlentities($row['project_prefix']); + $project_number = intval($row['project_number']); $project_name = nullable_htmlentities($row['project_name']); $project_description = nullable_htmlentities($row['project_description']); $project_due = nullable_htmlentities($row['project_due']); diff --git a/projects.php b/projects.php index 6f3c0694..50bb2812 100644 --- a/projects.php +++ b/projects.php @@ -108,6 +108,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> + @@ -126,6 +127,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); while ($row = mysqli_fetch_array($sql_projects)) { $project_id = intval($row['project_id']); + $project_prefix = nullable_htmlentities($row['project_prefix']); + $project_number = intval($row['project_number']); $project_name = nullable_htmlentities($row['project_name']); $project_description = nullable_htmlentities($row['project_description']); $project_due = nullable_htmlentities($row['project_due']); @@ -185,6 +188,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> +
    Number Project Tickets / Tasks Due
    diff --git a/settings_project.php b/settings_project.php new file mode 100644 index 00000000..9a231144 --- /dev/null +++ b/settings_project.php @@ -0,0 +1,44 @@ + + +
    +
    +

    Project Settings

    +
    +
    +
    + + +

    Project

    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + + +
    +
    +
    + + +
  • + " + href="settings_project.php"> + +

    Project

    +     +
    • +
  • " href="settings_ticket.php">