-
+
@@ -270,10 +271,12 @@
-
+
+
+ + {{ bp.caption }}
+ + {{ bp.caption }}
@@ -356,7 +359,7 @@
width: 100%;
}
- // table font colour override
+ /* table font colour override */
table thead tr {
background: unset;
color: unset;
@@ -409,6 +412,45 @@
.continueBooking {
text-decoration: none;
}
+
+ /* Tooltip */
+ .tooltip2 {
+ position: relative;
+ display: inline-block;
+ }
+
+ /* Tooltip text */
+ .tooltip2 .tooltiptext {
+ visibility: hidden;
+ width: 165px;
+ background-color: black;
+ color: #fff;
+ text-align: center;
+ padding: 8px;
+ border-radius: 6px;
+ text-align: left;
+
+ /* Position the tooltip text - see examples below! */
+ position: absolute;
+ z-index: 1;
+ }
+
+ /* Show the tooltip text when you mouse over the tooltip container */
+ .tooltip2:hover .tooltiptext {
+ visibility: visible;
+ }
+
+ .tooltip2 .tooltiptext::after {
+ content: " ";
+ position: absolute;
+ bottom: 100%; /* At the top of the tooltip */
+ left: 50%;
+ margin-left: -5px;
+ border-width: 5px;
+ border-style: solid;
+ border-color: transparent transparent black transparent;
+ }
+
}
diff --git a/mooring/frontend/exploreparks/config/index.js b/mooring/frontend/exploreparks/config/index.js
index a3dd4af4e4..fde6849594 100644
--- a/mooring/frontend/exploreparks/config/index.js
+++ b/mooring/frontend/exploreparks/config/index.js
@@ -7,7 +7,7 @@ module.exports = {
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../../../static/'),
assetsSubDirectory: 'exploreparks',
- assetsPublicPath: '/',
+ assetsPublicPath: '/static/',
productionSourceMap: true,
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
diff --git a/mooring/frontend/exploreparks/src/assets/img/map_icon.png b/mooring/frontend/exploreparks/src/assets/img/map_icon.png
new file mode 100644
index 0000000000..a5cfae7e99
Binary files /dev/null and b/mooring/frontend/exploreparks/src/assets/img/map_icon.png differ
diff --git a/mooring/frontend/exploreparks/src/assets/img/satellite_icon.png b/mooring/frontend/exploreparks/src/assets/img/satellite_icon.png
new file mode 100644
index 0000000000..0d64c6c076
Binary files /dev/null and b/mooring/frontend/exploreparks/src/assets/img/satellite_icon.png differ
diff --git a/mooring/frontend/exploreparks/src/parkfinder.vue b/mooring/frontend/exploreparks/src/parkfinder.vue
index 36ae135e8d..45062f2f73 100644
--- a/mooring/frontend/exploreparks/src/parkfinder.vue
+++ b/mooring/frontend/exploreparks/src/parkfinder.vue
@@ -240,6 +240,10 @@
Click here for paying admission fees
(Only if you do not book a mooring)
+ (Only if you do not book a mooring)
+ 
+ 
+
+
+
@@ -600,6 +604,35 @@
.resultList {
padding: 0;
}
+
+ .map-toggle-black {
+ width: 80px;
+ height: 80px;
+ background-color: #FFFFFF;
+ color: black;
+ position: relative;
+ right: 10px;
+ top: -90px;
+ z-index: 300;
+ border: 2px solid #FFFFFF;
+ cursor: pointer;
+ border-radius: 2px;
+ box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.3);
+ }
+ .map-toggle-white {
+ width: 80px;
+ height: 80px;
+ background-color: #FFFFFF;
+ color: black;
+ position: relative;
+ right: 10px;
+ top: -90px;
+ z-index: 300;
+ border: 2px solid #000000;
+ cursor: pointer;
+ border-radius: 2px;
+ box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.3);
+ }
}
/* hacks to make awesomeplete play nice with F6 */
@@ -617,6 +650,7 @@ div.awesomplete > input {
width: 2em;
}
+
diff --git a/mooring/test_views.py b/mooring/test_views.py
index 700ffee706..453351262a 100644
--- a/mooring/test_views.py
+++ b/mooring/test_views.py
@@ -539,51 +539,51 @@ def test_logged_in_non_admin(self):
response = self.client.get(url, HTTP_HOST="website.domain")
self.assertEqual(response.status_code, 302)
-class PaymentPDFInvoiceTestCase(TestSetup):
-
- def set_invoices(self):
- pass
-
- def test_logged_in_admin_own_order(self):
- """Test that the payment PDF view will load whilst logged in as admin, and admin is owner of order.
- """
- self.set_invoices()
- url = '/mooring/payments/invoice-pdf/123456'
- self.client.login(username=self.adminUN, password="pass")
- response = self.client.get(url, HTTP_HOST="website.domain")
- self.assertEqual(response.status_code, 200)
-
- def test_logged_in_non_admin_own_order(self):
- """Test that the payment PDF view will load whilst logged in as non-admin and non-admin is owner of order.
- """
- self.set_invoices()
- url = '/mooring/payments/invoice-pdf/987654'
- self.client.login(username=self.nonAdminUN, password="pass")
- response = self.client.get(url, HTTP_HOST="website.domain")
- self.assertEqual(response.status_code, 200)
-
- def test_logged_in_admin_not_owner(self):
- """Test that the payment PDF view will load whilst logged in as non-admin and non-admin is owner of order.
- """
- self.set_invoices()
- url = '/mooring/payments/invoice-pdf/987654'
- self.client.login(username=self.adminUN, password="pass")
- response = self.client.get(url, HTTP_HOST="website.domain")
- self.assertEqual(response.status_code, 403)
-
- def test_logged_in_non_admin_not_owner(self):
- """Test that the payment PDF view will not load whilst logged in as non-admin, and admin is owner of order.
- """
- self.set_invoices()
- url = '/mooring/payments/invoice-pdf/123456'
- self.client.login(username=self.nonAdminUN, password="pass")
- response = self.client.get(url, HTTP_HOST="website.domain")
- self.assertEqual(response.status_code, 403)
-
- def test_not_logged_in_not_owner(self):
- """Test that the payment PDF view not will load whilst logged in as non-admin, and admin is owner of order.
- """
- self.set_invoices()
- url = '/mooring/payments/invoice-pdf/123456'
- response = self.client.get(url, HTTP_HOST="website.domain")
- self.assertEqual(response.status_code, 403)
+#class PaymentPDFInvoiceTestCase(TestSetup):
+#
+# def set_invoices(self):
+# pass
+#
+# def test_logged_in_admin_own_order(self):
+# """Test that the payment PDF view will load whilst logged in as admin, and admin is owner of order.
+# """
+# self.set_invoices()
+# url = '/mooring/payments/invoice-pdf/123456'
+# self.client.login(username=self.adminUN, password="pass")
+# response = self.client.get(url, HTTP_HOST="website.domain")
+# self.assertEqual(response.status_code, 200)
+#
+# def test_logged_in_non_admin_own_order(self):
+# """Test that the payment PDF view will load whilst logged in as non-admin and non-admin is owner of order.
+# """
+# self.set_invoices()
+# url = '/mooring/payments/invoice-pdf/987654'
+# self.client.login(username=self.nonAdminUN, password="pass")
+# response = self.client.get(url, HTTP_HOST="website.domain")
+# self.assertEqual(response.status_code, 200)
+#
+# def test_logged_in_admin_not_owner(self):
+# """Test that the payment PDF view will load whilst logged in as non-admin and non-admin is owner of order.
+# """
+# self.set_invoices()
+# url = '/mooring/payments/invoice-pdf/987654'
+# self.client.login(username=self.adminUN, password="pass")
+# response = self.client.get(url, HTTP_HOST="website.domain")
+# self.assertEqual(response.status_code, 403)
+#
+# def test_logged_in_non_admin_not_owner(self):
+# """Test that the payment PDF view will not load whilst logged in as non-admin, and admin is owner of order.
+# """
+# self.set_invoices()
+# url = '/mooring/payments/invoice-pdf/123456'
+# self.client.login(username=self.nonAdminUN, password="pass")
+# response = self.client.get(url, HTTP_HOST="website.domain")
+# self.assertEqual(response.status_code, 403)
+#
+# def test_not_logged_in_not_owner(self):
+# """Test that the payment PDF view not will load whilst logged in as non-admin, and admin is owner of order.
+# """
+# self.set_invoices()
+# url = '/mooring/payments/invoice-pdf/123456'
+# response = self.client.get(url, HTTP_HOST="website.domain")
+# self.assertEqual(response.status_code, 403)
diff --git a/mooring/urls.py b/mooring/urls.py
index 437dbf0672..196faefe76 100644
--- a/mooring/urls.py
+++ b/mooring/urls.py
@@ -53,6 +53,7 @@
api_patterns = [
url(r'^api/profile$',api.GetProfile.as_view(), name='get-profile'),
+ url(r'^api/profile-admin$',api.GetProfileAdmin.as_view(), name='get-profile-admin'),
url(r'^api/profile/update_personal$',api.UpdateProfilePersonal.as_view(), name='update-profile-personal'),
url(r'^api/profile/update_contact$',api.UpdateProfileContact.as_view(), name='update-profile-contact'),
url(r'^api/profile/update_address$',api.UpdateProfileAddress.as_view(), name='update-profile-address'),
diff --git a/mooring/utils.py b/mooring/utils.py
index b591617a4c..e88a0e44c2 100644
--- a/mooring/utils.py
+++ b/mooring/utils.py
@@ -599,7 +599,7 @@ def get_visit_rates(campsites_qs, start_date, end_date):
results[rate.campsite.pk][start+timedelta(days=i)]['child'] = str(rate.rate.child)
results[rate.campsite.pk][start+timedelta(days=i)]['infant'] = str(rate.rate.infant)
for b in booking_period:
- booking_period_row = {'id':b.id, 'period_name' : b.period_name, 'small_price': format(b.small_price,'.2f'), 'medium_price': format(b.medium_price,'.2f'), 'large_price' : format(b.large_price,'.2f'), 'start_time' : b.start_time, 'finish_time' : b.finish_time,'all_day' : b.all_day, 'created' : b.created }
+ booking_period_row = {'id':b.id, 'period_name' : b.period_name, 'small_price': format(b.small_price,'.2f'), 'medium_price': format(b.medium_price,'.2f'), 'large_price' : format(b.large_price,'.2f'), 'start_time' : b.start_time, 'finish_time' : b.finish_time,'all_day' : b.all_day, 'caption': b.caption, 'created' : b.created }
# booking_period_row = {}
# booking_period_row['id'] = b.id
# booking_period_row['period_name'] = b.period_name
diff --git a/mooring/views.py b/mooring/views.py
index d6ef3f5b57..59e2ab31b6 100644
--- a/mooring/views.py
+++ b/mooring/views.py
@@ -68,6 +68,7 @@
from django_ical.views import ICalFeed
from datetime import datetime, timedelta, date
from decimal import *
+from pytz import timezone as pytimezone
from mooring.helpers import is_officer, is_payment_officer
from mooring import utils
@@ -229,7 +230,7 @@ def get(self, request, *args, **kwargs):
booking_cancellation_fees = utils.calculate_price_booking_cancellation(booking)
booking_cancellation_fees = utils.calculate_price_admissions_changecancel(booking.admission_payment, booking_cancellation_fees)
- booking_total = booking_total + sum(Decimal(i['amount']) for i in booking_cancellation_fees)
+ booking_total = Decimal('{0:.2f}'.format(booking_total + Decimal(sum(Decimal(i['amount']) for i in booking_cancellation_fees))))
basket = {}
return render(request, self.template_name, {'booking': booking,'basket': basket, 'booking_fees': booking_cancellation_fees, 'booking_total': booking_total, 'booking_total_positive': booking_total - booking_total - booking_total })
@@ -260,8 +261,11 @@ def post(self, request, *args, **kwargs):
if booking.admission_payment:
booking_admission = AdmissionsBooking.objects.get(pk=booking.admission_payment_id)
booking_cancellation_fees = utils.calculate_price_admissions_changecancel(booking.admission_payment, booking_cancellation_fees)
- booking_total = booking_total + sum(Decimal(i['amount']) for i in booking_cancellation_fees)
+ booking_total = Decimal('{0:.2f}'.format(booking_total + Decimal(sum(Decimal(i['amount']) for i in booking_cancellation_fees))))
+
+# booking_total = booking_total + sum(Decimal(i['amount']) for i in booking_cancellation_fees)
# booking_total = Decimal('{:.2f}'.format(float(booking_total - booking_total - booking_total)))
+
b_total = Decimal('{:.2f}'.format(float(booking_total - booking_total - booking_total)))
info = {'amount': Decimal('{:.2f}'.format(float(booking_total - booking_total - booking_total))), 'details' : 'Refund via system'}
# info = {'amount': float('10.00'), 'details' : 'Refund via system'}
@@ -284,11 +288,15 @@ def post(self, request, *args, **kwargs):
invoice.voided = True
invoice.save()
booking.booking_type = 4
+ booking.cancelation_time = datetime.now()
+ booking.canceled_by = request.user
booking.save()
emails.send_booking_cancellation_email_customer(booking, context_processor)
if booking.admission_payment:
booking_admission.booking_type = 4
+ booking_admission.cancelation_time = datetime.now()
+ booking_admission.canceled_by = request.user
booking_admission.save()
return HttpResponseRedirect(reverse('public_booking_cancelled', args=(booking.id,)))
@@ -363,6 +371,8 @@ def post(self, request, *args, **kwargs):
invoice.voided = True
invoice.save()
booking.booking_type = 4
+ booking.cancelation_time = datetime.now()
+ booking.canceled_by = request.user
booking.save()
return HttpResponseRedirect(reverse('public_admission_booking_cancelled', args=(booking.id,)))
@@ -801,7 +811,11 @@ def post(self, request, *args, **kwargs):
# update the booking object with information from the form
if not booking.details:
booking.details = {}
-
+
+ booking.details['num_adult'] = int(request.POST.get('num_adults')) if request.POST.get('num_adults') else 0
+ booking.details['num_child'] = int(request.POST.get('num_children')) if request.POST.get('num_children') else 0
+ booking.details['num_infant'] = int(request.POST.get('num_infants')) if request.POST.get('num_infants') else 0
+
if booking.old_booking is None:
booking.details['first_name'] = form.cleaned_data.get('first_name')
booking.details['last_name'] = form.cleaned_data.get('last_name')
@@ -989,6 +1003,11 @@ def post(self, request, *args, **kwargs):
if booking.customer is None:
booking.customer = customer
booking.cost_total = total
+ if request.user.__class__.__name__ == 'EmailUser':
+ booking.created_by = request.user
+ else:
+ booking.created_by = None
+
booking.save()
@@ -2006,6 +2025,8 @@ def get(self, request, *args, **kwargs):
logger.info('{} finished temporary booking {}, creating new AdmissionBookingInvoice with reference {}'.format('User {} with id {}'.format(booking.customer.get_full_name(),booking.customer.id) if booking.customer else 'An anonymous user',booking.id, invoice_ref))
# FIXME: replace with server side notify_url callback
admissionsInvoice = AdmissionsBookingInvoice.objects.get_or_create(admissions_booking=booking, invoice_reference=invoice_ref)
+ if request.user.__class__.__name__ == 'EmailUser':
+ booking.created_by = request.user
# set booking to be permanent fixture
booking.booking_type = 1 # internet booking
@@ -2121,11 +2142,17 @@ def get(self, request, *args, **kwargs):
if booking.old_booking:
old_booking = Booking.objects.get(id=booking.old_booking.id)
old_booking.booking_type = 4
+ old_booking.cancelation_time = datetime.now()
+ old_booking.canceled_by = request.user
+
old_booking.save()
booking_items = MooringsiteBooking.objects.filter(booking=old_booking)
# Find admissions booking for old booking
if old_booking.admission_payment:
old_booking.admission_payment.booking_type = 4
+ old_booking.admission_payment.cancelation_time = datetime.now()
+ old_booking.admission_payment.canceled_by = request.user
+
old_booking.admission_payment.save()
for bi in booking_items:
bi.booking_type = 4
@@ -2244,6 +2271,8 @@ def get(self, request, *args, **kwargs):
# ad_booking.save()
if booking.admission_payment:
ad_booking = AdmissionsBooking.objects.get(pk=booking.admission_payment.pk)
+ if request.user.__class__.__name__ == 'EmailUser':
+ ad_booking.created_by = request.user
ad_booking.booking_type=1
ad_booking.save()
ad_invoice = AdmissionsBookingInvoice.objects.create(admissions_booking=ad_booking, invoice_reference=invoice_ref)
@@ -2359,12 +2388,23 @@ class ViewBookingView(LoginRequiredMixin, TemplateView):
def get(self, request, *args, **kwargs):
booking_id = kwargs['pk']
booking = None
+ booking_lines_collated = []
if request.user.is_staff or request.user.is_superuser or Booking.objects.filter(customer=request.user,pk=booking_id).count() == 1:
# booking = Booking.objects.get(customer=request.user, booking_type__in=(0, 1), is_canceled=False, pk=booking_id)
booking = Booking.objects.get(pk=booking_id)
+ booking_lines = MooringsiteBooking.objects.filter(booking=booking)
+
+ for ob in booking_lines:
+ from_dt = datetime.strptime(ob.from_dt.strftime('%Y-%m-%d'),'%Y-%m-%d')
+ cancel_fee_amount = '0.00'
+ description = 'Mooring {} ({} - {})'.format(ob.campsite.mooringarea.name,ob.from_dt.astimezone(pytimezone('Australia/Perth')).strftime('%d/%m/%Y %H:%M %p'),ob.to_dt.astimezone(pytimezone('Australia/Perth')).strftime('%d/%m/%Y %H:%M %p'))
+ #change_fees['amount'] = str(refund_amount)
+ booking_lines_collated.append({'description': description,'amount': ob.amount})
+
context = {
'booking_id': booking_id,
- 'booking': booking
+ 'booking': booking,
+ 'booking_lines' : booking_lines_collated
# 'past_bookings': bk_past,
# 'current_admissions': ad_current,
# 'past_admissions': ad_past,