mirror of
https://github.com/itflow-org/itflow
synced 2026-03-18 11:44:51 +00:00
Merge pull request #709 from wrongecho/new-ticket-notifications
Add notify by email function when a new ticket is created
This commit is contained in:
@@ -70,7 +70,7 @@ $allowed_extensions = array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', '
|
|||||||
function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date, $subject, $message, $attachments) {
|
function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date, $subject, $message, $attachments) {
|
||||||
|
|
||||||
// Access global variables
|
// Access global variables
|
||||||
global $mysqli, $company_name, $company_phone, $config_ticket_prefix, $config_ticket_client_general_notifications, $config_base_url, $config_ticket_from_name, $config_ticket_from_email, $config_smtp_host, $config_smtp_port, $config_smtp_encryption, $config_smtp_username, $config_smtp_password, $allowed_extensions;
|
global $mysqli, $company_name, $company_phone, $config_ticket_prefix, $config_ticket_client_general_notifications, $config_ticket_new_ticket_notification_email, $config_base_url, $config_ticket_from_name, $config_ticket_from_email, $config_smtp_host, $config_smtp_port, $config_smtp_encryption, $config_smtp_username, $config_smtp_password, $allowed_extensions;
|
||||||
|
|
||||||
// Get the next Ticket Number and add 1 for the new ticket number
|
// Get the next Ticket Number and add 1 for the new ticket number
|
||||||
$ticket_number_sql = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_next_number FROM settings WHERE company_id = 1"));
|
$ticket_number_sql = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_next_number FROM settings WHERE company_id = 1"));
|
||||||
@@ -151,6 +151,21 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Notify agent DL of the new ticket, if populated with a valid email
|
||||||
|
if ($config_ticket_new_ticket_notification_email) {
|
||||||
|
|
||||||
|
// Get client info
|
||||||
|
$client_sql = mysqli_query($mysqli, "SELECT client_name FROM clients WHERE client_id = $client_id");
|
||||||
|
$client_row = mysqli_fetch_array($client_sql);
|
||||||
|
$client_name = sanitizeInput($client_row['client_name']);
|
||||||
|
|
||||||
|
$details = removeEmoji($message);
|
||||||
|
$email_subject = "ITFlow - New Ticket - $client_name: $subject";
|
||||||
|
$email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: Low (email parsed)<br>Link: https://$config_base_url/ticket.php?ticket_id=$id <br><br><b>$subject</b><br>$details";
|
||||||
|
|
||||||
|
mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$config_ticket_new_ticket_notification_email', email_recipient_name = 'ITFlow Agents', email_from = '$config_ticket_from_email', email_from_name = '$config_ticket_from_name', email_subject = '$email_subject', email_content = '$email_body'");
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1283,12 +1283,20 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
|
|||||||
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.6'");
|
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.6'");
|
||||||
}
|
}
|
||||||
|
|
||||||
//if (CURRENT_DATABASE_VERSION == '0.7.6') {
|
if (CURRENT_DATABASE_VERSION == '0.7.6') {
|
||||||
//Insert queries here required to update to DB version 0.7.7
|
//Insert queries here required to update to DB version 0.7.7
|
||||||
|
mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_new_ticket_notification_email` VARCHAR(200) DEFAULT NULL AFTER `config_ticket_autoclose_hours`");
|
||||||
|
|
||||||
// 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` = '0.7.7'");
|
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.7'");
|
||||||
//}
|
}
|
||||||
|
|
||||||
|
//if (CURRENT_DATABASE_VERSION == '0.7.7') {
|
||||||
|
//Insert queries here required to update to DB version 0.7.8
|
||||||
|
|
||||||
|
// Then, update the database to the next sequential version
|
||||||
|
//mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.8'");
|
||||||
|
//}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Up-to-date
|
// Up-to-date
|
||||||
|
|||||||
@@ -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", "0.7.6");
|
DEFINE("LATEST_DATABASE_VERSION", "0.7.7");
|
||||||
|
|||||||
1
db.sql
1
db.sql
@@ -1207,6 +1207,7 @@ CREATE TABLE `settings` (
|
|||||||
`config_ticket_client_general_notifications` tinyint(1) NOT NULL DEFAULT 1,
|
`config_ticket_client_general_notifications` tinyint(1) NOT NULL DEFAULT 1,
|
||||||
`config_ticket_autoclose` tinyint(1) NOT NULL DEFAULT 0,
|
`config_ticket_autoclose` tinyint(1) NOT NULL DEFAULT 0,
|
||||||
`config_ticket_autoclose_hours` int(5) NOT NULL DEFAULT 72,
|
`config_ticket_autoclose_hours` int(5) NOT NULL DEFAULT 72,
|
||||||
|
`config_ticket_new_ticket_notification_email` varchar(200) DEFAULT NULL,
|
||||||
`config_enable_cron` tinyint(1) NOT NULL DEFAULT 0,
|
`config_enable_cron` tinyint(1) NOT NULL DEFAULT 0,
|
||||||
`config_cron_key` varchar(255) DEFAULT NULL,
|
`config_cron_key` varchar(255) DEFAULT NULL,
|
||||||
`config_recurring_auto_send_invoice` tinyint(1) NOT NULL DEFAULT 1,
|
`config_recurring_auto_send_invoice` tinyint(1) NOT NULL DEFAULT 1,
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -66,6 +66,7 @@ $config_ticket_email_parse = intval($row['config_ticket_email_parse']);
|
|||||||
$config_ticket_client_general_notifications = intval($row['config_ticket_client_general_notifications']);
|
$config_ticket_client_general_notifications = intval($row['config_ticket_client_general_notifications']);
|
||||||
$config_ticket_autoclose = intval($row['config_ticket_autoclose']);
|
$config_ticket_autoclose = intval($row['config_ticket_autoclose']);
|
||||||
$config_ticket_autoclose_hours = intval($row['config_ticket_autoclose_hours']);
|
$config_ticket_autoclose_hours = intval($row['config_ticket_autoclose_hours']);
|
||||||
|
$config_ticket_new_ticket_notification_email = $row['config_ticket_new_ticket_notification_email'];
|
||||||
|
|
||||||
// Cron
|
// Cron
|
||||||
$config_enable_cron = intval($row['config_enable_cron']);
|
$config_enable_cron = intval($row['config_enable_cron']);
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ $session_contact_initials = initials($session_contact_name);
|
|||||||
$session_contact_title = sanitizeInput($contact['contact_title']);
|
$session_contact_title = sanitizeInput($contact['contact_title']);
|
||||||
$session_contact_email = sanitizeInput($contact['contact_email']);
|
$session_contact_email = sanitizeInput($contact['contact_email']);
|
||||||
$session_contact_photo = sanitizeInput($contact['contact_photo']);
|
$session_contact_photo = sanitizeInput($contact['contact_photo']);
|
||||||
$session_contact_primary = intval($client['contact_primary']);
|
$session_contact_primary = intval($contact['contact_primary']);
|
||||||
|
|
||||||
$session_contact_is_technical_contact = false;
|
$session_contact_is_technical_contact = false;
|
||||||
$session_contact_is_billing_contact = false;
|
$session_contact_is_billing_contact = false;
|
||||||
|
|||||||
@@ -14,6 +14,12 @@ if (isset($_POST['add_ticket'])) {
|
|||||||
$config_ticket_prefix = sanitizeInput($row['config_ticket_prefix']);
|
$config_ticket_prefix = sanitizeInput($row['config_ticket_prefix']);
|
||||||
$config_ticket_next_number = intval($row['config_ticket_next_number']);
|
$config_ticket_next_number = intval($row['config_ticket_next_number']);
|
||||||
|
|
||||||
|
// Get email settings
|
||||||
|
$config_ticket_from_name = $row['config_ticket_from_name'];
|
||||||
|
$config_ticket_from_email = $row['config_ticket_from_email'];
|
||||||
|
$config_ticket_new_ticket_notification_email = filter_var($row['config_ticket_new_ticket_notification_email'], FILTER_VALIDATE_EMAIL);
|
||||||
|
|
||||||
|
|
||||||
$client_id = intval($session_client_id);
|
$client_id = intval($session_client_id);
|
||||||
$contact = intval($session_contact_id);
|
$contact = intval($session_contact_id);
|
||||||
$subject = sanitizeInput($_POST['subject']);
|
$subject = sanitizeInput($_POST['subject']);
|
||||||
@@ -34,6 +40,18 @@ if (isset($_POST['add_ticket'])) {
|
|||||||
mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_by = 0, ticket_contact_id = $contact, ticket_client_id = $client_id");
|
mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_by = 0, ticket_contact_id = $contact, ticket_client_id = $client_id");
|
||||||
$id = mysqli_insert_id($mysqli);
|
$id = mysqli_insert_id($mysqli);
|
||||||
|
|
||||||
|
// Notify agent DL of the new ticket, if populated with a valid email
|
||||||
|
if ($config_ticket_new_ticket_notification_email) {
|
||||||
|
|
||||||
|
$client_name = sanitizeInput($session_client_name);
|
||||||
|
$details = removeEmoji($details);
|
||||||
|
|
||||||
|
$email_subject = "ITFlow - New Ticket - $client_name: $subject";
|
||||||
|
$email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: $priority<br>Link: https://$config_base_url/ticket.php?ticket_id=$id <br><br><b>$subject</b><br>$details";
|
||||||
|
|
||||||
|
mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$config_ticket_new_ticket_notification_email', email_recipient_name = 'ITFlow Agents', email_from = '$config_ticket_from_email', email_from_name = '$config_ticket_from_name', email_subject = '$email_subject', email_content = '$email_body'");
|
||||||
|
}
|
||||||
|
|
||||||
// Logging
|
// Logging
|
||||||
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'Client contact $session_contact_name created ticket $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id");
|
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'Client contact $session_contact_name created ticket $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id");
|
||||||
|
|
||||||
|
|||||||
@@ -223,8 +223,9 @@ if (isset($_POST['edit_ticket_settings'])) {
|
|||||||
$config_ticket_client_general_notifications = intval($_POST['config_ticket_client_general_notifications']);
|
$config_ticket_client_general_notifications = intval($_POST['config_ticket_client_general_notifications']);
|
||||||
$config_ticket_autoclose = intval($_POST['config_ticket_autoclose']);
|
$config_ticket_autoclose = intval($_POST['config_ticket_autoclose']);
|
||||||
$config_ticket_autoclose_hours = intval($_POST['config_ticket_autoclose_hours']);
|
$config_ticket_autoclose_hours = intval($_POST['config_ticket_autoclose_hours']);
|
||||||
|
$config_ticket_new_ticket_notification_email = sanitizeInput($_POST['config_ticket_new_ticket_notification_email']);
|
||||||
|
|
||||||
mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_from_email = '$config_ticket_from_email', config_ticket_from_name = '$config_ticket_from_name', config_ticket_email_parse = '$config_ticket_email_parse', config_ticket_client_general_notifications = $config_ticket_client_general_notifications , config_ticket_autoclose = $config_ticket_autoclose, config_ticket_autoclose_hours = $config_ticket_autoclose_hours WHERE company_id = 1");
|
mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_from_email = '$config_ticket_from_email', config_ticket_from_name = '$config_ticket_from_name', config_ticket_email_parse = '$config_ticket_email_parse', config_ticket_client_general_notifications = $config_ticket_client_general_notifications , config_ticket_autoclose = $config_ticket_autoclose, config_ticket_autoclose_hours = $config_ticket_autoclose_hours, config_ticket_new_ticket_notification_email = '$config_ticket_new_ticket_notification_email' WHERE company_id = 1");
|
||||||
|
|
||||||
//Logging
|
//Logging
|
||||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified ticket 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 ticket settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
|
||||||
|
|||||||
@@ -79,6 +79,16 @@ require_once("inc_all_settings.php"); ?>
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Email address to notify when new tickets are raised <small class="text-secondary">(Ideally a distribution list/shared mailbox)</small></label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<span class="input-group-text"><i class="fa fa-fw fa-bell"></i></span>
|
||||||
|
</div>
|
||||||
|
<input type="email" class="form-control" name="config_ticket_new_ticket_notification_email" placeholder="Address to notify for new tickets, leave bank for none" value="<?php echo nullable_htmlentities($config_ticket_new_ticket_notification_email); ?>">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<button type="submit" name="edit_ticket_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
|
<button type="submit" name="edit_ticket_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user