From 3c48b2e95cf70aa91a79bb63286a9cb380a22651 Mon Sep 17 00:00:00 2001 From: Brian Ndwiga Date: Wed, 1 Nov 2017 08:09:19 +0800 Subject: [PATCH] ps: fix the refunds report --- parkstay/reports.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/parkstay/reports.py b/parkstay/reports.py index 17340692b4..375f02cc67 100644 --- a/parkstay/reports.py +++ b/parkstay/reports.py @@ -75,8 +75,13 @@ def booking_refunds(start,end): name = '' if track: name = track.user.get_full_name() if track.user.get_full_name() else track.user.email - writer.writerow([booking.confirmation_number,booking.customer.get_full_name(),'Manual',v,line.oracle_code,e.created.strftime('%d/%m/%Y'),name]) + if booking: + b_name = '{} {}'.format(booking.details.get('first_name',''),booking.details.get('last_name','')) + writer.writerow([booking.confirmation_number,b_name,'Manual',v,line.oracle_code,e.created.strftime('%d/%m/%Y'),name,invoice.reference]) + else: + writer.writerow(['','','Manual',v,line.oracle_code,e.created.strftime('%d/%m/%Y'),name,invoice.reference]) for b in bpoint: + booking, invoice = None, None try: invoice = Invoice.objects.get(reference=b.crn1) if invoice.system == '0019': @@ -97,7 +102,11 @@ def booking_refunds(start,end): name = '' if track: name = track.user.get_full_name() if track.user.get_full_name() else track.user.email - writer.writerow([booking.confirmation_number,booking.customer.get_full_name(),'Card',v,line.oracle_code,b.created.strftime('%d/%m/%Y'),name]) + if booking: + b_name = '{} {}'.format(booking.details.get('first_name',''),booking.details.get('last_name','')) + writer.writerow([booking.confirmation_number,b_name,'Card',v,line.oracle_code,b.created.strftime('%d/%m/%Y'),name,invoice.reference]) + else: + writer.writerow(['','','Card',v,line.oracle_code,b.created.strftime('%d/%m/%Y'),name,invoice.reference]) except Invoice.DoesNotExist: pass