From 3f90d2b0d09df9b35ba833bf72557d6a7a8d45fa Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 18 Oct 2026 00:01:43 -0400 Subject: [PATCH] Ticket templates stage 1: templates now set up the whole ticket - category, priority, billable, agent, due time and tags (migration 3.1.9 adds them, the ticket_template_tags table and tickets.ticket_template_id) - and fill [Client], [Contact], [Asset], [Site], [Agent], [Project], [Ticket], [Date], [Month], [Quarter] and [Year] in the subject, details and tasks when a ticket is raised, leaving other bracketed text for whoever picks it up; tickets remember the template they came from and each template shows how many tickets it raised, how many are open and when it was last used; the template picker fills New Ticket, the New Tickets windows on the assets and clients lists and recurring tickets, and project templates use each template's setup and agent; Admin > Ticket Templates rebuilt with search, Current/Archived, Copy, Archive/Restore and New ticket from it, and each template gets a page showing the ticket it starts, its tasks in drag-to-sort order with time estimates, what it sets up, its placeholders and the tickets, recurring tickets and project templates that use it; template handling moved into functions/ticket_template.php with ticketTemplateFinish, tagKeepIds and tagIdsFromValues split out of tagSetForRecord, and template task editing moved to admin/post; fixes editing a template task moving it to the top of the list, client bulk tickets skipping the template's tasks and time estimates, and the client bulk window not validating the agent, priority and category, and adds an option there to raise each client's ticket for its primary contact; changelog updated --- CHANGELOG.md | 26 +- admin/database_updates/3.1.9.php | 30 ++ .../ticket_template/ticket_template_add.php | 51 +-- .../ticket_template/ticket_template_edit.php | 76 ++-- .../ticket_template/ticket_template_form.php | 164 ++++++++ .../ticket_template_task_edit.php | 38 +- admin/post/ticket_template.php | 153 +++++-- admin/ticket_template.php | 387 ++++++++++++------ admin/ticket_templates.php | 232 +++++++---- agent/includes/inc_ticket_template_select.php | 101 ++--- agent/js/ticket_tasks_modal.js | 127 ++++-- agent/modals/asset/asset_bulk_add_ticket.php | 20 +- .../modals/client/client_bulk_add_ticket.php | 27 +- .../recurring_ticket/recurring_ticket_add.php | 17 +- .../recurring_ticket_edit.php | 13 +- agent/modals/ticket/ticket_add.php | 20 +- agent/post/client.php | 167 ++++---- agent/post/task.php | 21 - agent/post/ticket.php | 37 +- agent/tickets.php | 7 +- db.sql | 26 +- functions.php | 1 + functions/project.php | 54 +-- functions/tags.php | 53 ++- functions/ticket.php | 8 + functions/ticket_template.php | 375 +++++++++++++++++ 26 files changed, 1562 insertions(+), 669 deletions(-) create mode 100644 admin/database_updates/3.1.9.php create mode 100644 admin/modals/ticket_template/ticket_template_form.php create mode 100644 functions/ticket_template.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b014f33e..83e1e8c70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,9 @@ This file documents all notable changes made to ITFlow. ### Upgrading to 26.11 -Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.1.8) in the same pass. Nothing else is required. +Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.1.9) in the same pass. Nothing else is required. -This is a big release, with thirty-eight database steps in one go, so take a backup before you update. +This is a big release, with thirty-nine database steps in one go, so take a backup before you update. The update also clears out data that deletes in older versions left behind, all of it pointing at something that no longer exists: @@ -43,6 +43,8 @@ The built-in Accountant role gets full access to Financial, so it can delete an What the API makes from now on - tickets, replies, clients and the rest - is stamped in ITFlow's timezone, as the pages stamp what they make. What it made before keeps the server's time, which on a server set to UTC is hours off (see Bug Fixes). +Ticket templates keep their subject, details and tasks, and set nothing else on a ticket until you give them a category, priority, agent, due time or tags. Tickets raised before the update don't know which template they came from, so a template's use is counted from the update on. + If you are coming from 26.08 or earlier, the database update still has to be run from the command line one time, exactly as described under Upgrading to 26.09 below. ### Breaking Changes and Notes @@ -164,6 +166,9 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Tickets: an agent is now emailed when a ticket is assigned to them from New Ticket or Edit, as they already were from the assignee pick and Bulk Action. It used to be an app notice only. Assigning a ticket to yourself sends nothing. - Client portal: the email inviting a contact to the portal no longer has their password in it. Tick Email them an invite to the portal - on New Contact as well as Edit - and they get a link to set their own password, good for 7 days, or with a Microsoft login a link to sign in. It used to email the password the agent typed, in plain text. A password you type is still set, for reading out over the phone; the link lets them choose another. - Email on the contacts and clients lists comes from one of your mailboxes in Admin > Mail, picked by name, and goes out in the email look. Archived contacts and contacts without an email address are left out, and each address gets it once. With no roles ticked on the clients list it goes to every contact that isn't archived. Nothing is sent while outgoing mail isn't set up. +- Ticket templates: [Client], [Contact], [Asset], [Site], [Agent], [Project], [Ticket], [Date], [Month], [Quarter] and [Year] in a template's subject, details and tasks are filled in when a ticket is raised from it - and in a recurring ticket's each time it raises one, template or not. A recurring ticket with [Month] in its subject used to raise it with [Month] in it. Anything else in square brackets stays as it is. +- Ticket templates: a project template's tickets are set up as their ticket templates say. They were always Medium, uncategorised and billed as the default. +- New Tickets on the assets list: with [Asset] in the subject, the asset's name isn't put in front of it as well. New Tickets on the assets and clients lists now email the agent they go to, once for all of them, as New Ticket does. - Emails to agents keep their subjects, so mail rules still match. The ones that changed: a client's reply from the portal is "ITFlow - Ticket updated - [TCK-12] Subject", with the dash the emailed reply always had; one recurring ticket assigned from Bulk Action is "ITFlow - Recurring ticket Subject assigned to you", as from the assignee pick; and a ticket raised on a schedule reaches the new-ticket address as "ITFlow - New Recurring Ticket - Client: Subject". - Client portal: primary and technical contacts' Tickets page now opens on everyone's tickets at their company, with Mine to see only their own. The separate All tickets page is gone, and links to it land on Tickets. A ticket shows the client where it stands - Received, In progress, Waiting on you, On hold, Resolved or Closed - rather than your ticket statuses. - Client portal: invoices and quotes now open in the portal, where they used to open their guest link in a new tab. The links in your emails work as before. A quote answered in the portal records the contact's name and any note they left. Pay invoices pays the invoices ticked as one card payment, and the Pay drop-down on each invoice is gone (see Client portal). @@ -479,10 +484,17 @@ If you are coming from 26.08 or earlier, the database update still has to be run - The project page shows warnings when something needs a look, and stat cards for tickets, tasks, time and due date. Tickets, Tasks and Activity are on tabs, alongside the scope, the details and the team with their hours. - Projects now have a start date, budget hours and a client contact. - A template can assign its tickets to the manager. You can also add a template's tickets to an existing project. - - Template ticket subjects can use [Client], [Project], [Month], [Quarter] and [Year]. + - Their tickets are set up as their ticket templates say, with [Client], [Project], [Month] and the like filled in (see Ticket templates). - You can add tickets by picking them or by number, and completed projects can be reopened. - Project templates in Admin keep their ticket templates in order, and can be duplicated, archived and restored. - Projects show on the ticket page, the client overview, the dashboard, the calendar and in search. +- **Ticket templates** (rebuilt) + - A template sets up the whole ticket, not just its subject, details and tasks: its category, priority, billing, the agent it goes to, when it is due (so many hours or days after it is raised) and its tags. Each is left alone unless the template sets it. + - Picking one on New Ticket fills in every field it sets, so you see the ticket before it is made and can change anything. The picker says what each template sets up and how many tasks it has. + - The New Tickets windows on the assets and clients lists now offer templates too, as recurring tickets do - and the clients list can raise each ticket for the client's primary contact. + - [Client], [Contact], [Asset], [Site], [Agent], [Project], [Ticket], [Date], [Month], [Quarter] and [Year] are filled in when the ticket is raised - in its subject, details and tasks. Anything else in square brackets, like [Employee Name], stays for whoever picks it up, and the template's page lists which are which. + - A ticket keeps which template it came from, and its history says so. Admin > Ticket Templates shows what each sets up, its tasks and their time, how many tickets it has raised and the recurring tickets and project templates that raise it. A template's page shows the ticket it starts with its placeholders marked, its tasks (added with their time, dragged into order) and its latest tickets, and New ticket from it opens New Ticket with it filled in. + - Templates can be copied, archived - not offered for new tickets, while the recurring tickets and project templates that use them keep them - restored and deleted. - **Assets** - The asset list has: - type icons, colored status pills and OS icons @@ -972,6 +984,8 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Tickets: the email telling someone their email had become a ticket showed an apostrophe in its subject, or in their name, with a backslash in front of it. - Tickets: SLA alert emails were queued when outgoing mail was not set up. For a ticket raised or answered by email, the new ticket and client replied emails showed an apostrophe in the subject, the client's name or the reply with a backslash in front of it. - Admin > Mail: the test email was queued when outgoing mail was not set up, or when what was typed was not an email address, and greeted everyone as "Chap". +- Ticket templates: New Tickets on the clients list gave only the first client's ticket the template's tasks, dropped their times, and couldn't be given a template at all from the window. It took any priority, category or agent posted to it, and its "primary contact" never did anything. +- Ticket templates: changing one of a template's tasks moved it to the top of the list. - Email on the contacts list queued an email to a contact with no email address, which then failed in the mail queue. Email on the clients list included archived contacts. Both took any From address posted to them. - Emails: a saved card's confirmation, a new agent's sign in details and the email about a change to an agent's account were only sent when an SMTP host was filled in, so they were skipped when mail goes through Microsoft 365 or Google with no host. The saved card's email began "Were writing". - Contacts: an agent without Support saw a contact's Assets, Documents, Files and Services tabs, which led to pages they were refused. A document's or file's linked assets, licenses, services, domains and certificates were listed to them too. @@ -1414,6 +1428,12 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Pulled out of the handlers so the previews can call them: `ticketMailCreated()` (from `agent/post/ticket.php`, now with `$how` and `$to`, which the email parser uses), `ticketMailReply($ticket_id, $reply_html, $by, $resolved, $attachments)` (the reply handler, bulk reply and the API), `ticketMailWatchersAdded()`, `ticketMailTaskApproval($approval_id, $by)`, `ticketMailClosedReply($ticket_id, $from_email)` and `ticketSlaAlert($ticket_id, $track, $breached, $due, $address)` in `functions/ticket.php` - `sendSlaAlert()` in `cron/ticket_sla.php` is gone - and `billingMailCardSaved()` in `functions/billing_email.php`. - `functions/portal.php`: `portalMailReady()`, `portalMailInvite($user_id, $by)` (used by `add_contact`, `edit_contact` - which take `send_email` - and the portal's `portalContactInvite()`), `portalMailPasswordReset($user_id)` and `portalMailAccountChange($email, $name, $change)` (`password`, `password_link`, `mfa_on`, `mfa_off`, `mfa_off_by_us`). `portalAccountEmail()` sends through `emailQueue()`. - `functions/share.php`: `shareMailHtml()` and `shareQueueMail()` are removed. `shareEmailLink()` returns a bool, and new `shareEmailCode($row, $code)` and `shareMailFrom()`. `shareMailReady()` goes by `emailReady()`. `calendarSendInvites()` sends through `emailQueue()`, and `calendarCanEmail()` is `emailReady()`. +- Ticket templates: + - Database 3.1.9: `ticket_templates` gains `ticket_template_category_id`, `ticket_template_priority` (NULL leaves it), `ticket_template_billable` (NULL leaves it), `ticket_template_assigned_to` and `ticket_template_due_hours`; new `ticket_template_tags` (ticket tags, cascading like `ticket_tags`); `tickets.ticket_template_id` with a key. + - New `functions/ticket_template.php`: `ticketTemplateRow()`, `ticketTemplateTasks()`, `ticketTemplateTagIds()`, `ticketTemplateFields($post, &$error)`, `ticketTemplateSave($id, $fields)`, `ticketTemplateSetTags()`, `ticketTemplateCopy()`, `ticketTemplateUsage($ids)`, `ticketTemplateDefaultsHtml()`, `ticketTemplatePickerData()`, `ticketTemplateDueText()`, `ticketTemplateDueAt()`, `ticketTemplateMinutesText()` and `ticketTemplatePlaceholdersIn()`; placeholders in `TICKET_PLACEHOLDERS`, `ticketPlaceholderValues($ticket_id)`, `ticketPlaceholderFill($text, $values, $html)` and `ticketPlaceholdersFill($ticket_id)`; and `ticketTemplateFinish($ticket_id, $template_id, $defaults, $tasks)`, which every path that raises from a template calls - `add_ticket`, `bulk_add_asset_ticket`, `bulk_add_client_ticket` (rewritten, with `use_primary_contact` now a switch in its window) and `projectApplyTemplate()`, which now takes each ticket template's settings. `recurringTicketRaise()` records the recurring ticket's template and calls `ticketPlaceholdersFill()`. `projectTemplateSubject()` is gone. + - `agent/includes/inc_ticket_template_select.php` writes each template's settings as `data-template-*` on its option and takes `$ticket_template_field`, `$ticket_template_apply_on_load` and `$ticket_template_hint`; `agent/js/ticket_tasks_modal.js` writes them into the form's fields marked `data-template-field` (`subject`, `details`, `priority`, `category`, `assigned`, `due`, `tags`, `billable`) and the task rows. `ticket_add.php` takes `ticket_template_id`, and `agent/tickets.php?new_from_template=` opens it. + - Admin: `admin/modals/ticket_template/ticket_template_form.php` is shared by the add and edit windows, which are ajax windows now; `copy_ticket_template`, `archive_ticket_template` and `restore_ticket_template` are new. `admin/post/ticket_template.php` no longer requires `agent/post/ticket.php` and `agent/post/task.php`, and `edit_ticket_template_task` moved there from `agent/post/task.php`. + - `functions/tags.php`: `tagIdsFromValues($entity, $values)` and `tagKeepIds($entity, $ids, $had)` are split out of `tagSetForRecord()`, and `tagFormFieldHtml()` takes the select's extra attributes. - Empty states: every list page sets `$empty_state` before including `includes/filter_footer.php`, and `includes/inc_empty_state.php` draws it with `emptyStateHtml()` (`functions/format.php`) when the list has nothing - `thing`, `icon`, `title`, `text`, `actions` (`label`, `modal` or `href`, `size`, `icon`; the first is the main one), `archived`, `view`, `filtered`, `views`, `match_title`, `match_text` and `clear_url`. `emptyStateFiltered($views)` reads the GET string for a search or filter, leaving out paging, sorting, `client_id`, `archived` and the page's views, and `emptyStateClearUrl($views)` is the page without them. `emptyStatePill($pills, $key, $default, $good)` builds a pill's own state from the page's pill array (`label`, `icon`, `title`, `alarm`), with a tick for `alarm` pills and the keys in `$good`. Files, notifications and racks call `emptyStateHtml()` in their own layout; files and notifications set `$empty_state_skip`. A page that sets nothing still gets one, worded from `$page_title`. The pages' own empty blocks (`.itflow-asset-empty` under a list) are gone. CSS: `.itflow-empty-state` with `-icon` (a grey round tile), `-title`, `-text` and `-actions`. - Removed unused helpers and files: - `credentialLink()`, `projectLink()`, `linkCounts()`, `assetContactAvatar()`, `clientOverviewPersonInitials()`, and `getMonthlyTax()` and `getQuarterlyTax()`, which looked a tax up by name diff --git a/admin/database_updates/3.1.9.php b/admin/database_updates/3.1.9.php new file mode 100644 index 000000000..e575ff67f --- /dev/null +++ b/admin/database_updates/3.1.9.php @@ -0,0 +1,30 @@ + @@ -13,53 +16,7 @@ ob_start();
- -
- -
- - -
-
- -
- -
- - -
-
- -
- -
- -
- -
- - -
-
- -
- -
- - -
-
+
diff --git a/admin/modals/ticket_template/ticket_template_edit.php b/admin/modals/ticket_template/ticket_template_edit.php index 3070c0158..769a0f454 100644 --- a/admin/modals/ticket_template/ticket_template_edit.php +++ b/admin/modals/ticket_template/ticket_template_edit.php @@ -1,51 +1,39 @@ - +
+
Ticket template:
+
+
+ + + +
+ +
+
+ + +
+
+ + + + + +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ + +
+ Filled in when a ticket is raised: . + Anything else in square brackets - [Employee Name] - stays for whoever picks it up. +
+
+ +
+ +
+ + +
+
It goes at the end of that project template's tickets.
+
+ +
+
+ +
+

How a ticket from it is set up. Anything left as it is stays as the New Ticket window has it, and can still be changed there before the ticket is made.

+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + + +
+
After it is raised.
+
+ +
+ +
+ + +
+
+ + + +
+ +
+
+
+ +
diff --git a/admin/modals/ticket_template/ticket_template_task_edit.php b/admin/modals/ticket_template/ticket_template_task_edit.php index dce9bc616..52c8dc60d 100644 --- a/admin/modals/ticket_template/ticket_template_task_edit.php +++ b/admin/modals/ticket_template/ticket_template_task_edit.php @@ -1,24 +1,23 @@ +if (!$row) { ?> +
That task is gone - it may have been deleted.
+
-
Editing task
+
Task
@@ -28,18 +27,19 @@ ob_start();
- +
- - + +
- +
- - + + + minutes
@@ -52,6 +52,6 @@ ob_start(); - Ticket Templates. The work is in + * functions/ticket_template.php. + */ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); -// Import shared code from user-side tickets/tasks as we reuse functions -require_once '../agent/post/ticket.php'; -require_once '../agent/post/task.php'; +/** The template a request names - back to the list with an error when it is gone. */ +function ticketTemplateForRequest($ticket_template_id) { + $row = ticketTemplateRow($ticket_template_id); + if (!$row) { + flashAlert('That ticket template no longer exists.', 'error'); + redirect('ticket_templates.php'); + } + return $row; +} -if (isset($_POST['add_ticket_template'])) { +if (isset($_POST['add_ticket_template']) || isset($_POST['edit_ticket_template'])) { validateCSRFToken(); - $name = escapeSql($_POST['name']); - $description = escapeSql($_POST['description']); - $subject = escapeSql($_POST['subject']); - $details = mysqli_real_escape_string($mysqli, $_POST['details']); - $project_template_id = intval($_POST['project_template']); + $editing = isset($_POST['edit_ticket_template']); + $ticket_template_id = 0; + if ($editing) { + $ticket_template_id = intval(ticketTemplateForRequest($_POST['ticket_template_id'] ?? 0)['ticket_template_id']); + } - mysqli_query($mysqli, "INSERT INTO ticket_templates SET ticket_template_name = '$name', ticket_template_description = '$description', ticket_template_subject = '$subject', ticket_template_details = '$details'"); + $fields = ticketTemplateFields($_POST, $error); + if (!$fields) { + flashAlert($error, 'error'); + redirect(); + } + $ticket_template_id = ticketTemplateSave($ticket_template_id, $fields); + $name = escapeSql($fields['name']); - $ticket_template_id = mysqli_insert_id($mysqli); - - // At the end of the project template's tickets - if ($project_template_id && mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM project_templates WHERE project_template_id = $project_template_id"))) { + // A new one can go at the end of a project template's tickets + $project_template_id = intval($_POST['project_template'] ?? 0); + if (!$editing && $project_template_id && mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM project_templates WHERE project_template_id = $project_template_id"))) { $order = intval(mysqli_fetch_row(mysqli_query($mysqli, "SELECT COALESCE(MAX(ticket_template_order), 0) + 1 FROM project_template_ticket_templates WHERE project_template_id = $project_template_id"))[0]); mysqli_query($mysqli, "INSERT INTO project_template_ticket_templates SET project_template_id = $project_template_id, ticket_template_id = $ticket_template_id, ticket_template_order = $order"); } - logAudit("Ticket Template", "Create", "$session_name created ticket template $name", 0, $ticket_template_id); + logAudit("Ticket Template", $editing ? "Edit" : "Create", "$session_name " . ($editing ? 'edited' : 'created') . " ticket template $name", 0, $ticket_template_id); - flashAlert("Ticket template " . stripslashes($name) . " created"); + flashAlert("Ticket template " . escapeHtml($fields['name']) . " " . ($editing ? 'saved' : 'created')); - redirect(); + // A new one opens, to add its tasks + redirect($editing ? null : "ticket_template.php?ticket_template_id=$ticket_template_id"); } -if (isset($_POST['edit_ticket_template'])) { +if (isset($_GET['copy_ticket_template'])) { validateCSRFToken(); - $ticket_template_id = intval($_POST['ticket_template_id']); - $name = escapeSql($_POST['name']); - $description = escapeSql($_POST['description']); - $subject = escapeSql($_POST['subject']); - $details = mysqli_real_escape_string($mysqli, $_POST['details']); + $row = ticketTemplateForRequest($_GET['copy_ticket_template']); + $new_id = ticketTemplateCopy($row['ticket_template_id']); - mysqli_query($mysqli, "UPDATE ticket_templates SET ticket_template_name = '$name', ticket_template_description = '$description', ticket_template_subject = '$subject', ticket_template_details = '$details' WHERE ticket_template_id = $ticket_template_id"); + logAudit("Ticket Template", "Create", "$session_name copied ticket template " . escapeSql($row['ticket_template_name']), 0, $new_id); - logAudit("Ticket Template", "Edit", "$session_name edited ticket template $name", 0, $ticket_template_id); + flashAlert("Ticket template " . escapeHtml($row['ticket_template_name']) . " copied - this is the copy"); - flashAlert("Ticket template " . stripslashes($name) . " saved"); + redirect("ticket_template.php?ticket_template_id=$new_id"); + +} + +if (isset($_GET['archive_ticket_template']) || isset($_GET['restore_ticket_template'])) { + + validateCSRFToken(); + + $archive = isset($_GET['archive_ticket_template']); + $row = ticketTemplateForRequest($archive ? $_GET['archive_ticket_template'] : $_GET['restore_ticket_template']); + $ticket_template_id = intval($row['ticket_template_id']); + $name = escapeSql($row['ticket_template_name']); + + // Archived, it isn't offered for new tickets - recurring tickets and project templates that use it keep it, so restoring it is all it takes + mysqli_query($mysqli, "UPDATE ticket_templates SET ticket_template_archived_at = " . ($archive ? 'NOW()' : 'NULL') . " WHERE ticket_template_id = $ticket_template_id"); + + logAudit("Ticket Template", $archive ? "Archive" : "Restore", "$session_name " . ($archive ? 'archived' : 'restored') . " ticket template $name", 0, $ticket_template_id); + + flashAlert("Ticket template " . escapeHtml($row['ticket_template_name']) . " " . ($archive ? 'archived' : 'restored'), $archive ? 'error' : 'success'); redirect(); @@ -60,25 +90,28 @@ if (isset($_GET['delete_ticket_template'])) { validateCSRFToken(); - $ticket_template_id = intval($_GET['delete_ticket_template']); - - $ticket_template_name = escapeSql(getFieldById('ticket_templates', $ticket_template_id, 'ticket_template_name')); + $row = ticketTemplateForRequest($_GET['delete_ticket_template']); + $ticket_template_id = intval($row['ticket_template_id']); + $ticket_template_name = escapeSql($row['ticket_template_name']); mysqli_query($mysqli, "DELETE FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); - // Delete Associations + // Its tasks and tags go with it, and it comes off the project templates that raise it mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); + mysqli_query($mysqli, "DELETE FROM ticket_template_tags WHERE ticket_template_id = $ticket_template_id"); mysqli_query($mysqli, "DELETE FROM project_template_ticket_templates WHERE ticket_template_id = $ticket_template_id"); // Unlink from recurring tickets rather than deleting them - the schedule is still - // wanted, it just stops contributing tasks to the tickets it raises + // wanted, it just stops contributing tasks to the tickets it raises. Tickets raised + // from it keep everything they were given, but not the link. mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_ticket_template_id = 0 WHERE recurring_ticket_ticket_template_id = $ticket_template_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_template_id = 0 WHERE ticket_template_id = $ticket_template_id"); logAudit("Ticket Template", "Delete", "$session_name deleted ticket template $ticket_template_name"); - flashAlert("Ticket template " . stripslashes($ticket_template_name) . " and its tasks deleted", 'error'); + flashAlert("Ticket template " . escapeHtml($row['ticket_template_name']) . " and its tasks deleted", 'error'); - redirect(); + redirect(isset($_GET['from_page']) ? 'ticket_templates.php' : null); } @@ -86,16 +119,48 @@ if (isset($_POST['add_ticket_template_task'])) { validateCSRFToken(); - $ticket_template_id = intval($_POST['ticket_template_id']); - $task_name = escapeSql($_POST['task_name']); + $row = ticketTemplateForRequest($_POST['ticket_template_id'] ?? 0); + $ticket_template_id = intval($row['ticket_template_id']); + $task_name = trim(mb_substr(strip_tags((string) ($_POST['task_name'] ?? '')), 0, 200)); + if ($task_name === '') { + flashAlert('Give the task a name.', 'error'); + redirect(); + } + $estimate = max(0, min(100000, intval($_POST['task_estimate'] ?? 0))); + $task_name_sql = escapeSql($task_name); + $order = intval(mysqli_fetch_row(mysqli_query($mysqli, "SELECT COALESCE(MAX(task_template_order), 0) + 1 FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"))[0]); - mysqli_query($mysqli, "INSERT INTO task_templates SET task_template_name = '$task_name', task_template_ticket_template_id = $ticket_template_id"); + mysqli_query($mysqli, "INSERT INTO task_templates SET task_template_name = '$task_name_sql', task_template_order = $order, task_template_completion_estimate = $estimate, task_template_ticket_template_id = $ticket_template_id"); - $task_template_id = mysqli_insert_id($mysqli); + logAudit("Ticket Template", "Edit", "$session_name added task $task_name_sql to ticket template " . escapeSql($row['ticket_template_name']), 0, $ticket_template_id); - logAudit("Ticket Template", "Create", "$session_name created task $task_name for ticket template", 0, $ticket_template_id); + flashAlert("Task " . escapeHtml($task_name) . " added"); - flashAlert("Task " . stripslashes($task_name) . " added"); + redirect(); + +} + +if (isset($_POST['edit_ticket_template_task'])) { + + validateCSRFToken(); + + $task_template_id = intval($_POST['task_template_id'] ?? 0); + $task = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT task_template_ticket_template_id FROM task_templates WHERE task_template_id = $task_template_id")); + $row = ticketTemplateForRequest($task['task_template_ticket_template_id'] ?? 0); + $task_name = trim(mb_substr(strip_tags((string) ($_POST['name'] ?? '')), 0, 200)); + if ($task_name === '') { + flashAlert('Give the task a name.', 'error'); + redirect(); + } + $task_name_sql = escapeSql($task_name); + $estimate = max(0, min(100000, intval($_POST['completion_estimate'] ?? 0))); + + // Its place in the list stays as it is - the list is reordered by dragging + mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name_sql', task_template_completion_estimate = $estimate WHERE task_template_id = $task_template_id"); + + logAudit("Ticket Template", "Edit", "$session_name edited task $task_name_sql on ticket template " . escapeSql($row['ticket_template_name']), 0, intval($row['ticket_template_id'])); + + flashAlert("Task " . escapeHtml($task_name) . " saved"); redirect(); @@ -106,14 +171,14 @@ if (isset($_GET['delete_task_template'])) { validateCSRFToken(); $task_template_id = intval($_GET['delete_task_template']); - - $task_template_name = escapeSql(getFieldById('task_templates', $task_template_id, 'task_template_name')); + $task = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT task_template_name, task_template_ticket_template_id FROM task_templates WHERE task_template_id = $task_template_id")); + $row = ticketTemplateForRequest($task['task_template_ticket_template_id'] ?? 0); mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_id = $task_template_id"); - logAudit("Ticket Template", "Edit", "$session_name deleted task $task_template_name from ticket template"); + logAudit("Ticket Template", "Edit", "$session_name deleted task " . escapeSql($task['task_template_name']) . " from ticket template " . escapeSql($row['ticket_template_name']), 0, intval($row['ticket_template_id'])); - flashAlert("Task " . stripslashes($task_template_name) . " deleted", 'error'); + flashAlert("Task " . escapeHtml($task['task_template_name']) . " deleted", 'error'); redirect(); diff --git a/admin/ticket_template.php b/admin/ticket_template.php index c9737af30..b3ac530c3 100644 --- a/admin/ticket_template.php +++ b/admin/ticket_template.php @@ -1,161 +1,314 @@ set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one -$purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); -$purifier = new HTMLPurifier($purifier_config); - -if (isset($_GET['ticket_template_id'])) { - $ticket_template_id = intval($_GET['ticket_template_id']); -} - -$sql_ticket_template = mysqli_query($mysqli, "SELECT ticket_template_created_at, ticket_template_description, ticket_template_details, - ticket_template_name, ticket_template_subject, ticket_template_updated_at FROM ticket_templates WHERE ticket_template_id = $ticket_template_id LIMIT 1"); - -if (mysqli_num_rows($sql_ticket_template) == 0) { - echo "

Nothing to see here

Go Back
"; +$template = ticketTemplateRow($_GET['ticket_template_id'] ?? 0); +if (!$template) { + echo emptyStateHtml(['thing' => 'ticket templates', 'title' => 'That ticket template is gone', 'text' => 'It may have been deleted.', 'icon' => 'fa-life-ring', 'filtered' => false, + 'actions' => [['label' => 'Ticket Templates', 'href' => 'ticket_templates.php']]]); require_once "../includes/footer.php"; exit(); } -$row = mysqli_fetch_assoc($sql_ticket_template); +$ticket_template_id = intval($template['ticket_template_id']); +$name = escapeHtml($template['ticket_template_name']); +$archived = !empty($template['ticket_template_archived_at']); +$tasks = ticketTemplateTasks($ticket_template_id); +$task_minutes = array_sum(array_column($tasks, 'estimate')); +$tag_ids = ticketTemplateTagIds($ticket_template_id); +$tag_rows = []; +if ($tag_ids) { + $sql = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_id IN (" . implode(',', $tag_ids) . ") ORDER BY tag_name"); + while ($row = mysqli_fetch_assoc($sql)) { + $tag_rows[] = $row; + } +} +$usage = ticketTemplateUsage([$ticket_template_id])[$ticket_template_id] ?? ['count' => 0, 'open' => 0, 'last' => null]; +$csrf = $_SESSION['csrf_token']; -$ticket_template_name = escapeHtml($row['ticket_template_name']); -$ticket_template_description = escapeHtml($row['ticket_template_description']); -$ticket_template_subject = escapeHtml($row['ticket_template_subject']); -$ticket_template_details = $purifier->purify($row['ticket_template_details']); -$ticket_template_created_at = escapeHtml($row['ticket_template_created_at']); -$ticket_template_updated_at = escapeHtml($row['ticket_template_updated_at']); +// The tickets it raised most lately +$recent = []; +$sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_client_id, ticket_created_at, ticket_resolved_at, ticket_closed_at, client_name, ticket_status_name, ticket_status_color + FROM tickets + LEFT JOIN clients ON client_id = ticket_client_id + LEFT JOIN ticket_statuses ON ticket_status_id = ticket_status + WHERE ticket_template_id = $ticket_template_id AND ticket_archived_at IS NULL + ORDER BY ticket_created_at DESC, ticket_id DESC LIMIT 8"); +while ($row = mysqli_fetch_assoc($sql)) { + $recent[] = $row; +} -// Get Task Templates -$sql_task_templates = mysqli_query($mysqli, "SELECT task_template_completion_estimate, task_template_id, task_template_name FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id ORDER BY task_template_order ASC, task_template_id ASC"); +// What raises it +$recurring = []; +$sql = mysqli_query($mysqli, "SELECT recurring_ticket_id, recurring_ticket_subject, recurring_ticket_frequency, recurring_ticket_client_id, client_name FROM recurring_tickets + LEFT JOIN clients ON client_id = recurring_ticket_client_id + WHERE recurring_ticket_ticket_template_id = $ticket_template_id ORDER BY client_name, recurring_ticket_subject"); +while ($row = mysqli_fetch_assoc($sql)) { + $recurring[] = $row; +} +$projects = []; +$sql = mysqli_query($mysqli, "SELECT project_templates.project_template_id, project_template_name FROM project_template_ticket_templates + JOIN project_templates ON project_templates.project_template_id = project_template_ticket_templates.project_template_id + WHERE project_template_ticket_templates.ticket_template_id = $ticket_template_id ORDER BY project_template_name"); +while ($row = mysqli_fetch_assoc($sql)) { + $projects[] = $row; +} + +// Its placeholders - filled in from the ticket, or left for whoever picks it up +$known = array_map('strtolower', array_keys(TICKET_PLACEHOLDERS)); +$found = ticketTemplatePlaceholdersIn($template['ticket_template_subject'] . ' ' . $template['ticket_template_details'] . ' ' . implode(' ', array_column($tasks, 'name'))); +$filled = array_values(array_filter($found, function ($word) use ($known) { + return in_array(strtolower($word), $known, true); +})); +$left = array_values(array_diff($found, $filled)); + +// [Words] marked where they appear - escaped text, or HTML already made safe +$mark = function ($html) { + return preg_replace('/\[([A-Za-z][A-Za-z0-9 _\-\/]{0,40})\]/', '[$1]', $html); +}; +$details = trim((string) $template['ticket_template_details']) !== '' ? $mark(documentHtmlPurify($template['ticket_template_details'])) : ''; + +$edit_url = "modals/ticket_template/ticket_template_edit.php?id=$ticket_template_id"; ?>
    -
  1. - Home -
    2. -
  2. - Admin -
    3. -
  3. - Ticket Templates -
    4. -
    5. +
  5. Home
    6. +
  6. Admin
    7. +
  7. Ticket Templates
    8. +
-
-
- -
-
-

-
- +
+
+ +
+

+ +
+ + +
Archived - not offered for new tickets
+ +
+
+ + New ticket from it + + +
+ +
+ Copy + + Restore + + Archive + +
+ Delete
-
- +
+
+
+ +
+
+ +
+
+

The ticket it starts

+ +
+
+
Subject
+
None - typed in on New Ticket' ?>
+
Details
+
None' ?>
-
- -
- -
-
-
Tasks
+
+
+

Tasks

+ task' . escapeHtml(ticketTemplateMinutesText($task_minutes)) : '' ?>
-
- + + -
-
- - +
+
+
+ + +
+
+
+
+ + +
+
+
+
- - - - - - - -
- - - -
-
- -
- - Edit - -
- - Delete - -
+ +
+ $task) { ?> +
+ + . + + +
+ +
+ Edit +
+ Delete
-
+
+ +
+ +
No tasks yet. A ticket raised from it gets a copy of each, in this order - and later changes here don't touch tickets already raised.
+
+
+ +
+
+

Sets up

+ +
+
+ As it is'; + $set_up = [ + 'Category' => intval($template['ticket_template_category_id']) && !empty($template['category_name']) + ? categoryChip(['category_name' => $template['category_name'], 'category_type' => 'Ticket', 'category_color' => $template['category_color'], 'category_icon' => $template['category_icon']]) : $leave, + 'Priority' => !empty($template['ticket_template_priority']) ? ticketPriorityHtml($template['ticket_template_priority'], 'detail') : $leave, + 'Assign to' => intval($template['ticket_template_assigned_to']) && !empty($template['assignee_name']) + ? userAvatar($template['ticket_template_assigned_to'], $template['assignee_name'], $template['assignee_avatar'] ?? '', 'sm') . ' ' . escapeHtml($template['assignee_name']) : $leave, + 'Due' => intval($template['ticket_template_due_hours']) ? escapeHtml(ticketTemplateDueText($template['ticket_template_due_hours'])) . ' after it is raised' : 'No due date', + ]; + if (!empty($config_module_enable_accounting)) { + $set_up['Billable'] = $template['ticket_template_billable'] === null ? $leave : (intval($template['ticket_template_billable']) ? 'Billable' : 'Not billable'); + } + $set_up['Tags'] = $tag_rows ? '' . implode('', array_map('tagPill', $tag_rows)) . '' : 'None'; + ?> +
+ $value) { ?> +
+
+ +
+
+
+ + +
+

Placeholders

+
+ +
Filled in from the ticket
+
+ + [] + +
+ + +
Left for whoever picks it up
+
+ + [] + +
+ +
+
+ + +
+

Used

+
+ +
ticket raised' . $usage['open'] . ' still open' : '' ?> - last
+
+ + + + + + + +
+ +
No tickets raised from it yet - counting started with this version of ITFlow.
+ + +
Raised by
+
    + +
  • -
    • + + +
  • - project template
    • + +
+ +
+
+ +
- Ticket Templates - tickets ready to raise: a subject, details and + * tasks, and how the ticket is set up (category, priority, billing, agent, due + * time and tags). Each row shows what it sets up, its tasks and their time, + * and how often it has been used. A template can be changed, copied as the + * start of another, archived - kept for the recurring tickets and project + * templates that use it, not offered for new tickets - or deleted. The work is + * in functions/ticket_template.php; the handlers are admin/post/ticket_template.php. + */ require_once "includes/inc_all_admin.php"; -$sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS *, - COUNT(task_template_id) AS task_count - FROM ticket_templates - LEFT JOIN task_templates ON task_template_ticket_template_id = ticket_template_id - WHERE (ticket_template_name LIKE '%$q%' OR ticket_template_description LIKE '%$q%') - AND ticket_template_archived_at IS NULL - GROUP BY ticket_template_id - ORDER BY $sort $order - LIMIT $record_from, $record_to" -); +$show_archived = isset($_GET['archived']); +$search = trim((string) ($_GET['q'] ?? '')); +$search_sql = escapeSql($search); -$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +$templates = []; +$sql = mysqli_query($mysqli, "SELECT ticket_templates.*, category_name, category_color, category_icon, user_name AS assignee_name, + (SELECT COUNT(*) FROM task_templates WHERE task_template_ticket_template_id = ticket_templates.ticket_template_id) AS task_count, + (SELECT COALESCE(SUM(task_template_completion_estimate), 0) FROM task_templates WHERE task_template_ticket_template_id = ticket_templates.ticket_template_id) AS task_minutes, + (SELECT COUNT(*) FROM recurring_tickets WHERE recurring_ticket_ticket_template_id = ticket_templates.ticket_template_id) AS recurring_count, + (SELECT COUNT(*) FROM project_template_ticket_templates WHERE project_template_ticket_templates.ticket_template_id = ticket_templates.ticket_template_id) AS project_count + FROM ticket_templates + LEFT JOIN categories ON category_id = ticket_template_category_id AND ticket_template_category_id > 0 + LEFT JOIN users ON user_id = ticket_template_assigned_to AND ticket_template_assigned_to > 0 + WHERE ticket_template_archived_at IS " . ($show_archived ? 'NOT NULL' : 'NULL') . " + " . ($search !== '' ? "AND (ticket_template_name LIKE '%$search_sql%' OR ticket_template_description LIKE '%$search_sql%' OR ticket_template_subject LIKE '%$search_sql%')" : '') . " + ORDER BY ticket_template_name ASC"); +while ($row = mysqli_fetch_assoc($sql)) { + $templates[intval($row['ticket_template_id'])] = $row; +} +$usage = ticketTemplateUsage(array_keys($templates)); +$archived_count = intval(mysqli_fetch_row(mysqli_query($mysqli, "SELECT COUNT(*) FROM ticket_templates WHERE ticket_template_archived_at IS NOT NULL"))[0]); +$tag_rows = []; +$sql_tags = mysqli_query($mysqli, "SELECT ticket_template_id, tags.* FROM ticket_template_tags JOIN tags ON tags.tag_id = ticket_template_tags.tag_id ORDER BY tag_name"); +while ($row = mysqli_fetch_assoc($sql_tags)) { + $tag_rows[intval($row['ticket_template_id'])][] = $row; +} + +// This page with some of its query changed - null drops a key +$page_url = function (array $change = []) use ($show_archived, $search) { + $query = array_merge(['q' => $search !== '' ? $search : null, 'archived' => $show_archived ? 1 : null], $change); + return 'ticket_templates.php' . (($query = http_build_query(array_filter($query, function ($v) { + return $v !== null; + }))) ? "?$query" : ''); +}; + +$csrf = $_SESSION['csrf_token']; ?> @@ -30,98 +58,132 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
-
- -
-
- - -
-
- -
-
+
+

+ A ticket ready to raise - its subject, details and tasks, and how it is set up. Pick one on New Ticket, when raising tickets for several assets or clients, and on recurring tickets; + project templates raise theirs. [Client], [Contact], [Month] and the like are filled in when a ticket is raised. +

+ + +
+ + +
+
+ Current + Archived
+
- - "> - - - - - - +
- - Template - - - - Tasks - - Action
+ + + + + + + + + + + - $row) { + $name = escapeHtml($row['ticket_template_name']); $task_count = intval($row['task_count']); - + $minutes = intval($row['task_minutes']); + $used = $usage[$template_id] ?? ['count' => 0, 'open' => 0, 'last' => null]; + $tags = $tag_rows[$template_id] ?? []; + $defaults = ticketTemplateDefaultsHtml($row); + $tags_html = $tags ? '' . implode('', array_map('tagPill', $tags)) . '' : ''; + $set_up = trim($defaults . ($defaults !== '' && $tags_html !== '' ? ' ' : '') . $tags_html); + $linked = []; + if (intval($row['recurring_count'])) { + $linked[] = intval($row['recurring_count']) . ' recurring ticket' . (intval($row['recurring_count']) === 1 ? '' : 's'); + } + if (intval($row['project_count'])) { + $linked[] = intval($row['project_count']) . ' project template' . (intval($row['project_count']) === 1 ? '' : 's'); + } + ob_start(); ?> + +
ticket· ' . $used['open'] . ' open' : '' ?>
+
Last
+ + Not yet + +
+ - + + + - -
TemplateSets upTasksUsedAction
- -
- -
- -
-
+
+ +
+ + +
+ +
+ + +
Archived
+ + +
+
- +
Just the subject and details' ?> + +
task
+
+ + None + +
- +
- - Delete - + Edit + + New ticket from it + + Copy +
+ + Restore + + Archive + + Delete
- 'ticket templates', - 'icon' => 'fa-life-ring', - 'text' => 'The details and tasks to start a ticket with.', - 'actions' => [['label' => 'New Ticket Template', 'modal' => 'modals/ticket_template/ticket_template_add.php', 'size' => 'lg']], - ]; - ?> - + + + 'ticket templates', + 'title' => $show_archived ? 'No archived ticket templates' : 'No ticket templates yet', + 'text' => $show_archived ? 'An archived template isn\'t offered for new tickets, but the recurring tickets and project templates that use it keep it.' : 'A ticket ready to raise - its subject, details and tasks, and how it is set up.', + 'icon' => 'fa-life-ring', + 'filtered' => $search !== '', + 'clear_url' => $page_url(['q' => null]), + 'actions' => $show_archived ? [] : [['label' => 'New Ticket Template', 'modal' => 'modals/ticket_template/ticket_template_add.php', 'size' => 'lg']], + ]) ?> +
[Client], [Month] and the like are filled in when it is saved.'; -// Every template's tasks in one pass, rather than a query per option +// Every template's tasks and tags in one pass each, rather than a query per option $ticket_template_tasks = []; - -$sql_ticket_template_tasks = mysqli_query( - $mysqli, - "SELECT task_template_ticket_template_id, task_template_name, task_template_completion_estimate - FROM task_templates - ORDER BY task_template_order ASC, task_template_id ASC" -); - +$sql_ticket_template_tasks = mysqli_query($mysqli, "SELECT task_template_id, task_template_ticket_template_id, task_template_name, task_template_completion_estimate + FROM task_templates ORDER BY task_template_order ASC, task_template_id ASC"); while ($row = mysqli_fetch_assoc($sql_ticket_template_tasks)) { - $ticket_template_tasks[intval($row['task_template_ticket_template_id'])][] = [ - 'name' => $row['task_template_name'], - 'estimate' => intval($row['task_template_completion_estimate']) - ]; + $ticket_template_tasks[intval($row['task_template_ticket_template_id'])][] = ['id' => intval($row['task_template_id']), 'name' => $row['task_template_name'], 'estimate' => intval($row['task_template_completion_estimate'])]; } +$ticket_template_tags = []; +$sql_ticket_template_tags = mysqli_query($mysqli, "SELECT ticket_template_id, ticket_template_tags.tag_id FROM ticket_template_tags + JOIN tags ON tags.tag_id = ticket_template_tags.tag_id AND tag_archived_at IS NULL"); +while ($row = mysqli_fetch_row($sql_ticket_template_tags)) { + $ticket_template_tags[intval($row[0])][] = intval($row[1]); +} + +$sql_ticket_templates = mysqli_query($mysqli, "SELECT ticket_templates.*, category_name, user_name AS assignee_name FROM ticket_templates + LEFT JOIN categories ON category_id = ticket_template_category_id AND ticket_template_category_id > 0 + LEFT JOIN users ON user_id = ticket_template_assigned_to AND ticket_template_assigned_to > 0 + WHERE ticket_template_archived_at IS NULL OR ticket_template_id = $selected_ticket_template_id + ORDER BY ticket_template_name ASC"); ?>
- +
- - > - - +
- Picking a template fills in the subject, details and tasks below. You can edit them afterwards. +
diff --git a/agent/js/ticket_tasks_modal.js b/agent/js/ticket_tasks_modal.js index 451fb1d06..3c34176ac 100644 --- a/agent/js/ticket_tasks_modal.js +++ b/agent/js/ticket_tasks_modal.js @@ -1,5 +1,6 @@ // Editable task rows for the ticket and recurring ticket add/edit modals, and the -// ticket template picker that pre-fills them. +// ticket template picker (agent/includes/inc_ticket_template_select.php) that +// fills in the form - its fields marked data-template-field. // // Rows submit as parallel tasks[] and task_estimates[] arrays, aligned by their // order in the form, so removing a row removes both of its inputs together. @@ -86,27 +87,6 @@ }); } - // dataset always gives a string; jQuery used to auto-parse JSON here, so - // parse it explicitly and still tolerate an already-parsed value - function readTemplateTasks(option) { - - const tasks = option.dataset.tasks; - - if (!tasks) { - return []; - } - - if (typeof tasks === 'string') { - try { - return JSON.parse(tasks); - } catch (error) { - return []; - } - } - - return tasks; - } - document.addEventListener('click', function (e) { if (!e.target.closest('#ticketTaskAdd')) { return; @@ -125,38 +105,101 @@ } }); - // Ticket template picker - fills in the subject, details and task rows - document.addEventListener('change', function (e) { - const select = e.target.closest('#ticket_template_select'); - if (!select) { + // The form's field for one thing a template sets - marked data-template-field + function templateField(form, name) { + return form.querySelector('[data-template-field="' + name + '"]'); + } + + // Pick a value in a +
- +
@@ -40,7 +46,7 @@ ob_start();
- @@ -55,7 +61,7 @@ ob_start();
- @@ -70,7 +76,7 @@ ob_start();
-
- value="1" id="billableSwitch"> + value="1" id="billableSwitch">
@@ -131,5 +137,7 @@ ob_start();
+ + + [Client], [Month] and the like are filled in for each."; + require_once '../../includes/inc_ticket_template_select.php'; + ?> +
- +
- +
@@ -41,7 +47,7 @@ ob_start();
- @@ -56,7 +62,7 @@ ob_start();
- @@ -74,7 +80,7 @@ ob_start();
-
+
+
+ + +
+
+
- value="1" id="billableSwitch"> + value="1" id="billableSwitch">
@@ -135,5 +148,7 @@ ob_start();
+ + - + [Client], [Month] and the like are filled in each time it raises a ticket."; + require_once '../../includes/inc_ticket_template_select.php'; + ?>
- +
- +
@@ -113,7 +116,7 @@ ob_start();
- @@ -128,7 +131,7 @@ ob_start();
- @@ -143,7 +146,7 @@ ob_start();
- = 2) { ?>
- value="1" id="billable"> + value="1" id="billable" data-template-field="billable">
diff --git a/agent/modals/recurring_ticket/recurring_ticket_edit.php b/agent/modals/recurring_ticket/recurring_ticket_edit.php index 915941315..b788e6e5c 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_edit.php @@ -107,6 +107,7 @@ ob_start(); [Client], [Month] and the like are filled in each time it raises a ticket."; require_once '../../includes/inc_ticket_template_select.php'; ?> @@ -114,12 +115,12 @@ ob_start();
- +
- +
@@ -128,7 +129,7 @@ ob_start();
- 'var(--bs-info)', 'Medium' => 'var(--bs-warning)', 'High' => 'var(--bs-danger)', 'Urgent' => 'var(--bs-emphasis-color)'] as $priority => $color) { ?> @@ -141,7 +142,7 @@ ob_start();
- @@ -155,7 +156,7 @@ ob_start();
- = 2) { ?>
- value="1"> + value="1" data-template-field="billable">
diff --git a/agent/modals/ticket/ticket_add.php b/agent/modals/ticket/ticket_add.php index 83392841f..60e87298d 100644 --- a/agent/modals/ticket/ticket_add.php +++ b/agent/modals/ticket/ticket_add.php @@ -20,6 +20,10 @@ $asset_id = intval($_GET['asset_id'] ?? 0); $location_id = intval($_GET['location_id'] ?? 0); $vendor_id = intval($_GET['vendor_id'] ?? 0); +// Opened for one template - New ticket from it, on the template's page - it starts filled in +$selected_ticket_template_id = intval($_GET['ticket_template_id'] ?? 0); +$ticket_template_apply_on_load = $selected_ticket_template_id > 0; + // A ticket started from somewhere that knows what it is about (a license's // Renewal Ticket) - plain text in, escaped here $prefill_subject = mb_substr(trim((string) ($_GET['subject'] ?? '')), 0, 500); @@ -148,12 +152,12 @@ ob_start();
- +
- +
@@ -163,7 +167,7 @@ ob_start();
- @@ -178,7 +182,7 @@ ob_start();
- @@ -195,7 +199,7 @@ ob_start();
- Due
- +
- +
- value="1" id="billable"> + value="1" id="billable" data-template-field="billable">
diff --git a/agent/post/client.php b/agent/post/client.php index 18ea333e5..69e79c2f9 100644 --- a/agent/post/client.php +++ b/agent/post/client.php @@ -718,116 +718,87 @@ if (isset($_POST['bulk_add_client_ticket'])) { enforceUserPermission('module_support', 2); - $assigned_to = intval($_POST['bulk_assigned_to']); - if ($assigned_to == 0) { - $ticket_status = 1; - } else { - $ticket_status = 2; - } - $subject = escapeSql($_POST['bulk_subject']); - $priority = escapeSql($_POST['bulk_priority']); - $category_id = intval($_POST['bulk_category']); - $details = mysqli_real_escape_string($mysqli, $_POST['bulk_details']); - $project_id = intval($_POST['bulk_project']); - $use_primary_contact = intval($_POST['use_primary_contact']); - $ticket_template_id = intval($_POST['bulk_ticket_template_id']); - $billable = intval($_POST['bulk_billable'] ?? 0); - - // Check to see if adding a ticket by template - if($ticket_template_id) { - $sql = mysqli_query($mysqli, "SELECT ticket_template_details, ticket_template_subject FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); - $row = mysqli_fetch_assoc($sql); - - // Override Template Subject - if(empty($subject)) { - $subject = escapeSql($row['ticket_template_subject']); - } - $details = mysqli_escape_string($mysqli, $row['ticket_template_details']); - - // Get Associated Tasks from the ticket template - $sql_task_templates = mysqli_query($mysqli, "SELECT task_template_name, task_template_order FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); - + // Every client picked, checked before any ticket is made + $client_ids = array_values(array_unique(array_filter(array_map('intval', (array) ($_POST['client_ids'] ?? []))))); + foreach ($client_ids as $client_id) { + enforceClientAccess($client_id); } - // Create ticket for each selected asset - if (isset($_POST['client_ids'])) { + $assigned_to = ticketAgentId($_POST['bulk_assigned_to'] ?? 0); + $ticket_status = $assigned_to ? TICKET_STATUS_OPEN : TICKET_STATUS_NEW; + $subject_input = trim((string) ($_POST['bulk_subject'] ?? '')); + $priority = escapeSql(ticketPriority($_POST['bulk_priority'] ?? '')); + $category_id = ticketCategoryId($_POST['bulk_category'] ?? 0); + $details = mysqli_real_escape_string($mysqli, (string) ($_POST['bulk_details'] ?? '')); + $project_id = intval($_POST['bulk_project'] ?? 0); + $use_primary_contact = !empty($_POST['use_primary_contact']); + $ticket_template_id = intval($_POST['bulk_ticket_template_id'] ?? 0); + $billable = intval($_POST['bulk_billable'] ?? 0) ? 1 : 0; + $ticket_prefix = escapeSql($config_ticket_prefix); - // Check every selected client before creating any tickets - foreach ($_POST['client_ids'] as $client_id) { - enforceClientAccess(intval($client_id)); + // A template fills in what was left empty + $template = ticketTemplateRow($ticket_template_id); + if ($template) { + $subject_input = $subject_input !== '' ? $subject_input : (string) $template['ticket_template_subject']; + $details = trim((string) ($_POST['bulk_details'] ?? '')) !== '' ? $details : mysqli_real_escape_string($mysqli, (string) $template['ticket_template_details']); + } + if ($subject_input === '') { + flashAlert('The tickets need a subject.', 'error'); + redirect(); + } + $subject = escapeSql(mb_substr($subject_input, 0, 500)); + + $ticket_ids = []; + foreach ($client_ids as $client_id) { + if (!getFieldById('clients', $client_id, 'client_name')) { + continue; } - // Get a Asset Count - $client_count = count($_POST['client_ids']); + // Each client's primary contact, when asked; a shared project only when it is internal + $contact_id = 0; + if ($use_primary_contact) { + $primary = mysqli_fetch_row(mysqli_query($mysqli, "SELECT contact_id FROM contacts WHERE contact_client_id = $client_id AND contact_primary = 1 AND contact_archived_at IS NULL LIMIT 1")); + $contact_id = $primary ? intval($primary[0]) : 0; + } + $ticket_project_id = ticketClientOwnedId('project', $project_id, $client_id); - foreach ($_POST['client_ids'] as $client_id) { - $client_id = intval($client_id); + // Atomically increment and get the new ticket number + mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = LAST_INSERT_ID(config_ticket_next_number), config_ticket_next_number = config_ticket_next_number + 1 WHERE company_id = 1"); + $ticket_number = mysqli_insert_id($mysqli); + $url_key = randomString(32); - $sql = mysqli_query($mysqli, "SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_assoc($sql); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Agent', ticket_category = $category_id, + ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = $billable, ticket_status = $ticket_status, + ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact_id, ticket_url_key = '$url_key', + ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $ticket_project_id"); + $ticket_id = mysqli_insert_id($mysqli); + applyTicketSla($ticket_id); - $client_name = escapeSql($row['client_name']); - - // Atomically increment and get the new ticket number - mysqli_query($mysqli, " - UPDATE settings - SET - config_ticket_next_number = LAST_INSERT_ID(config_ticket_next_number), - config_ticket_next_number = config_ticket_next_number + 1 - WHERE company_id = 1 - "); - - $ticket_number = mysqli_insert_id($mysqli); - - // Sanitize Config Vars from get_settings.php and Session Vars from check_login.php - $config_ticket_prefix = escapeSql($config_ticket_prefix); - $config_ticket_from_name = escapeSql($config_ticket_from_name); - $config_ticket_from_email = escapeSql($config_ticket_from_email); - $config_base_url = escapeSql($config_base_url); - - //Generate a unique URL key for clients to access - $url_key = randomString(32); - - // Only a project of this client's, or an internal one - $ticket_project_id = ticketClientOwnedId('project', $project_id, $client_id); - - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category_id, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = $billable, ticket_status = $ticket_status, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_url_key = '$url_key', ticket_client_id = $client_id, ticket_project_id = $ticket_project_id"); - - $ticket_id = mysqli_insert_id($mysqli); - applyTicketSla($ticket_id); - - // Add Tasks - if (!empty($_POST['tasks'])) { - foreach ($_POST['tasks'] as $task) { - $task_name = escapeSql($task); - // Check that task_name is not-empty (For some reason the !empty on the array doesnt work here like in watchers) - if (!empty($task_name)) { - mysqli_query($mysqli,"INSERT INTO tasks SET task_name = '$task_name', task_ticket_id = $ticket_id"); - } - } + // Tasks typed in, then the template's - its tags and due time too, and [Client] filled in + foreach ((array) ($_POST['tasks'] ?? []) as $task) { + $task_name = escapeSql(mb_substr(trim((string) $task), 0, 255)); + if ($task_name !== '') { + mysqli_query($mysqli, "INSERT INTO tasks SET task_name = '$task_name', task_ticket_id = $ticket_id"); } - - // Add Tasks from Template if Template was selected - if($ticket_template_id) { - if (mysqli_num_rows($sql_task_templates) > 0) { - while ($row = mysqli_fetch_assoc($sql_task_templates)) { - $task_order = intval($row['task_template_order']); - $task_name = escapeSql($row['task_template_name']); - - mysqli_query($mysqli,"INSERT INTO tasks SET task_name = '$task_name', task_order = $task_order, task_ticket_id = $ticket_id"); - } - } - } - - // Custom action/notif handler - triggerCustomAction('ticket_create', $ticket_id); + } + if ($template) { + ticketTemplateFinish($ticket_id, $ticket_template_id, true, true); } - logAudit("Ticket", "Bulk Create", "$session_name created $client_count tickets for $client_name"); - - flashAlert("$client_count tickets created for selected clients"); - + logAudit("Ticket", "Create", "$session_name created ticket $ticket_prefix$ticket_number - $subject", $client_id, $ticket_id); + triggerCustomAction('ticket_create', $ticket_id); + $ticket_ids[] = $ticket_id; } + $count = count($ticket_ids); + + // The agent they went to hears once, about all of them + if ($ticket_ids && $assigned_to) { + ticketMailAssigned($assigned_to, $ticket_ids, stripslashes($session_name)); + } + + logAudit("Ticket", "Bulk Create", "$session_name created $count ticket(s) for the clients picked"); + + flashAlert("Created $count ticket" . ($count === 1 ? '' : 's') . " for the clients picked"); redirect(); diff --git a/agent/post/task.php b/agent/post/task.php index fce780f4f..b02bf6792 100644 --- a/agent/post/task.php +++ b/agent/post/task.php @@ -68,27 +68,6 @@ if (isset($_POST['edit_ticket_task'])) { } -if (isset($_POST['edit_ticket_template_task'])) { - - validateCSRFToken(); - - enforceUserPermission('module_support', 2); - - $task_template_id = intval($_POST['task_template_id']); - $task_name = escapeSql($_POST['name']); - $task_order = intval($_POST['order']); - $task_completion_estimate = intval($_POST['completion_estimate']); - - mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name', task_template_order = $task_order, task_template_completion_estimate = $task_completion_estimate WHERE task_template_id = $task_template_id"); - - logAudit("Task", "Edit", "$session_name edited task $task_name", 0, $task_template_id); - - flashAlert("Task " . stripslashes($task_name) . " saved"); - - redirect(); - -} - if (isset($_GET['delete_task'])) { validateCSRFToken(); diff --git a/agent/post/ticket.php b/agent/post/ticket.php index 80f4a8199..03bf7485e 100644 --- a/agent/post/ticket.php +++ b/agent/post/ticket.php @@ -138,8 +138,6 @@ if (isset($_POST['add_ticket'])) { foreach (parseSubmittedTasks() as $task) { mysqli_query($mysqli, "INSERT INTO tasks SET task_name = '{$task['name']}', task_order = {$task['order']}, task_completion_estimate = {$task['estimate']}, task_ticket_id = $ticket_id"); } - } else { - addTasksFromTicketTemplate($ticket_id, $ticket_template_id); } // Store any attached files against the ticket itself @@ -149,6 +147,12 @@ if (isset($_POST['add_ticket'])) { ticketSetOtherAssets($ticket_id, $other_asset_ids); tagSetForRecord('ticket', $ticket_id, (array) ($_POST['tags'] ?? [])); + // Raised from a template - kept for the template's use, and its [Client] and the like filled in. + // The form had the template's fields in it already, so nothing more is added here. + if ($ticket_template_id) { + ticketTemplateFinish($ticket_id, $ticket_template_id, false, !isset($_POST['tasks_submitted'])); + } + // Raised about a service - from the service page's "Report a problem" foreach (array_unique(array_map('intval', (array) ($_POST['service_ids'] ?? []))) as $service_id) { $service = serviceRow($service_id); @@ -900,15 +904,13 @@ if (isset($_POST['bulk_add_asset_ticket'])) { $ticket_prefix = escapeSql($config_ticket_prefix); // A template fills in what was left empty - if ($ticket_template_id) { - $template = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT ticket_template_details, ticket_template_subject FROM ticket_templates WHERE ticket_template_id = $ticket_template_id")); - if ($template) { - $subject_input = $subject_input !== '' ? $subject_input : (string) $template['ticket_template_subject']; - $details = $details !== '' ? $details : mysqli_real_escape_string($mysqli, (string) $template['ticket_template_details']); - } + $template = ticketTemplateRow($ticket_template_id); + if ($template) { + $subject_input = $subject_input !== '' ? $subject_input : (string) $template['ticket_template_subject']; + $details = $details !== '' ? $details : mysqli_real_escape_string($mysqli, (string) $template['ticket_template_details']); } - $count = 0; + $ticket_ids = []; foreach (array_unique(array_map('intval', (array) ($_POST['asset_ids'] ?? []))) as $asset_id) { $asset = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT asset_client_id, asset_name, asset_contact_id, asset_location_id FROM assets WHERE asset_id = $asset_id")); if (!$asset) { @@ -921,7 +923,8 @@ if (isset($_POST['bulk_add_asset_ticket'])) { $contact_id = ticketClientOwnedId('contact', $asset['asset_contact_id'], $client_id); $location_id = ticketClientOwnedId('location', $asset['asset_location_id'], $client_id); $project_id = ticketClientOwnedId('project', $project_input, $client_id); - $subject = escapeSql(mb_substr($asset['asset_name'] . ' - ' . $subject_input, 0, 500)); + // The asset's name goes in front - unless the subject says where, with [Asset] + $subject = escapeSql(mb_substr(stripos($subject_input, '[asset]') !== false ? $subject_input : $asset['asset_name'] . ' - ' . $subject_input, 0, 500)); mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = LAST_INSERT_ID(config_ticket_next_number), config_ticket_next_number = config_ticket_next_number + 1 WHERE company_id = 1"); $ticket_number = mysqli_insert_id($mysqli); @@ -934,18 +937,26 @@ if (isset($_POST['bulk_add_asset_ticket'])) { $ticket_id = mysqli_insert_id($mysqli); applyTicketSla($ticket_id); - // Tasks from the modal, then the template's + // Tasks from the modal, then the template's - its tags and due time too, and [Asset] filled in foreach ((array) ($_POST['tasks'] ?? []) as $task) { $task_name = escapeSql(mb_substr(trim((string) $task), 0, 255)); if ($task_name !== '') { mysqli_query($mysqli, "INSERT INTO tasks SET task_name = '$task_name', task_ticket_id = $ticket_id"); } } - addTasksFromTicketTemplate($ticket_id, $ticket_template_id); + if ($template) { + ticketTemplateFinish($ticket_id, $ticket_template_id, true, true); + } logAudit("Ticket", "Create", "$session_name created ticket $ticket_prefix$ticket_number - $subject", $client_id, $ticket_id); triggerCustomAction('ticket_create', $ticket_id); - $count++; + $ticket_ids[] = $ticket_id; + } + $count = count($ticket_ids); + + // The agent they went to hears once, about all of them + if ($ticket_ids && $assigned_to) { + ticketMailAssigned($assigned_to, $ticket_ids, stripslashes($session_name)); } logAudit("Ticket", "Bulk Create", "$session_name created $count ticket(s) for the assets picked"); diff --git a/agent/tickets.php b/agent/tickets.php index 315276b67..281bfb1a6 100644 --- a/agent/tickets.php +++ b/agent/tickets.php @@ -536,15 +536,16 @@ $export_extra = [ ?>
- +