Merge pull request #562 from xzzy/master

Bug Fix for Admission Confirmation email and Booking Payment Status
dbca-wa · Mar 14, 2019 · 695a646 · 695a646
2 parents 0ff0d6b + 64fae5b
commit 695a646
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -49,11 +49,7 @@ <h3 class="text-primary">{{ booking.mooringarea.name }}, {{ booking.mooringarea.
                     <b>Payment status:</b>
                 </div>
                 <div class="col-sm-8">
-                    {% if booking.status == 'Over Paid' %}
-                        Paid
-                    {% else %}
-                        {{ booking.status }}
-                    {% endif %} 
+                    {{ booking.invoice_status }}
                 </div>
             </div><div class="row"><div class="col-sm-12" style="margin-top: 1em">
                 {% if booking.status == 'Paid' or booking.status == 'Over Paid' %}

diff --git 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.phone_number
                 else:
                     form_context['phone'] = request.user.phone_number
                 if  Address.objects.filter(user=request.user).count() > 0: