From 6b1ade5fb38bf004d4d36ca8c96271bc02ea5fdf Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Thu, 14 Mar 2019 11:01:40 +0800 Subject: [PATCH 1/3] Bug Fix for Admission Confirmation email and Booking Payment Status --- mooring/emails.py | 2 +- mooring/templates/mooring/booking/booking_view.html | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) 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' %} From 71edc444906b19d9a425423326ebf3c09d74894a Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Thu, 14 Mar 2019 11:09:43 +0800 Subject: [PATCH 2/3] Fix empty/none Mobile check on booking screen causing error --- mooring/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mooring/views.py b/mooring/views.py index 4d0e3564cb..180c0f6a5d 100644 --- a/mooring/views.py +++ b/mooring/views.py @@ -727,8 +727,11 @@ def get(self, request, *args, **kwargs): else: form_context['first_name'] = request.user.first_name form_context['last_name'] = request.user.last_name - if len(request.user.mobile_number) > 1: - form_context['phone'] = request.user.mobile_number + if request.user.mobile_number: + if len(request.user.mobile_number) > 1: + form_context['phone'] = request.user.mobile_number + else: + form_context['phone'] = request.user.mobile_number else: form_context['phone'] = request.user.phone_number if Address.objects.filter(user=request.user).count() > 0: From 64fae5bca2fc27d90639b665067f708cc5e29c7a Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Thu, 14 Mar 2019 11:32:45 +0800 Subject: [PATCH 3/3] Fix phone number else statement. --- mooring/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mooring/views.py b/mooring/views.py index 180c0f6a5d..d6ef3f5b57 100644 --- a/mooring/views.py +++ b/mooring/views.py @@ -731,7 +731,7 @@ def get(self, request, *args, **kwargs): if len(request.user.mobile_number) > 1: form_context['phone'] = request.user.mobile_number else: - form_context['phone'] = request.user.mobile_number + form_context['phone'] = request.user.phone_number else: form_context['phone'] = request.user.phone_number if Address.objects.filter(user=request.user).count() > 0: