fix: canceled order mail template changed #6643

codedsun · 2019-12-06T20:06:04Z

Fixes #6642

Short description of what this resolves:

fix: canceled order mail template changed

Checklist

I have read the Contribution & Best practices Guide and my PR follows them.
My branch is up-to-date with the Upstream development branch.
The unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

All the functions created/modified in this PR contain relevant docstrings.

codedsun · 2019-12-06T20:16:13Z

@prateekj117 @iamareebjamal Review if possible!

codecov · 2019-12-06T20:16:17Z

Codecov Report

Merging #6643 into development will decrease coverage by 0.01%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##           development    #6643      +/-   ##
===============================================
- Coverage        65.35%   65.34%   -0.02%     
===============================================
  Files              298      298              
  Lines            15240    15243       +3     
===============================================
  Hits              9960     9960              
- Misses            5280     5283       +3

Impacted Files	Coverage Δ
app/api/helpers/system_mails.py	`100% <ø> (ø)`	⬆️
app/api/helpers/mail.py	`28.43% <0%> (-0.87%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5e6cc2c...675b9d7. Read the comment docs.

iamareebjamal · 2019-12-06T20:26:22Z

app/api/helpers/system_mails.py

+            u"<br/>Please contact the organizer for more info." +
+            u"<br/>To manage orders please login to {frontend_url} and visit \"My Tickets\"."
+            u"<br/>Best regards,"
+            u"<br/>Eventyay Team"


Suggested change

u"<br/>Eventyay Team"

u"<br/>Eventyay Team"

See the repository name

kushthedude · 2019-12-06T22:40:59Z

app/api/helpers/mail.py

@@ -369,12 +369,9 @@ def send_order_cancel_email(order):
        subject=MAILS[TICKET_CANCELLED]['subject'].format(
            event_name=order.event.name,
            invoice_id=order.invoice_number,
-            frontend_url=get_settings()['frontend_url']


How is this field utilized in the subject, I didn't see it used anywhere in the text

app/api/helpers/mail.py

codedsun · 2019-12-07T06:44:15Z

Review this!

iamareebjamal · 2019-12-07T06:48:54Z

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)


if the cancel_note is not none then Message from the organizer should go in the email or not? I tried this way

Is the way of doing this wrong or something else you wanted to say?

codedsun · 2019-12-08T13:44:40Z

I have updated the branch, if it's okay. Please merge. Thanks

auto-label bot added the fix label Dec 6, 2019

codedsun force-pushed the cancel-order branch from 5450574 to ade1b09 Compare December 6, 2019 20:07

iamareebjamal reviewed Dec 6, 2019

View reviewed changes

kushthedude reviewed Dec 6, 2019

View reviewed changes

codedsun force-pushed the cancel-order branch from ade1b09 to b5c9f55 Compare December 7, 2019 06:38

houndci-bot reviewed Dec 7, 2019

View reviewed changes

app/api/helpers/mail.py Outdated Show resolved Hide resolved

codedsun force-pushed the cancel-order branch from b5c9f55 to f4c3754 Compare December 7, 2019 06:39

houndci-bot reviewed Dec 7, 2019

View reviewed changes

app/api/helpers/mail.py Outdated Show resolved Hide resolved

fix: canceled order mail template changed

16348c1

codedsun force-pushed the cancel-order branch from f4c3754 to 16348c1 Compare December 7, 2019 06:40

iamareebjamal reviewed Dec 7, 2019

View reviewed changes

iamareebjamal approved these changes Dec 7, 2019

View reviewed changes

Merge branch 'development' into cancel-order

675b9d7

iamareebjamal merged commit 23a8e17 into fossasia:development Dec 8, 2019

codedsun added a commit to codedsun/open-event-server that referenced this pull request Dec 22, 2019

fix: canceled order mail template changed (fossasia#6643)

28ce4d9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: canceled order mail template changed #6643

fix: canceled order mail template changed #6643

codedsun commented Dec 6, 2019

codedsun commented Dec 6, 2019

codecov bot commented Dec 6, 2019 •

edited

iamareebjamal Dec 6, 2019

kushthedude Dec 6, 2019

codedsun Dec 7, 2019

iamareebjamal Dec 7, 2019

codedsun Dec 7, 2019

codedsun commented Dec 7, 2019

iamareebjamal Dec 7, 2019

codedsun Dec 7, 2019 •

edited

codedsun Dec 7, 2019

iamareebjamal Dec 7, 2019

codedsun commented Dec 8, 2019

fix: canceled order mail template changed #6643

fix: canceled order mail template changed #6643

Conversation

codedsun commented Dec 6, 2019

Short description of what this resolves:

Checklist

codedsun commented Dec 6, 2019

codecov bot commented Dec 6, 2019 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codedsun commented Dec 7, 2019

Choose a reason for hiding this comment

codedsun Dec 7, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codedsun commented Dec 8, 2019

codecov bot commented Dec 6, 2019 •

edited

codedsun Dec 7, 2019 •

edited