diff --git a/calendar_events.php b/calendar_events.php
index ad1a2370..73625e5b 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -25,6 +25,7 @@ require_once "calendar_event_add_modal.php";
require_once "calendar_add_modal.php";
+
//loop through IDs and create a modal for each
$sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id");
while ($row = mysqli_fetch_array($sql)) {
@@ -123,6 +124,16 @@ while ($row = mysqli_fetch_array($sql)) {
}
+ //Tickets Scheduled
+ $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id WHERE ticket_schedule IS NOT NULL");
+ while ($row = mysqli_fetch_array($sql)) {
+ $event_id = intval($row['ticket_id']);
+ $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " " . $row['ticket_subject']);
+ $event_start = json_encode($row['ticket_schedule']);
+
+ echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'red', url: 'ticket.php?ticket_id=$event_id' },";
+ }
+
//Vendors Added Created
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0");
while ($row = mysqli_fetch_array($sql)) {
diff --git a/database_updates.php b/database_updates.php
index 7d6107ca..eab18b02 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -1559,6 +1559,8 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.2'");
}
+
+
if (CURRENT_DATABASE_VERSION == '1.0.2') {
//Insert queries here required to update to DB version 1.0.3
mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_stripe_expense_vendor` INT(11) NOT NULL DEFAULT 0 AFTER `config_stripe_account`");
@@ -1575,10 +1577,12 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
// 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 == '1.0.3') {
- // // Insert queries here required to update to DB version 1.0.4
+
+ if (CURRENT_DATABASE_VERSION == '1.0.3') {
+ //Insert queries here required to update to DB version 1.0.4
+ mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_schedule` DATETIME DEFAULT NULL AFTER `ticket_billable`");
// // Then, update the database to the next sequential version
- // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.4'");
+ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.4'");
// }
} else {
diff --git a/db.sql b/db.sql
index 81e80bb1..a64c5fd4 100644
--- a/db.sql
+++ b/db.sql
@@ -1569,6 +1569,7 @@ CREATE TABLE `tickets` (
`ticket_priority` varchar(200) DEFAULT NULL,
`ticket_status` varchar(200) NOT NULL,
`ticket_billable` tinyint(1) NOT NULL DEFAULT 0,
+ `ticket_schedule` DATETIME DEFAULT NULL,
`ticket_vendor_ticket_number` varchar(255) DEFAULT NULL,
`ticket_feedback` varchar(200) DEFAULT NULL,
`ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(),
diff --git a/js/scheduled_tickets_edit_modal.js b/js/scheduled_tickets_edit_modal.js
index f934cf27..67525ad6 100644
--- a/js/scheduled_tickets_edit_modal.js
+++ b/js/scheduled_tickets_edit_modal.js
@@ -15,7 +15,7 @@ function populateScheduledTicketEditModal(client_id, ticket_id) {
const assets = response.assets;
// Populate the scheduled ticket modal fields
- document.getElementById("editHeader").innerText = " Edit Scheduled ticket: " + ticket.scheduled_ticket_subject;
+ document.getElementById("editHeader").innerText = " Edit Recurring ticket: " + ticket.scheduled_ticket_subject;
document.getElementById("editTicketId").value = ticket_id;
document.getElementById("editClientId").value = client_id;
document.getElementById("editTicketSubject").value = ticket.scheduled_ticket_subject;
diff --git a/post/ticket.php b/post/ticket.php
index efc40150..e6c96601 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -1491,4 +1491,82 @@ if(isset($_POST['set_billable_status'])) {
header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
+if (isset($_POST['edit_ticket_schedule'])) {
+
+ validateTechRole();
+
+ $ticket_id = intval($_POST['ticket_id']);
+ $schedule = sanitizeInput($_POST['scheduled_date_time']);
+ $ticket_link = "ticket.php?ticket_id=$ticket_id";
+ $full_ticket_url = "https://$config_base_url/portal/ticket.php?ticket_id=$ticket_id";
+ $ticket_link_html = "$ticket_link";
+
+ mysqli_query($mysqli,
+ "UPDATE tickets SET
+ ticket_schedule = '$schedule',
+ ticket_status = 'Scheduled'
+ WHERE ticket_id = $ticket_id"
+ );
+
+
+
+ //Send email to client and assigned user
+
+ $sql = mysqli_query($mysqli,"SELECT * FROM tickets
+ LEFT JOIN clients ON ticket_client_id = client_id
+ LEFT JOIN contacts ON ticket_contact_id = contact_id
+ LEFT JOIN users ON ticket_assigned_to = user_id
+ WHERE ticket_id = $ticket_id
+ ");
+
+ $row = mysqli_fetch_array($sql);
+
+ $client_id = intval($row['ticket_client_id']);
+ $client_name = sanitizeInput($row['client_name']);
+ $contact_name = sanitizeInput($row['contact_name']);
+ $contact_email = sanitizeInput($row['contact_email']);
+ $ticket_prefix = sanitizeInput($row['ticket_prefix']);
+ $ticket_number = intval($row['ticket_number']);
+ $ticket_subject = sanitizeInput($row['ticket_subject']);
+
+ $data = [
+ [
+ 'from' => $config_ticket_from_email,
+ 'from_name' => $config_ticket_from_name,
+ 'recipient' => $contact_email,
+ 'recipient_name' => $contact_name,
+ 'subject' => "Ticket Scheduled - [$ticket_prefix$ticket_number] - $ticket_subject",
+ 'body' => "Hello, $contact_name
Your ticket regarding $ticket_subject has been scheduled for $schedule.
--------------------------------
$ticket_link
--------------------------------
We hope the issue was resolved to your satisfaction. If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id
~
$session_company_name
Support Department
$config_ticket_from_email
$company_phone",
+ ],
+ [
+ 'from' => $config_ticket_from_email,
+ 'from_name' => $config_ticket_from_name,
+ 'recipient' => $row['user_email'],
+ 'recipient_name' => $row['user_first_name'] . ' ' . $row['user_last_name'],
+ 'subject' => "Ticket Scheduled - [$ticket_prefix$ticket_number] - $ticket_subject",
+ 'body' => "Hello, " . $row['user_first_name'] . "
The ticket regarding $ticket_subject has been scheduled for $schedule.
--------------------------------
$ticket_link
--------------------------------
We hope the issue was resolved to your satisfaction. If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.
Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id
~
$session_company_name
Support Department
$config_ticket_from_email
$company_phone",
+ ]
+ ];
+ $response = addToMailQueue($mysqli, $data);
+
+
+ //Logging
+ mysqli_query(
+ $mysqli,
+ "INSERT INTO logs SET
+ log_type = 'Ticket',
+ log_action = 'Modify',
+ log_description = '$session_name modified ticket schedule',
+ log_ip = '$session_ip',
+ log_user_agent = '$session_user_agent',
+ log_user_id = $session_user_id,
+ log_entity_id = $ticket_id"
+ );
+
+ $_SESSION['alert_message'] = "Ticket schedule updated";
+
+ header("Location: " . $_SERVER["HTTP_REFERER"]);
+
}
\ No newline at end of file
diff --git a/scheduled_ticket_add_modal.php b/scheduled_ticket_add_modal.php
index 918df9bc..199d4b0c 100644
--- a/scheduled_ticket_add_modal.php
+++ b/scheduled_ticket_add_modal.php
@@ -2,7 +2,7 @@