From 5baae71dc7f8ead529732c75ac06f5a72b7d081e Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Sat, 11 Jan 2025 19:33:48 +0000
Subject: [PATCH 1/2] Auto-acknowledgement email for email parsed tickets now
 contains guest link

---
 CHANGELOG.md                         | 1 +
 scripts/cron_ticket_email_parser.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13aca7ae..df060d6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to ITFlow will be documented in this file.
 - 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
 
 ## 24.12
 
diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php
index 1824bd33..c73679d5 100644
--- a/scripts/cron_ticket_email_parser.php
+++ b/scripts/cron_ticket_email_parser.php
@@ -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,

From 2ca92744f32b7eaddfee979c7270312662aafcf3 Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Sat, 11 Jan 2025 19:40:36 +0000
Subject: [PATCH 2/2] mv

---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df060d6f..ebbc8deb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +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
-- Auto-acknowledgement email for email parsed tickets now contains guest link
+- Bugfix: Tickets created via portal/email not being marked as billable
 
 ## 24.12