mirror of
https://github.com/itflow-org/itflow
synced 2026-11-22 04:17:24 +00:00
Tickets: booked work has an end - the Schedule window has How long from 15 minutes to a day and an Agent picker that gives the ticket to someone else and takes it off the old agent's calendar; New Ticket's Schedule and a recurring ticket's Book the work for take a length; the calendar draws each booking at its length and dragging its bottom edge changes it after asking; the booking email, calendar file, ticket and guest page show the end; the double-booking warning lists the agent's tickets and timed events that overlap the booking instead of anything within two hours; database 3.8.2 adds tickets.ticket_schedule_end and recurring_tickets.recurring_ticket_schedule_minutes; 26.11.9 changelog entries
This commit is contained in:
@@ -233,10 +233,11 @@ if (isset($_POST['add_ticket'])) {
|
||||
// The work booked - the same emails, note and history as the ticket's Schedule window
|
||||
$created_alert = "Ticket <strong>" . escapeHtml($config_ticket_prefix . $ticket_number) . "</strong> created";
|
||||
if ($schedule !== '') {
|
||||
$booked = ticketSetSchedule(ticketRow($ticket_id), $schedule, intval($_POST['onsite'] ?? 0) ? 1 : 0);
|
||||
$booked = ticketSetSchedule(ticketRow($ticket_id), $schedule, intval($_POST['onsite'] ?? 0) ? 1 : 0,
|
||||
date('Y-m-d H:i:s', strtotime($schedule) + ticketScheduleMinutesValue($_POST['schedule_minutes'] ?? 0) * 60));
|
||||
$created_alert .= " and scheduled for " . escapeHtml($booked['when_text']);
|
||||
if ($booked['conflicts']) {
|
||||
$created_alert .= ".<br>The same agent has other work within two hours of it: <br>" . implode(", <br>", array_map('escapeHtml', $booked['conflicts']));
|
||||
$created_alert .= ".<br>The same agent already has work at that time: <br>" . implode(", <br>", array_map('escapeHtml', $booked['conflicts']));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2000,11 +2001,31 @@ if (isset($_POST['edit_ticket_schedule'])) {
|
||||
redirect();
|
||||
}
|
||||
|
||||
$result = ticketSetSchedule($row, $schedule, intval($_POST['onsite'] ?? 0) ? 1 : 0);
|
||||
// Who does it - given to them first when it's someone new, one who can open the client's tickets - and for how long
|
||||
$schedule_tech = intval($_POST['schedule_tech'] ?? $row['ticket_assigned_to']);
|
||||
if ($schedule_tech && $schedule_tech !== intval($row['ticket_assigned_to'])) {
|
||||
if (!isset(ticketMentionAgents($row['ticket_client_id'])[$schedule_tech])) {
|
||||
flashAlert('That agent can\'t open this client\'s tickets.', 'error');
|
||||
redirect();
|
||||
}
|
||||
[$assigned_ok, $assigned_message] = ticketChangeAssignee($row['ticket_id'], $schedule_tech);
|
||||
if (!$assigned_ok) {
|
||||
flashAlert($assigned_message, 'error');
|
||||
redirect();
|
||||
}
|
||||
// The agent who had the booking has it taken off their calendar
|
||||
ticketMailScheduleAgentCancelled($row);
|
||||
$row = ticketForRequest($row['ticket_id'], 2);
|
||||
}
|
||||
$schedule_end = date('Y-m-d H:i:s', strtotime($schedule) + ticketScheduleMinutesValue($_POST['schedule_minutes'] ?? 0) * 60);
|
||||
|
||||
flashAlert("Ticket scheduled for " . escapeHtml($result['when_text']));
|
||||
$result = ticketSetSchedule($row, $schedule, intval($_POST['onsite'] ?? 0) ? 1 : 0, $schedule_end);
|
||||
|
||||
$scheduled = "Ticket scheduled for " . escapeHtml($result['when_text']) . (!empty($row['user_name']) ? " with <strong>" . escapeHtml($row['user_name']) . "</strong>" : '');
|
||||
if ($result['conflicts']) {
|
||||
flashAlert("The same agent has other work within two hours of it: <br>" . implode(", <br>", array_map('escapeHtml', $result['conflicts'])), 'warning');
|
||||
flashAlert("$scheduled.<br>The same agent already has work at that time: <br>" . implode(", <br>", array_map('escapeHtml', $result['conflicts'])), 'warning');
|
||||
} else {
|
||||
flashAlert($scheduled);
|
||||
}
|
||||
|
||||
redirect();
|
||||
|
||||
Reference in New Issue
Block a user