diff --git a/mooring/emails.py b/mooring/emails.py index 26c46e3d39..ce81ac8f09 100644 --- a/mooring/emails.py +++ b/mooring/emails.py @@ -296,7 +296,7 @@ def send_booking_confirmation(booking,request,context_processor): subject = "Your mooring booking and admissions confirmation" att2 = BytesIO() admissionsBooking = AdmissionsBooking.objects.get(id=booking.admission_payment.id) - pdf.create_admissions_confirmation(att2, admissionsBooking) + pdf.create_admissions_confirmation(att2, admissionsBooking, context_processor) att2.seek(0) filename = 'confirmation-AD{}.pdf'.format(admissionsBooking.id) sendHtmlEmail([email],subject,context,template,cc,bcc,from_email,template_group,attachments=[('confirmation-PS{}.pdf'.format(booking.id), att.read(), 'application/pdf'), (filename, att2.read(), 'application/pdf')]) diff --git a/mooring/templates/mooring/booking/booking_view.html b/mooring/templates/mooring/booking/booking_view.html index 0326ee04dd..4a3ae01152 100644 --- a/mooring/templates/mooring/booking/booking_view.html +++ b/mooring/templates/mooring/booking/booking_view.html @@ -49,11 +49,7 @@

{{ booking.mooringarea.name }}, {{ booking.mooringarea. Payment status:
- {% if booking.status == 'Over Paid' %} - Paid - {% else %} - {{ booking.status }} - {% endif %} + {{ booking.invoice_status }}
{% if booking.status == 'Paid' or booking.status == 'Over Paid' %}