rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-25 22:22:26 +00:00
Code Issues Releases Wiki Activity

Move both send_mail utils to same file

Browse source
This commit is contained in:
Jean-Romain Garnier 2020-04-19 21:15:07 +02:00 committed by Gabriel Detraz
parent cd097cd428
commit 6900c153d1
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cotisations/utils.py
View file

@ -23,9 +23,7 @@ import os
from django.template.loader import get_template from django.template.loader import get_template
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
from django.utils.translation import ugettext_lazy as _ from re2o.mail_utils import send_mail_object
from django.contrib import messages
from smtplib import SMTPException
from .tex import create_pdf from .tex import create_pdf
from preferences.models import AssoOption, GeneralOption, CotisationsOption, Mandate from preferences.models import AssoOption, GeneralOption, CotisationsOption, Mandate
@ -46,20 +44,6 @@ def find_payment_method(payment):
return None return None
def send_mail(mail, request):
"""Wrapper for Django's EmailMessage.send which handles errors"""
try:
mail.send()
except (SMTPException, ConnectionError) as e:
if request:
messages.error(
request,
_("Failed to send email: %(error)s.") % {
"error": e,
},
)
def send_mail_invoice(invoice, request=None): def send_mail_invoice(invoice, request=None):
"""Creates the pdf of the invoice and sends it by email to the client""" """Creates the pdf of the invoice and sends it by email to the client"""
purchases_info = [] purchases_info = []
@ -108,7 +92,7 @@ def send_mail_invoice(invoice, request=None):
attachments=[("invoice.pdf", pdf, "application/pdf")], attachments=[("invoice.pdf", pdf, "application/pdf")],
) )
send_mail(mail, request) send_mail_object(mail, request)
def send_mail_voucher(invoice, request=None): def send_mail_voucher(invoice, request=None):
@ -145,4 +129,4 @@ def send_mail_voucher(invoice, request=None):
attachments=[("voucher.pdf", pdf, "application/pdf")], attachments=[("voucher.pdf", pdf, "application/pdf")],
) )
send_mail(mail, request) send_mail_object(mail, request)

14
re2o/mail_utils.py
View file

@ -43,3 +43,17 @@ def send_mail(request, *args, **kwargs):
"error": e, "error": e,
}, },
) )
def send_mail_object(mail, request):
"""Wrapper for Django's EmailMessage.send which handles errors"""
try:
mail.send()
except (SMTPException, ConnectionError) as e:
if request:
messages.error(
request,
_("Failed to send email: %(error)s.") % {
"error": e,
},
)