From 28ce4d98016ba71fa43b521ddcba25fbc28371cb Mon Sep 17 00:00:00 2001
From: Suneet Srivastava <suneetbond91@gmail.com>
Date: Sun, 8 Dec 2019 20:07:50 +0530
Subject: [PATCH] fix: canceled order mail template changed (#6643)

---
 app/api/helpers/mail.py         | 11 +++++++----
 app/api/helpers/system_mails.py | 12 +++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/api/helpers/mail.py b/app/api/helpers/mail.py
index 8cd2d681f1..17d8352fab 100644
--- a/app/api/helpers/mail.py
+++ b/app/api/helpers/mail.py
@@ -363,18 +363,21 @@ def send_email_to_attendees(order, purchaser_id, attachments=None):
 
 
 def send_order_cancel_email(order):
+    cancel_msg = ''
+    if order.cancel_note:
+        cancel_msg = u"<br/>Message from the organizer: {cancel_note}".format(cancel_note=order.cancel_note)
+
     send_email(
         to=order.user.email,
         action=TICKET_CANCELLED,
         subject=MAILS[TICKET_CANCELLED]['subject'].format(
             event_name=order.event.name,
             invoice_id=order.invoice_number,
-            frontend_url=get_settings()['frontend_url']
         ),
         html=MAILS[TICKET_CANCELLED]['message'].format(
             event_name=order.event.name,
-            order_url=make_frontend_url('/orders/{identifier}'.format(identifier=order.identifier)),
-            cancel_note=order.cancel_note,
-            frontend_url=get_settings()['frontend_url']
+            frontend_url=get_settings()['frontend_url'],
+            cancel_msg=cancel_msg,
+            app_name=get_settings()['app_name']
         )
     )
diff --git a/app/api/helpers/system_mails.py b/app/api/helpers/system_mails.py
index 1d2a824e42..2371bef355 100644
--- a/app/api/helpers/system_mails.py
+++ b/app/api/helpers/system_mails.py
@@ -186,11 +186,13 @@
         'recipient': 'User',
         'subject': u'Your order for {event_name} has been cancelled ({invoice_id})',
         'message': (
-            u"Hi,Your order for {event_name} has been cancelled has been cancelled by the organizer"
-            u"<br/>Please contact the organizer for more info" +
-            u"<br/>Message from the organizer: {cancel_note}"
-            u"<br/> <a href='{order_url}'>Click here</a> to view/download the invoice."
-            u"<br/>Login to manage the orders at {frontend_url} </em>"
+            u"Hello,"
+            u"<br/>your order for {event_name} has been cancelled by the organizer."
+            u"<br/>Please contact the organizer for more info." +
+            u"{cancel_msg}"
+            u"<br/>To manage orders please login to {frontend_url} and visit \"My Tickets\"."
+            u"<br/>Best regards,"
+            u"<br/>{app_name} Team"
         )
     },
     EVENT_EXPORTED: {