diff --git a/database_updates.php b/database_updates.php
index 29988cef..dd259c7f 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -1510,6 +1510,24 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
// Then, update the database to the next sequential version
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.6'");
}
+
+ if (CURRENT_DATABASE_VERSION == '0.9.6') {
+ mysqli_query($mysqli, "ALTER TABLE `scheduled_tickets` ADD `scheduled_ticket_end_date` DATE NOT NULL AFTER `scheduled_ticket_next_run`");
+
+ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.7'");
+ }
+
+ // Be sure to change database_version.php to reflect the version you are updating to here
+ // Please add this same comment block to the bottom of this file, and update the version number.
+ // Uncomment Below Lines, to add additional database updates
+ //
+ // if (CURRENT_DATABASE_VERSION == '0.9.7') {
+ // // Insert queries here required to update to DB version 0.9.8
+ //
+ // // Then, update the database to the next sequential version
+ // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.8'");
+ // }
+
} else {
// Up-to-date
}
diff --git a/database_version.php b/database_version.php
index 87bac458..36265c6e 100644
--- a/database_version.php
+++ b/database_version.php
@@ -5,5 +5,5 @@
* It is used in conjunction with database_updates.php
*/
-DEFINE("LATEST_DATABASE_VERSION", "0.9.6");
+DEFINE("LATEST_DATABASE_VERSION", "0.9.7");
diff --git a/db.sql b/db.sql
index e135890a..8048c4ef 100644
--- a/db.sql
+++ b/db.sql
@@ -1077,6 +1077,7 @@ CREATE TABLE `scheduled_tickets` (
`scheduled_ticket_frequency` varchar(10) NOT NULL,
`scheduled_ticket_start_date` date NOT NULL,
`scheduled_ticket_next_run` date NOT NULL,
+ `scheduled_ticket_end_date` date NOT NULL,
`scheduled_ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(),
`scheduled_ticket_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
`scheduled_ticket_created_by` int(11) NOT NULL DEFAULT 0,
diff --git a/js/scheduled_tickets_edit_modal.js b/js/scheduled_tickets_edit_modal.js
index f934cf27..73c05e51 100644
--- a/js/scheduled_tickets_edit_modal.js
+++ b/js/scheduled_tickets_edit_modal.js
@@ -20,6 +20,7 @@ function populateScheduledTicketEditModal(client_id, ticket_id) {
document.getElementById("editClientId").value = client_id;
document.getElementById("editTicketSubject").value = ticket.scheduled_ticket_subject;
document.getElementById("editTicketNextRun").value = ticket.scheduled_ticket_next_run;
+ document.getElementById("editTicketEndDate").value = ticket.scheduled_ticket_end_date;
tinyMCE.get('editTicketDetails').setContent(ticket.scheduled_ticket_details);
// Contact dropdown
diff --git a/post/scheduled_ticket_model.php b/post/scheduled_ticket_model.php
index d83e2165..ea35c47d 100644
--- a/post/scheduled_ticket_model.php
+++ b/post/scheduled_ticket_model.php
@@ -23,3 +23,8 @@ $contact_id = "0";
if (isset($_POST['contact'])) {
$contact_id = intval($_POST['contact']);
}
+
+$end_date = NULL;
+if (isset($_POST['end_date'])) {
+ $end_date = sanitizeInput($_POST['end_date']);
+}
\ No newline at end of file
diff --git a/post/ticket.php b/post/ticket.php
index 039ee5f1..161e0178 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -941,7 +941,7 @@ if (isset($_POST['add_scheduled_ticket'])) {
}
// Add scheduled ticket
- mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id");
+ mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_end_date = '$end_date', scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id");
$scheduled_ticket_id = mysqli_insert_id($mysqli);
@@ -971,7 +971,7 @@ if (isset($_POST['edit_scheduled_ticket'])) {
}
// Edit scheduled ticket
- mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id");
+ mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_end_date = '$end_date', scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id");
// Logging
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Scheduled Ticket', log_action = 'Modify', log_description = '$session_name modified scheduled ticket for $subject - $frequency', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $scheduled_ticket_id");
diff --git a/scheduled_ticket_add_modal.php b/scheduled_ticket_add_modal.php
index 918df9bc..e57ca950 100644
--- a/scheduled_ticket_add_modal.php
+++ b/scheduled_ticket_add_modal.php
@@ -99,6 +99,16 @@
+
+
+
+