ledger.email: fix failure to send due to subject length

dbca-wa · Mar 20, 2018 · ac4dbd9 · ac4dbd9
1 parent 3b41a81
commit ac4dbd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ledger/ledger_email.py b/ledger/ledger_email.py
@@ -12,12 +12,12 @@ def _send(self, email_message):
             return False
         encoding = email_message.encoding or settings.DEFAULT_CHARSET
         from_email = sanitize_address(email_message.from_email, encoding)
-        message = email_message.message()
         if not settings.PRODUCTION_EMAIL:
             recipients = settings.NON_PROD_EMAIL.split(',')
-            message['Subject'] = '{} {}'.format(message.get('Subject'),settings.EMAIL_INSTANCE)
+            email_message.subject = '{} {}'.format(email_message.subject, settings.EMAIL_INSTANCE)
         else:
             recipients = [sanitize_address(addr, encoding) for addr in email_message.recipients()]
+        message = email_message.message()
 
         try:
             self.connection.sendmail(from_email, recipients, message.as_bytes(linesep='\r\n'))

diff --git a/parkstay/emails.py b/parkstay/emails.py
@@ -95,7 +95,7 @@ def send_booking_confirmation(booking,request):
 
 def send_booking_cancelation(booking,request):
     email_obj = TemplateEmailBase()
-    email_obj.subject = 'Canceled:your booking REF {} at {},{}.'.format(booking.confirmation_number,booking.campground.name,booking.campground.park.name)
+    email_obj.subject = 'Cancelled: your booking {} at {}'.format(booking.confirmation_number,booking.campground.name)
     email_obj.html_template = 'ps/email/cancel.html'
     email_obj.txt_template = 'ps/email/cancel.txt'