From e54b3222463cea7a8afdff843431640fa4e48c39 Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Mon, 9 Sep 2019 12:47:22 +0800 Subject: [PATCH 1/7] Email Causing excepting due to global variable (Production only impact) --- mooring/emails.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mooring/emails.py b/mooring/emails.py index bb8de6158c..95f5156c44 100644 --- a/mooring/emails.py +++ b/mooring/emails.py @@ -392,6 +392,10 @@ def send_refund_failure_email_admissions(booking, context_processor): to = settings.NON_PROD_EMAIL sendHtmlEmail([to],subject,context,template,cc,bcc,from_email,template_group,attachments=None) else: + pa = Group.objects.get(name='Payments Officers') + ma = Group.objects.get(name="Mooring Admin") + user_list = EmailUser.objects.filter(groups__in=[pa,ma]).distinct() + for u in user_list: to = u.email sendHtmlEmail([to],subject,context,template,cc,bcc,from_email,template_group,attachments=None) @@ -434,6 +438,11 @@ def send_refund_failure_email(booking, context_processor): to = settings.NON_PROD_EMAIL sendHtmlEmail([to],subject,context,template,cc,bcc,from_email,template_group,attachments=None) else: + + pa = Group.objects.get(name='Payments Officers') + ma = Group.objects.get(name="Mooring Admin") + user_list = EmailUser.objects.filter(groups__in=[pa,ma]).distinct() + for u in user_list: to = u.email sendHtmlEmail([to],subject,context,template,cc,bcc,from_email,template_group,attachments=None) From c02d3d6eb03deb60d740ae13d37ddfb65796121a Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Mon, 9 Sep 2019 16:39:42 +0800 Subject: [PATCH 2/7] Production Email Fixes (for refunds) --- mooring/emails.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mooring/emails.py b/mooring/emails.py index 95f5156c44..21481a6d22 100644 --- a/mooring/emails.py +++ b/mooring/emails.py @@ -16,6 +16,9 @@ from confy import env from django.template import Context from ledger.accounts.models import Document +from django.contrib.auth.models import Group +from ledger.accounts.models import EmailUser + import datetime import hashlib From 640b5cf6e89dafd398fbc078512243df55371b51 Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Tue, 10 Sep 2019 10:48:04 +0800 Subject: [PATCH 3/7] Removed payment officer from refund emails --- mooring/emails.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mooring/emails.py b/mooring/emails.py index 21481a6d22..05b149e36c 100644 --- a/mooring/emails.py +++ b/mooring/emails.py @@ -397,7 +397,7 @@ def send_refund_failure_email_admissions(booking, context_processor): else: pa = Group.objects.get(name='Payments Officers') ma = Group.objects.get(name="Mooring Admin") - user_list = EmailUser.objects.filter(groups__in=[pa,ma]).distinct() + user_list = EmailUser.objects.filter(groups__in=[ma,]).distinct() for u in user_list: to = u.email @@ -444,7 +444,7 @@ def send_refund_failure_email(booking, context_processor): pa = Group.objects.get(name='Payments Officers') ma = Group.objects.get(name="Mooring Admin") - user_list = EmailUser.objects.filter(groups__in=[pa,ma]).distinct() + user_list = EmailUser.objects.filter(groups__in=[ma,]).distinct() for u in user_list: to = u.email @@ -500,7 +500,7 @@ def send_refund_failure_email_old(booking): pa = Group.objects.get(name='Payments Officers') ma = Group.objects.get(name="Mooring Admin") - user_list = EmailUser.objects.filter(groups__in=[pa,ma]).distinct() + user_list = EmailUser.objects.filter(groups__in=[ma,]).distinct() ### REMOVE ### for u in user_list: From 53704d49fdaacd8359a06b2d89628024f1f3240c Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Mon, 16 Sep 2019 10:31:18 +0800 Subject: [PATCH 4/7] Remove mooring from invoice pdf reservation title --- mooring/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mooring/views.py b/mooring/views.py index b3d8fe5def..3215de912a 100644 --- a/mooring/views.py +++ b/mooring/views.py @@ -1272,11 +1272,11 @@ def post(self, request, *args, **kwargs): to_dt = local_dt.replace(microsecond=booking.departure.microsecond) to_date_converted = to_dt.date() # generate invoice - reservation = u"Reservation for {} from {} to {} at {}".format( + reservation = u"Reservation for {} from {} to {} ".format( u'{} {}'.format(booking.customer.first_name, booking.customer.last_name), from_date_converted, to_date_converted, - booking.mooringarea.name + #booking.mooringarea.name ) logger.info('{} built booking {} and handing over to payment gateway'.format('User {} with id {}'.format(booking.customer.get_full_name(),booking.customer.id) if booking.customer else 'An anonymous user',booking.id)) From 29eca84af27e8524b123cebaeba2158b6c958b77 Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Mon, 16 Sep 2019 12:05:20 +0800 Subject: [PATCH 5/7] Permssion fix on change booking --- mooring/api.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mooring/api.py b/mooring/api.py index f3849b2da9..51b0ed9c71 100644 --- a/mooring/api.py +++ b/mooring/api.py @@ -1920,6 +1920,8 @@ def retrieve(self, request, pk=None, ratis_id=None, format=None, show_all=False) # 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 + if utils.check_mooring_admin_access(request) is True: + booking_changed = True availability = utils.get_campsite_availability(sites_qs, start_date, end_date, ongoing_booking, request) From d1d04d531cdf4eaee224d27e1f84afc93c5ab453 Mon Sep 17 00:00:00 2001 From: "jason.moore@dbca.wa.gov.au" Date: Tue, 17 Sep 2019 10:17:12 +0800 Subject: [PATCH 6/7] Remove mooring name from booking success --- mooring/templates/mooring/booking/booking_view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mooring/templates/mooring/booking/booking_view.html b/mooring/templates/mooring/booking/booking_view.html index 7619006591..0aeb6f5435 100644 --- a/mooring/templates/mooring/booking/booking_view.html +++ b/mooring/templates/mooring/booking/booking_view.html @@ -1,5 +1,5 @@
-
+
@@ -9,7 +9,7 @@

{{ booking.mooringarea.name }}, {{ booking.mooringarea. {% endif %}

-
+