Update PDF templates and enable sending of PDF via email.

PDFs now state QUOTE, INVOICE or RECEIPT.
Single copy and all but INVOICE includes terms of hire.

RIGS/rigboard.py

@@ -145,33 +145,26 @@ class EventPrint(generic.View):
     def get(self, request, pk):
         object = get_object_or_404(models.Event, pk=pk)
         template = get_template('RIGS/event_print.xml')
-        copies = ('TEC', 'Client')
 
         merger = PdfFileMerger()
 
-        for copy in copies:
-            context = RequestContext(request, {  # this should be outside the loop, but bug in 1.8.2 prevents this
-                'object': object,
-                'fonts': {
-                    'opensans': {
-                        'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
-                        'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
-                    }
-                },
-                'copy': copy,
-                'current_user': request.user,
-            })
+        context = RequestContext(request, {  # this should be outside the loop, but bug in 1.8.2 prevents this
+            'object': object,
+            'fonts': {
+                'opensans': {
+                    'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
+                    'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
+                }
+            },
+            'quote': True,
+            'current_user': request.user,
+        })
 
-            # context['copy'] = copy # this is the way to do it once we upgrade to Django 1.8.3
+        rml = template.render(context)
 
-            rml = template.render(context)
-            buffer = StringIO.StringIO()
-
-            buffer = rml2pdf.parseString(rml)
-
-            merger.append(PdfFileReader(buffer))
-
-            buffer.close()
+        buffer = rml2pdf.parseString(rml)
+        merger.append(PdfFileReader(buffer))
+        buffer.close()
 
         terms = urllib2.urlopen(settings.TERMS_OF_HIRE_URL)
         merger.append(StringIO.StringIO(terms.read()))

RIGS/signals.py

@@ -1,33 +1,79 @@
-import reversion
-from django.conf import settings
+import cStringIO as StringIO
+import re
+import urllib2
+from io import BytesIO
 
+import reversion
+from PyPDF2 import PdfFileReader, PdfFileMerger
+from django.conf import settings
 from django.core.mail import EmailMessage
 from django.template.loader import get_template
+from z3c.rml import rml2pdf
 
 from RIGS import models
 
 
 def send_eventauthorisation_success_email(instance):
+    # Generate PDF first to prevent context conflicts
+    context = {
+        'object': instance.event,
+        'fonts': {
+            'opensans': {
+                'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
+                'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
+            }
+        },
+        'receipt': True,
+        'current_user': False,
+    }
+
+    template = get_template('RIGS/event_print.xml')
+    merger = PdfFileMerger()
+
+    rml = template.render(context)
+
+    buffer = rml2pdf.parseString(rml)
+    merger.append(PdfFileReader(buffer))
+    buffer.close()
+
+    terms = urllib2.urlopen(settings.TERMS_OF_HIRE_URL)
+    merger.append(StringIO.StringIO(terms.read()))
+
+    merged = BytesIO()
+    merger.write(merged)
+
+    # Produce email content
     context = {
         'object': instance,
     }
+
+    subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
+
     client_email = EmailMessage(
-        "N%05d | %s - Event Authorised".format(instance.event.pk, instance.event.name),
+        subject,
         get_template("RIGS/eventauthorisation_client_success.txt").render(context),
         to=[instance.email]
     )
 
+    escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name)
+
+    client_email.attach('N%05d - %s - RECEIPT.pdf' % (instance.event.pk, escapedEventName),
+                        merged.getvalue(),
+                        'application/pdf'
+                        )
+
     if instance.event.mic:
         mic_email_address = instance.event.mic.email
     else:
         mic_email_address = settings.AUTHORISATION_NOTIFICATION_ADDRESS
 
     mic_email = EmailMessage(
-        "N%05d | %s - Event Authorised".format(instance.event.pk, instance.event.name),
+        subject,
         get_template("RIGS/eventauthorisation_mic_success.txt").render(context),
         to=[mic_email_address]
     )
 
+    # Now we have both emails successfully generated, send them out
     client_email.send()
     mic_email.send()
 

RIGS/templates/RIGS/event_print.xml

@@ -22,21 +22,21 @@
         <paraStyle name="style.Heading2" fontName="OpenSans-Bold" fontSize="10" spaceAfter="2"/>
         <paraStyle name="style.Heading3" fontName="OpenSans" fontSize="10" spaceAfter="0"/>
         <paraStyle name="center" alignment="center"/>
-        <paraStyle name="invoice-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
+        <paraStyle name="page-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
 
         <paraStyle name="style.event_description" fontName="OpenSans" textColor="DarkGray" />
         <paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10" />
         <paraStyle name="style.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
         <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.invoice_titles" fontName="OpenSans-Bold" fontSize="10" />
-        <paraStyle name="style.invoice_numbers" fontName="OpenSans"  fontSize="10" />
+        <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
+        <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
 
         <blockTableStyle id="eventSpecifics">
             <blockValign value="top"/>
              <lineStyle kind="LINEAFTER" colorName="LightGrey" start="0,0" stop="1,0" thickness="1"/> 
         </blockTableStyle>
 
-        <blockTableStyle id="invoiceLayout">
+        <blockTableStyle id="headLayout">
             <blockValign value="top"/>
              
         </blockTableStyle>
@@ -100,10 +100,11 @@
                     
 
                     <setFont name="OpenSans" size="10" />
-                    {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />
-                    <drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
+                    <drawCenteredString x="302.5" y="26">
+                        [Paperwork generated{% if current_user %}by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
+                    </drawCenteredString>
                 </pageGraphics>
                 
                 <frame id="main" x1="50" y1="65" width="495" height="645"/>
@@ -118,7 +119,9 @@
                      {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />
-                    <drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
+                    <drawCenteredString x="302.5" y="26">
+                        [Paperwork generated{% if current_user %}by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
+                    </drawCenteredString>
                 </pageGraphics>
                 <frame id="main" x1="50" y1="65" width="495" height="727"/>
             </pageTemplate>
@@ -128,4 +131,4 @@
             {% include "RIGS/event_print_page.xml" %}
     </story>
 
-</document>
+</document>

RIGS/templates/RIGS/event_print_page.xml

@@ -1,59 +1,71 @@
 <setNextFrame name="main"/>
 <nextFrame/>
 
-{% if invoice %}
 
-<blockTable style="invoiceLayout" colWidths="330,165">
+<blockTable style="headLayout" colWidths="330,165">
 <tr>
     <td>
-        {% endif %}
+        <h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></h1>
 
-<h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></h1>
-
-<para style="style.event_description">
-<b>{{object.start_date|date:"D jS N Y"}}</b>
-</para>
-
-<keepInFrame>
-    <para style="style.event_description">
-    {{ object.description|default_if_none:""|linebreaksbr }}
+        <para style="style.event_description">
+        <b>{{object.start_date|date:"D jS N Y"}}</b>
         </para>
-</keepInFrame>
-
-{% if invoice %}
 
+        <keepInFrame>
+            <para style="style.event_description">
+            {{ object.description|default_if_none:""|linebreaksbr }}
+                </para>
+        </keepInFrame>
     </td>
     <td>
-        <para style="invoice-head">INVOICE</para>
-        <spacer length="10"/>
-        <blockTable style="eventDetails" colWidths="100,175">
-            <tr>
-                <td><para style="invoice_titles">Invoice Number</para></td>
-                <td>
-                    <para style="invoice_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
-                </td>
-            </tr>
-            <tr>
-                <td><para style="invoice_titles">Invoice Date</para></td>
-                <td>
-                    <para style="invoice_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
-                </td>
-            </tr>
-            <tr>
-                <td><para style="invoice_titles">PO Number</para></td>
-                <td>
-                    <para style="invoice_numbers">{{ object.purchase_order|default_if_none:"" }}</para>
-                </td>
-            </tr>
+        {% if invoice %}
+            <para style="page-head">INVOICE</para>
+            <spacer length="10"/>
+            <blockTable style="eventDetails" colWidths="100,175">
+                <tr>
+                    <td><para style="head_titles">Invoice Number</para></td>
+                    <td>
+                        <para style="head_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
+                    </td>
+                </tr>
+                <tr>
+                    <td><para style="head_titles">Invoice Date</para></td>
+                    <td>
+                        <para style="head_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
+                    </td>
+                </tr>
+                {% if object.purchase_order %}
+                    <tr>
+                        <td><para style="head_titles">PO Number</para></td>
+                        <td>
+                            <para style="head_numbers">{{ object.purchase_order|default_if_none:"" }}</para>
+                        </td>
+                    </tr>
+                {% endif %}
+            </blockTable>
 
-        </blockTable>
+        {% elif quote %}
+
+            <para style="page-head">QUOTE</para>
+            <spacer length="10"/>
+            <blockTable style="eventDetails" colWidths="100,175">
+                <tr>
+                    <td><para style="head_titles">Quote Date</para></td>
+                    <td>
+                        <para style="head_numbers">{% now "d/m/Y" %}</para>
+                    </td>
+                </tr>
+            </blockTable>
+
+        {% elif receipt %}
+
+            <para style="page-head">RECEIPT</para>
+
+        {% endif %}
     </td>
 </tr>
 </blockTable>
 
-
-{% endif %}
-
 <spacer length="15"/>
 <blockTable style="eventSpecifics" colWidths="165,165,165">
     <tr>
@@ -205,17 +217,7 @@
         <td>£ {{ object.vat|floatformat:2 }}</td>
     </tr>
     <tr>
-        <td>
-             
-            <para>
-                {% if invoice %}
-                    VAT Registration Number: 170734807
-                {% else %}
-                    <b>This contract is not an invoice.</b>
-                {% endif %}
-            </para>
-            
-        </td>
+        <td></td>
         <td>
             <para>
                 <b>Total</b>
@@ -229,90 +231,67 @@
     </tr>
     </blockTable>
 </keepTogether>
-{% if not invoice %}
-    <keepTogether>
+<keepTogether>
     <blockTable style="infoTable">
+    {% if not invoice %}
+        <tr>
+            <td>
+                <para>Bookings will
+                    <b>not</b>
+                    be confirmed until the event is authorised online.
+                </para>
+            </td>
+        </tr>
+        <tr>
+            <td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
+        </tr>
+    {% else %}
+        <tr>
+        <td>
+            <para>VAT Registration Number: 170734807</para>
+        </td>
+        </tr>
+    {% endif %}
+
+    <tr><td><spacer length="15" /></td></tr>
+
     <tr>
         <td>
-            <para>Bookings will
-                <b>not</b>
-                be confirmed until payment is received and the contract is signed.
+            {% if object.authorised %}
+            <para>
+                Event authorised online by {{ object.authorisation.name }} ({{ object.authorisation.email }}) at
+                {{ object.authorisation.last_edited_at }}.
             </para>
+
+            {% if object.organisation.union_account %}
+                <blockTable colWidths="165,165,165">
+                    <tr>
+                        <td><para><b>University ID</b></para></td>
+                        <td><para><b>Account Code</b></para></td>
+                        <td><para><b>Authorised Amount</b></para></td>
+                    </tr>
+                    <tr>
+                        <td>{{ object.authorisation.uni_id }}</td>
+                        <td>{{ object.authorisation.account_code }}</td>
+                        <td>£ {{ object.authorisation.amount|floatformat:2 }}</td>
+                    </tr>
+                </blockTable>
+            {% else %}
+                <blockTable colWidths="247,248">
+                    <tr>
+                        <td><para><b>Purchase Order</b></para></td>
+                        <td><para><b>Authorised Amount</b></para></td>
+                    </tr>
+                    <tr>
+                        <td>{{ object.authorisation.po }}</td>
+                        <td>£ {{ object.authorisation.amount|floatformat:2 }}</td>
+                    </tr>
+                </blockTable>
+            {% endif %}
+        {% endif %}
         </td>
     </tr>
-    <tr>
-        <td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
-    </tr>
     </blockTable>
-    </keepTogether>
-    <spacer length="15"/>
-    <keepTogether>
+</keepTogether>
 
-    <para style="blockPara">
-    <b>To be signed on booking:</b>
-    </para>
-    {% if object.organisation.union_account %}
-        <para style="blockPara">
-        <i>
-            I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer, or
-            that I have provided written permission from either the President or Treasurer of the hirer stating that I can
-            sign for this invoice.
-        </i>
-        </para>
-        <para style="blockPara">
-        <i>
-            I have read, understood and fully accepted the current conditions of hire. I agree to return any dry hire
-            items to TEC PA &amp; Lighting in the same condition at the end of the hire period.
-        </i>
-        </para>
-
-        <para style="blockPara">
-        <b>
-            Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
-        </b>
-        </para>
-
-        <para style="blockPara">
-        Please return this form directly to TEC PA &amp; Lighting and not the Students' Union Finance Department.
-        </para>
-
-        <blockTable style="signatureTable" colWidths="70,100,325">
-        <tr>
-            <td>Account Code</td>
-            <td></td>
-            <td></td>
-        </tr>
-        </blockTable>
-
-    {% else %}
-        <para style="blockPara">
-        <i>
-            I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms a
-            binding contract between TEC PA &amp; Lighting and the hirer, the aforementioned conditions of hire forming
-            an integral part of it.
-        </i>
-        </para>
-
-        <para style="blockPara">
-        <b>
-            Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
-        </b>
-        </para>
-
-        {% include "RIGS/event_print_signature.xml" %}
-        <spacer length="10"/>
-        <para style="blockPara">
-        <b>To be signed on the day of the event/hire:</b>
-        </para>
-        <para style="blockPara">
-        <i>
-            I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry hire
-            items to TEC PA &amp; Lighting in a similar condition at the end of the hire period.
-        </i>
-        </para>
-    {% endif %}
-
-    {% include "RIGS/event_print_signature.xml" %}
-    </keepTogether>
-    {% endif %}
-<namedString id="lastPage"><pageNumber/></namedString>
+<namedString id="lastPage"><pageNumber/></namedString>

RIGS/templates/RIGS/eventauthorisation_mic_success.txt

@@ -1,4 +1,4 @@
-Hi {{object.event.mic.get_full_name}},
+Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
 
 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}}.