Added additional variable for linking to static assets in HTML emails

oscar/apps/customer/abstract_models.py

@@ -2,6 +2,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.template import Template, Context, TemplateDoesNotExist
 from django.template.loader import get_template
+from django.conf import settings
 
 from oscar.apps.customer.managers import CommunicationTypeManager
 
@@ -70,6 +71,10 @@ class AbstractCommunicationEventType(models.Model):
         """
         if ctx is None:
             ctx = {}
+
+        # Pass base URL for serving images within HTML emails
+        ctx['static_base_url'] = getattr(settings, 'OSCAR_STATIC_BASE_URL', None)
+
         code = self.code.lower()
         # Build a dict of message name to Template instance
         templates = {'subject': 'email_subject_template',

oscar/management/commands/oscar_generate_email_content.py

@@ -21,5 +21,5 @@ class Command(BaseCommand):
             raise CommandError("No order found with number %s" % args[1])
         
         messages = CommunicationEventType.objects.get_and_render(args[0], {'order': order})
-        print "Subject: %s\nBody:\n\n%sBody HTML:\n\n%s"% (
+        print "Subject: %s\nBody:\n\n%s\nBody HTML:\n\n%s"% (
             messages['subject'], messages['body'], messages['html'])