diff --git a/apps/news/tasks.py b/apps/news/tasks.py index 99065fc8..beed2060 100644 --- a/apps/news/tasks.py +++ b/apps/news/tasks.py @@ -1,3 +1,5 @@ +from datetime import datetime + from celery import shared_task from django.core.mail import send_mail from notification.models import Subscriber @@ -5,24 +7,30 @@ from news import models from django.template.loader import render_to_string from django.conf import settings from smtplib import SMTPException +from django.template.loader import get_template @shared_task def send_email_with_news(news_ids): - subscribers = Subscriber.objects.filter(state=Subscriber.USABLE) sent_news = models.News.objects.filter(id__in=news_ids) - + htmly = get_template(settings.NEWS_EMAIL_TEMPLATE) + year = datetime.now().year for s in subscribers: try: for n in sent_news: - send_mail("G&M News", render_to_string(settings.NEWS_EMAIL_TEMPLATE, - {"title": n.title.get(s.locale), - "subtitle": n.subtitle.get(s.locale), - "description": n.description.get(s.locale), - "code": s.update_code, - "domain_uri": settings.DOMAIN_URI, - "country_code": s.country_code}), - settings.EMAIL_HOST_USER, [s.send_to], fail_silently=False) + context = {"title": n.title.get(s.locale), + "subtitle": n.subtitle.get(s.locale), + "description": n.description.get(s.locale), + "code": s.update_code, + "image_url": n.image_url, + "domain_uri": settings.DOMAIN_URI, + "slug": n.slug, + "country_code": s.country_code, + "send_to": s.send_to, + "year": year} + send_mail("G&M News", render_to_string(settings.NEWS_EMAIL_TEMPLATE, context), + settings.EMAIL_HOST_USER, [s.send_to], fail_silently=False, + html_message=htmly.render(context)) except SMTPException: continue diff --git a/project/templates/news/news_email.html b/project/templates/news/news_email.html index a47af685..dd4dea5b 100644 --- a/project/templates/news/news_email.html +++ b/project/templates/news/news_email.html @@ -1,20 +1,79 @@ - + + + + {{ title }} - -

{{ title }}

+ +
- {% if subtitle %} -

{{ subtitle }}

- {% endif %} +
-

{{ description }}

-https://{{ country_code }}.{{ domain_uri }}{% url 'web:notification:unsubscribe' code %} +
+
+
+
+
+ + +
+
+ {{ title }} +
+ {% if not image_url is None %} +
+ +
+ {% endif %} +
+ {{ description | safe }} +
+ + + +
+ +
+ This email has been sent to {{ send_to }} , + click here to unsubscribe +
+
+ +
GaultMillau © {{ year }}
+
+
+
+
-