Merge 4c5ae58 into 5fbb072

dbca-wa · Mar 13, 2019 · 0b53947 · 0b53947
2 parents 5fbb072 + 4c5ae58
commit 0b53947
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mooring/templates/mooring/admissions/booking_view.html b/mooring/templates/mooring/admissions/booking_view.html
@@ -82,7 +82,7 @@ <h3 class="text-primary">Rottnest Island Admission Fee Payment</h3>
                     <a href="{% url 'get_admissions_confirmation' admissionsBooking.id %}" class="btn btn-info btn-lg" >Confirmation</a>
                     {% if request.user.is_authenticated %}
                         {% for bi in admissionsInvoice %}
-                        <a href="{% url 'mooring-invoice-pdf' bi %}" class="btn btn-info btn-lg" >Invoice</a>
+                            <a href="{% url 'mooring-invoice-pdf' bi %}" class="btn btn-info btn-lg" >Invoice</a>
                         {% endfor %}
                         {% if admissionsBooking.in_future and not admissionsBooking.part_booking %}
                             <a href="{% url 'public_cancel_admissions_booking' admissionsBooking.id %}" class="btn btn-info btn-lg">Cancel Admission Booking</a>

diff --git a/mooring/views.py b/mooring/views.py
@@ -2308,18 +2308,20 @@ def get(self, request, *args, **kwargs):
                 arrival = adl[0].arrivalDate
                 overnight = adl[0].overnightStay
             invoice_reference = ''
+            bk_invoices = []
             if AdmissionsBookingInvoice.objects.filter(admissions_booking=ad).count() > 0:
-                 invoice_reference =  AdmissionsBookingInvoice.objects.get(admissions_booking=ad).invoice_reference
-            to_add = [ad, arrival, overnight, invoice_reference]
+                 for i in AdmissionsBookingInvoice.objects.filter(admissions_booking=ad):
+                      bk_invoices.append(i.invoice_reference)
+
+            to_add = [ad, arrival, overnight, bk_invoices]
             ad_current.append(to_add)
         ad_pasts = admissions.distinct().filter(admissionsline__arrivalDate__lt=today)
         ad_past = []
         for ad in ad_pasts:
             bk_invoices = []
-            for i in AdmissionsBookingInvoice.objects.get(admissions_booking=ad):
+            for i in AdmissionsBookingInvoice.objects.filter(admissions_booking=ad):
                  bk_invoices.append(i.invoice_reference)
-            to_add = [bk, bk_invoices]
- #           to_add = [ad, AdmissionsBookingInvoice.objects.get(admissions_booking=ad).invoice_reference]
+            to_add = [ad, bk_invoices]
             ad_past.append(to_add)
 
         bk_currents = bookings.filter(departure__gte=today).order_by('arrival')
@@ -2329,7 +2331,6 @@ def get(self, request, *args, **kwargs):
             bk_invoices = []
             for i in BookingInvoice.objects.filter(booking=bk):
                 bk_invoices.append(i.invoice_reference)    
-#            to_add = [bk, BookingInvoice.objects.get(booking=bk).invoice_reference]
             to_add = [bk, bk_invoices]
             bk_current.append(to_add)
         bk_pasts = bookings.filter(departure__lt=today).order_by('-arrival')
@@ -2339,7 +2340,6 @@ def get(self, request, *args, **kwargs):
             for i in BookingInvoice.objects.filter(booking=bk):
                 bk_invoices.append(i.invoice_reference)
             to_add = [bk, bk_invoices]  
-#            to_add = [bk, BookingInvoice.objects.get(booking=bk).invoice_reference]
             bk_past.append(to_add)
         context = {
             'current_bookings': bk_current,