diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php index b1ed8563..f4e7d3aa 100644 --- a/inc/email_functions.inc.php +++ b/inc/email_functions.inc.php @@ -652,9 +652,10 @@ function hesk_getEmailSubject($eml_file, $ticket = '', $is_ticket = 1, $strip = } /* Set status */ - $statusRs = hesk_dbQuery("SELECT `Key` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` WHERE `ID` = " . $ticket['status']); + $statusRs = hesk_dbQuery("SELECT `text` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "text_to_status_xref` + WHERE `status_id` = " . $ticket['status'] . " AND `language` = '". hesk_dbEscape($hesklang['LANGUAGE']) ."'"); $row = hesk_dbFetchAssoc($statusRs); - $ticket['status'] = $hesklang[$row['Key']]; + $ticket['status'] = $row['text']; /* Replace all special tags */ $msg = str_replace('%%SUBJECT%%', $ticket['subject'], $msg); @@ -815,9 +816,10 @@ function hesk_processMessage($msg, $ticket, $is_admin, $is_ticket, $just_message $ticket['owner'] = hesk_msgToPlain(hesk_getOwnerName($ticket['owner']), 1); /* Set status */ - $statusRs = hesk_dbQuery("SELECT `Key` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` WHERE `ID` = " . $ticket['status']); + $statusRs = hesk_dbQuery("SELECT `text` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "text_to_status_xref` + WHERE `status_id` = " . $ticket['status'] . " AND `language` = '". hesk_dbEscape($hesklang['LANGUAGE']) ."'"); $row = hesk_dbFetchAssoc($statusRs); - $ticket['status'] = $hesklang[$row['Key']]; + $ticket['status'] = $row['text']; /* Replace all special tags */ $msg = str_replace('%%NAME%%', $ticket['name'], $msg); diff --git a/language/en/emails/html/new_ticket.txt b/language/en/emails/html/new_ticket.txt index 4b2816a6..03ba561e 100644 --- a/language/en/emails/html/new_ticket.txt +++ b/language/en/emails/html/new_ticket.txt @@ -2,9 +2,9 @@

Your support ticket "%%SUBJECT%%" has been submitted.

We reply to all tickets as soon as possible, within 24 to 48 hours. If we expect your ticket will take additional time, we will update you by sending you an email.

Ticket tracking ID: %%TRACK_ID%%

-

You can view the status of your ticket here: -%%TRACK_URL%%

+

You can view the status of your ticket here: %%TRACK_URL%%

You will receive an email notification when our staff replies to your ticket.

Sincerely,

-%%SITE_TITLE%%
-%%SITE_URL%% \ No newline at end of file +

%%SITE_TITLE%%
%%SITE_URL%%

+

 

+

Ticket Status: %%STATUS%%

\ No newline at end of file diff --git a/language/en/text.php b/language/en/text.php index a30dafe3..d32a2868 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -576,7 +576,7 @@ $hesklang['add_ticket_your_message']='Your Message'; // EMAIL SUBJECTS $hesklang['new_ticket_staff'] = '[#%%TRACK_ID%%] New ticket: %%SUBJECT%%'; -$hesklang['ticket_received'] = '[#%%TRACK_ID%%] Ticket received: %%SUBJECT%%'; +$hesklang['ticket_received'] = '[#%%TRACK_ID%%] Ticket received: %%SUBJECT%%; Status: %%STATUS%%'; $hesklang['ticket_assigned_to_you'] = '[#%%TRACK_ID%%] Ticket assigned: %%SUBJECT%%'; $hesklang['new_reply_by_customer'] = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%'; $hesklang['new_reply_by_staff'] = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%';