diff --git a/busManager/coord/email_helpers.py b/busManager/coord/email_helpers.py index df82698..c32a1c5 100644 --- a/busManager/coord/email_helpers.py +++ b/busManager/coord/email_helpers.py @@ -10,10 +10,9 @@ from .models import Company, School, Setting from .context_helpers import bus_roll_context, emergency_contacts_context, school_roll_context -def _getBCC(): - address = Setting.objects.filter(name="MAIL_BCC") - if address.exists(): - return [address.first().value] +def _getBCC(request): + if request.user.email: + return [request.user.email] return [] @@ -47,7 +46,7 @@ def email_companies_bus_roll(request, query_set=None): message = f"A new bus roll for {company.name} has been generated" email_from = "bus.manager@education.vic.gov.au" recipient = [company.contact_email] - email = EmailMessage(subject, message, email_from, recipient, _getBCC()) + email = EmailMessage(subject, message, email_from, recipient, _getBCC(request)) email.attach(f"school_bus_roll_{date.today()}.pdf", pdf.content) email.send(fail_silently=True) @@ -75,7 +74,7 @@ def email_companies_emergency_contacts(request, query_set=None): message = f"A new emergency contact list for {company.name} has been generated" email_from = "bus.manager@education.vic.gov.au" recipient = [company.contact_email] - email = EmailMessage(subject, message, email_from, recipient, _getBCC()) + email = EmailMessage(subject, message, email_from, recipient, _getBCC(request)) email.attach(f"school_bus_roll_{date.today()}.pdf", pdf.content) email.send(fail_silently=True) @@ -102,7 +101,7 @@ def email_school_roll(request, query_set): message = f"A new bus roll for {school.name} has been generated" email_from = "bus.manager@education.vic.gov.au" recipient = [school.email] - email = EmailMessage(subject, message, email_from, recipient, _getBCC()) + email = EmailMessage(subject, message, email_from, recipient, _getBCC(request)) email.attach(f"school_bus_roll_{date.today()}.pdf", pdf.content) email.send(fail_silently=True)