Skip to content

Commit ed56f22

Browse files
uds5501iamareebjamal
authored andcommitted
feat: modify cancel notif message and add required links (#6084)
1 parent 6b17f92 commit ed56f22

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

app/api/helpers/notification.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from app.api.helpers.db import save_to_db
44
from app.api.helpers.log import record_activity
5+
from app.api.helpers.files import make_frontend_url
56
from app.api.helpers.system_notifications import NOTIFS, get_event_exported_actions, get_event_imported_actions, \
67
get_monthly_payment_notification_actions, get_monthly_payment_follow_up_notification_actions, \
78
get_ticket_purchased_attendee_notification_actions, get_ticket_purchased_notification_actions, \
@@ -279,18 +280,25 @@ def send_notif_ticket_cancel(order):
279280
),
280281
message=NOTIFS[TICKET_CANCELLED]['message'].format(
281282
cancel_note=order.cancel_note,
282-
event_name=order.event.name
283+
event_name=order.event.name,
284+
event_url=make_frontend_url('/e/{identifier}'.format(identifier=order.event.identifier)),
285+
order_url=make_frontend_url('/orders/{identifier}/view'.format(identifier=order.identifier)),
286+
invoice_id=order.invoice_number
283287
)
284288
)
285289
for organizer in order.event.organizers:
286290
send_notification(
287291
user=organizer,
288292
title=NOTIFS[TICKET_CANCELLED_ORGANIZER]['title'].format(
289-
invoice_id=order.invoice_number
293+
invoice_id=order.invoice_number,
294+
event_name=order.event.name
290295
),
291296
message=NOTIFS[TICKET_CANCELLED_ORGANIZER]['message'].format(
292297
cancel_note=order.cancel_note,
293-
invoice_id=order.invoice_number
298+
invoice_id=order.invoice_number,
299+
event_name=order.event.name,
300+
cancel_order_page=make_frontend_url('/events/{identifier}/tickets/orders/cancelled'
301+
.format(identifier=order.event.identifier))
294302
)
295303
)
296304

app/api/helpers/system_notifications.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,16 +350,19 @@ def get_invite_papers_notification_actions(cfs_link, submit_link):
350350
'recipient': 'User',
351351
'title': u'Your order for {event_name} has been cancelled ({invoice_id})',
352352
'message': (
353-
u"Your order for {event_name} has been cancelled by the organizer" +
354-
u"<br/>Please contact the organizer for more info" +
353+
u"Your order for <a href='{event_url}'>{event_name}</a> has been cancelled by the organizer " +
354+
u"<br/>You can visit your cancelled ticket here : <a href='{order_url}'>{invoice_id}</a> " +
355+
u"<br/>Please contact the organizer for more info " +
355356
u"<br/>Message from the organizer: {cancel_note}."
356357
)
357358
},
358359
TICKET_CANCELLED_ORGANIZER: {
359360
'recipient': 'User',
360-
'title': u'Order ({invoice_id}) has been cancelled',
361+
'title': u'Order ({invoice_id}) of {event_name} has been cancelled',
361362
'message': (
362-
u"Order ({invoice_id}) has been cancelled" +
363+
u"Order ({invoice_id}) has been cancelled " +
364+
u"Please visit the link to check the cancelled orders for this event:" +
365+
u" <a href='{cancel_order_page}'>{event_name}</a> " +
363366
u"<br/>Cancel Note: {cancel_note}."
364367
)
365368
},

0 commit comments

Comments
 (0)