mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-29 03:12:15 +00:00
Send HTML confirmation emails.
Also tidy up the PDF and some of the source.
This commit is contained in:
@@ -341,7 +341,6 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
|
|||||||
external_styles=css).transform()
|
external_styles=css).transform()
|
||||||
msg.attach_alternative(html, 'text/html')
|
msg.attach_alternative(html, 'text/html')
|
||||||
|
|
||||||
|
|
||||||
msg.send()
|
msg.send()
|
||||||
|
|
||||||
return super(EventAuthorisationRequest, self).form_valid(form)
|
return super(EventAuthorisationRequest, self).form_valid(form)
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ from io import BytesIO
|
|||||||
import reversion
|
import reversion
|
||||||
from PyPDF2 import PdfFileReader, PdfFileMerger
|
from PyPDF2 import PdfFileReader, PdfFileMerger
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.mail import EmailMessage
|
from django.contrib.staticfiles.storage import staticfiles_storage
|
||||||
|
from django.core.mail import EmailMessage, EmailMultiAlternatives
|
||||||
from django.template.loader import get_template
|
from django.template.loader import get_template
|
||||||
|
from premailer import Premailer
|
||||||
from z3c.rml import rml2pdf
|
from z3c.rml import rml2pdf
|
||||||
|
|
||||||
from RIGS import models
|
from RIGS import models
|
||||||
@@ -47,18 +49,26 @@ def send_eventauthorisation_success_email(instance):
|
|||||||
'object': instance,
|
'object': instance,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if instance.email == instance.event.person.email:
|
||||||
|
context['to_name'] = instance.event.person.name
|
||||||
|
|
||||||
subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
|
subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
|
||||||
|
|
||||||
client_email = EmailMessage(
|
client_email = EmailMultiAlternatives(
|
||||||
subject,
|
subject,
|
||||||
get_template("RIGS/eventauthorisation_client_success.txt").render(context),
|
get_template("RIGS/eventauthorisation_client_success.txt").render(context),
|
||||||
to=[instance.email],
|
to=[instance.email],
|
||||||
reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
|
reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
css = staticfiles_storage.path('css/email.css')
|
||||||
|
html = Premailer(get_template("RIGS/eventauthorisation_client_success.html").render(context),
|
||||||
|
external_styles=css).transform()
|
||||||
|
client_email.attach_alternative(html, 'text/html')
|
||||||
|
|
||||||
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name)
|
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name)
|
||||||
|
|
||||||
client_email.attach('N%05d - %s - RECEIPT.pdf' % (instance.event.pk, escapedEventName),
|
client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName),
|
||||||
merged.getvalue(),
|
merged.getvalue(),
|
||||||
'application/pdf'
|
'application/pdf'
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -193,7 +193,7 @@
|
|||||||
<keepTogether>
|
<keepTogether>
|
||||||
<blockTable style="totalTable" colWidths="300,115,80">
|
<blockTable style="totalTable" colWidths="300,115,80">
|
||||||
<tr>
|
<tr>
|
||||||
<td>{% if not invoice %}VAT Registration Number: 170734807{% endif %}</td>
|
<td>{% if quote %}VAT Registration Number: 170734807{% endif %}</td>
|
||||||
<td>Total (ex. VAT)</td>
|
<td>Total (ex. VAT)</td>
|
||||||
<td>£ {{ object.sum_total|floatformat:2 }}</td>
|
<td>£ {{ object.sum_total|floatformat:2 }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
23
RIGS/templates/RIGS/eventauthorisation_client_success.html
Normal file
23
RIGS/templates/RIGS/eventauthorisation_client_success.html
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{% extends 'base_client_email.html' %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="col-sm-12">
|
||||||
|
<p>Hi {{ to_name|default:"there" }},</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Your event N{{ object.event.pk|stringformat:"05d" }} has been successfully authorised
|
||||||
|
for {{ object.amount }}
|
||||||
|
by {{ object.name }} as of {{ object.last_edited_at }}.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
{% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
|
||||||
|
Your event is now fully booked and payment will be processed by the finance department automatically.
|
||||||
|
{% else %}{# external #}
|
||||||
|
Your event is now fully booked and our finance department will be contact to arrange payment.
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>TEC PA & Lighting</p>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
Hi there,
|
Hi {{ to_name|default:"there" }},
|
||||||
|
|
||||||
Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for {{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
|
Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for {{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
|
||||||
|
|
||||||
{% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
|
{% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
|
||||||
Your event is now fully booked and payment will be processed by the finance department automatically.
|
Your event is now fully booked and payment will be processed by the finance department automatically.
|
||||||
@@ -8,4 +8,4 @@ Your event is now fully booked and payment will be processed by the finance depa
|
|||||||
Your event is now fully booked and our finance department will be contact to arrange payment.
|
Your event is now fully booked and our finance department will be contact to arrange payment.
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
The TEC Rig Information Gathering System
|
TEC PA & Lighting
|
||||||
|
|||||||
Reference in New Issue
Block a user