Merge branch 'develop' of github.com:itflow-org/itflow into develop

This commit is contained in:
johnnyq 2025-01-11 14:49:14 -05:00
commit 08b91ead25
2 changed files with 6 additions and 5 deletions

View File

@ -4,15 +4,16 @@ All notable changes to ITFlow will be documented in this file.
## 25.1
- Moved cron/cli scripts to scripts subfolder - Old scripts remain in the root for now, but please update your cron configurations!
- Admin pages now once again use the new admin role-check
- Debug now shows the current git branch
- Individual POST handler logic pages can no longer be accessed directly
- Auto-acknowledgement email for email parsed tickets now contains guest link
- Bugfix: Ticket edit modal not showing multi-client/no-client projects
- Bugfix: Asset interface losing DHCP setting
- Bugfix: Editing / creating recurring expenses results in error 500 due to incorrect var name
- Bugfix: Recurring tickets no longer require a contact
- Bugfix: Stripe online payment setup now prompts you to set the income/expense account
- Bugfix: Tickets created via portal/email not being marked as billable
- Admin pages now once again use the new admin role-check
- Debug now shows the current git branch
- Individual POST handler logic pages can no longer be accessed directly
- Bugfix: Tickets created via portal/email not being marked as billable
## 24.12

View File

@ -155,7 +155,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
$data = [];
if ($config_ticket_client_general_notifications == 1) {
$subject_email = "Ticket created - [$config_ticket_prefix$ticket_number] - $subject";
$body = "<i style='color: #808080'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.<br><br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $subject<br>Status: New<br>https://$config_base_url/portal/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
$body = "<i style='color: #808080'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.<br><br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $subject<br>Status: New<br>Portal: <a href='https://$config_base_url/guest_view_ticket.php?ticket_id=$id&url_key=$url_key'>View ticket</a><br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
$data[] = [
'from' => $config_ticket_from_email,
'from_name' => $config_ticket_from_name,