From 5d113b299aabef338aacc89da00ccf1add3d25fb Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Wed, 13 Mar 2019 14:21:42 +0800 Subject: [PATCH] Bug Fix: new / change booking calendar bug --- mooring/api.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mooring/api.py b/mooring/api.py index 1ad3221cc2..6773bfd27e 100644 --- a/mooring/api.py +++ b/mooring/api.py @@ -1849,14 +1849,17 @@ def retrieve(self, request, pk=None, ratis_id=None, format=None, show_all=False) # total_price = total_price +ms.amount # current_booking.append(row) booking_changed = True - if ongoing_booking.old_booking: + + if ongoing_booking: + # When changing a book this check for changes + if ongoing_booking.old_booking is not None: - current_booking_obj = MooringsiteBooking.objects.filter(booking=ongoing_booking).values('campsite','from_dt','to_dt','booking_period_option') - old_booking_obj = MooringsiteBooking.objects.filter(booking=ongoing_booking.old_booking).values('campsite','from_dt','to_dt','booking_period_option') - # compare old and new booking for changes - if hashlib.md5(str(current_booking_obj)).hexdigest() == hashlib.md5(str(old_booking_obj)).hexdigest(): - booking_changed = False - + current_booking_obj = MooringsiteBooking.objects.filter(booking=ongoing_booking).values('campsite','from_dt','to_dt','booking_period_option') + old_booking_obj = MooringsiteBooking.objects.filter(booking=ongoing_booking.old_booking).values('campsite','from_dt','to_dt','booking_period_option') + # compare old and new booking for changes + if hashlib.md5(str(current_booking_obj)).hexdigest() == hashlib.md5(str(old_booking_obj)).hexdigest(): + booking_changed = False + availability = utils.get_campsite_availability(sites_qs, start_date, end_date, ongoing_booking, request) # create our result object, which will be returned as JSON