Merge f6b3670 into 47ef009

dbca-wa · Aug 28, 2018 · 0d7ccbe · 0d7ccbe
2 parents 47ef009 + f6b3670
commit 0d7ccbe
Show file tree

Hide file tree

Showing 17 changed files with 202 additions and 57 deletions.
diff --git a/mooring/api.py b/mooring/api.py
@@ -767,7 +767,9 @@ def addPrice(self, request, format='json', pk=None):
                 except Rate.DoesNotExist as e :
                     raise serializers.ValidationError('The selected rate does not exist')
             else:
-                rate = Rate.objects.get_or_create(adult=serializer.validated_data['adult'],concession=serializer.validated_data['concession'],child=serializer.validated_data['child'],infant=serializer.validated_data['infant'])[0]
+#                rate = Rate.objects.get_or_create(mooring=serializer.validated_data['mooring'],adult=serializer.validated_data['adult'],concession=serializer.validated_data['concession'],child=serializer.validated_data['child'],infant=serializer.validated_data['infant'])[0]
+#                rate = Rate.objects.get_or_create(mooring=serializer.validated_data['mooring'],adult='0.00',concession='0.00',child='0.00',infant='0.00')[0]
+                rate = Rate.objects.get_or_create(mooring=serializer.validated_data['mooring'])[0]
             if rate:
                 serializer.validated_data['rate']= rate
                 data = {
@@ -809,7 +811,8 @@ def updatePrice(self, request, format='json', pk=None):
                 except Rate.DoesNotExist as e :
                     raise serializers.ValidationError('The selected rate does not exist')
             else:
-                rate = Rate.objects.get_or_create(adult=serializer.validated_data['adult'],concession=serializer.validated_data['concession'],child=serializer.validated_data['child'],infant=serializer.validated_data['infant'])[0]
+                #rate = Rate.objects.get_or_create(adult=serializer.validated_data['adult'],concession=serializer.validated_data['concession'],child=serializer.validated_data['child'],infant=serializer.validated_data['infant'])[0]
+                rate = Rate.objects.get_or_create(mooring=serializer.validated_data['mooring'])[0]
             if rate:
                 serializer.validated_data['rate']= rate
                 new_data = {
@@ -1085,7 +1088,6 @@ def retrieve(self, request, pk=None, ratis_id=None, format=None, show_all=False)
                 for date, info in dates.items()
             } for siteid, dates in utils.get_visit_rates(sites_qs, start_date, end_date).items()
         }
-
         # fetch availability map
         availability = utils.get_campsite_availability(sites_qs, start_date, end_date)
         # create our result object, which will be returned as JSON
@@ -1747,6 +1749,8 @@ def list(self, request, *args, **kwargs):
             for bk in data:
                 cg = None
                 booking = booking_map[bk['id']]
+                print "BOOKING STATUS"
+                print booking.refund_status
                 cg = booking.mooringarea
                 bk['editable'] = booking.editable
                 bk['status'] = booking.status

diff --git a/mooring/frontend/exploreparks/src/parkfinder.vue b/mooring/frontend/exploreparks/src/parkfinder.vue
@@ -1974,8 +1974,10 @@ export default {
                    var vessel_size = $('#vesselSize').val();
                    if (vessel_size > 0 ) {
                        $("#mapPopupBook").attr('href', vm.parkstayUrl+'/availability/?site_id='+properties.marker_id+'&'+vm.bookingParam);
+                       $("#mapPopupBook").attr('target','_blank');
                    } else {
-		       $("#mapPopupBook").attr('href','javascript:void();');
+		       $("#mapPopupBook").attr('href','javascript:void(0);');
+                       $("#mapPopupBook").attr('target','');
 		   }
                 } else {
 		   $("#vessel_size_popup").html(properties.props.vessel_size_limit);
@@ -2002,7 +2004,7 @@ export default {
                         if (vessel_size > 0 ) {
                                $("#mapPopupBook").attr('href', vm.parkstayUrl+'/availability/?site_id='+properties.marker_id+'&'+vm.bookingParam);
                         } else {
-				 $("#mapPopupBook").attr('href','javascript:void();');
+				 $("#mapPopupBook").attr('href','javascript:void;');
 			}
                     } else {
                         $('#mapPopupBook').hide();

diff --git a/mooring/frontend/mooring/src/components/campgrounds/campground.vue b/mooring/frontend/mooring/src/components/campgrounds/campground.vue
@@ -153,11 +153,11 @@ export default {
                     }
 
                 }, {
-                    data: 'adult'
-                }, {
-                    data: 'concession'
-                }, {
-                    data: 'child'
+                    data: 'mooring'
+//                }, {
+//                    data: 'concession'
+//                }, {
+//                    data: 'child'
                 }, {
                     data: 'details',
                     mRender: function(data, type, full) {

diff --git a/mooring/frontend/mooring/src/components/campsites-types/campsite-type.vue b/mooring/frontend/mooring/src/components/campsites-types/campsite-type.vue
@@ -169,11 +169,7 @@ export default {
                     }
 
                 }, {
-                    data: 'adult'
-                }, {
-                    data: 'concession'
-                }, {
-                    data: 'child'
+                    data: 'mooring'
                 }, {
                     data: 'details',
                     mRender: function(data, type, full) {

diff --git a/mooring/frontend/mooring/src/components/campsites/stayHistory/addMaximumStayPeriod.vue b/mooring/frontend/mooring/src/components/campsites/stayHistory/addMaximumStayPeriod.vue
@@ -127,7 +127,7 @@ module.exports = {
             this.stay.reason = id;
         },
         addMaxStay: function() {
-            if ($(this.form).valid()){
+            if ($(this.form).valid()) {
                 if (!this.stay.id){
                     this.$emit('addStayHistory');
                 }else {

diff --git a/mooring/frontend/mooring/src/components/utils/priceHistory/priceHistory.vue b/mooring/frontend/mooring/src/components/utils/priceHistory/priceHistory.vue
@@ -68,7 +68,8 @@ export default {
         dt_headers:{
             type:Array,
             default:function () {
-                return ['Period Start', 'Period End', 'Adult Price', 'Concession Price', 'Child Price', 'Comment', 'Action'];
+//                return ['Period Start', 'Period End', 'Adult Price', 'Concession Price', 'Child Price', 'Comment', 'Action'];
+                return ['Period Start', 'Period End', 'Mooring Price', 'Comment', 'Action'];
             }
         }
     },
@@ -119,11 +120,11 @@ export default {
         getTitle: function() {
             if (this.price.id || this.price.original){
                 return 'Update Price History';
-            }else{
+            } else {
                 return 'Add Price History';
             }
         },
-        showHistory: function(){
+        showHistory: function() {
             this.$refs.historyModal.title = this.getTitle();
             this.$refs.historyModal.isOpen = true;
         },

diff --git a/mooring/frontend/mooring/src/components/utils/priceHistory/priceHistoryDetail.vue b/mooring/frontend/mooring/src/components/utils/priceHistory/priceHistoryDetail.vue
@@ -160,12 +160,13 @@ module.exports = {
                     }
                 });
             }
-            else{
+            else {
                 delete vm.priceHistory.rate;
-                vm.priceHistory.adult = '';
-                vm.priceHistory.concession = '';
-                vm.priceHistory.child = '';
-                vm.priceHistory.infant = '';
+                vm.priceHistory.mooring = '0.00';
+                vm.priceHistory.adult = '0.00';
+                vm.priceHistory.concession = '0.00';
+                vm.priceHistory.child = '0.00';
+                vm.priceHistory.infant = '0.00';
             }
         }
     },

diff --git a/mooring/frontend/mooring/src/components/utils/stayHistory/addMaximumStayPeriod.vue b/mooring/frontend/mooring/src/components/utils/stayHistory/addMaximumStayPeriod.vue
@@ -70,7 +70,7 @@ import alert from '../../utils/alert.vue'
 module.exports = {
     name: 'addMaxStayCS',
     props: {
-        campground: {
+        mooringarea: {
             type: Object,
             required: true
         },

diff --git a/mooring/frontend/mooring/src/components/utils/stayHistory/stayHistory.vue b/mooring/frontend/mooring/src/components/utils/stayHistory/stayHistory.vue
@@ -1,6 +1,6 @@
 <template id="stayHistory">
 <div class="row">
-    <StayHistoryDetail :stay="stay" :campground="campground" ref="addMaxStayModal" @addCgStayHistory="addStayHistory()" @updateStayHistory="updateStayHistory()"></StayHistoryDetail>
+    <StayHistoryDetail :stay="stay" :mooringarea="mooringarea" ref="addMaxStayModal" @addCgStayHistory="addStayHistory()" @updateStayHistory="updateStayHistory()"></StayHistoryDetail>
     <div class="well">
         <alert ref="retrieveStayAlert" :show.sync="retrieve_stay.error" type="danger" :duration="retrieve_stay.timeout">{{retrieve_stay.errorString}}</alert>
         <div class="col-sm-8">
@@ -50,7 +50,7 @@ export default {
     data: function() {
         let vm = this;
         return {
-            campground: {},
+            mooringarea: {},
             stay: {
                 reason:''
             },
@@ -167,7 +167,7 @@ export default {
             let vm = this;
             var data = this.stay;
             if (method == 'POST'){
-                data.campground = vm.object_id;
+                data.mooringarea = vm.object_id;
             }
             $.ajax({
                 url: url,

diff --git a/mooring/migrations/0038_auto_20180827_1341.py b/mooring/migrations/0038_auto_20180827_1341.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2018-08-27 05:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mooring', '0037_auto_20180814_1433'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rate',
+            name='adult',
+            field=models.DecimalField(decimal_places=2, default='10.00', max_digits=8, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rate',
+            name='child',
+            field=models.DecimalField(decimal_places=2, default='2.20', max_digits=8, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rate',
+            name='concession',
+            field=models.DecimalField(decimal_places=2, default='6.60', max_digits=8, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rate',
+            name='infant',
+            field=models.DecimalField(decimal_places=2, default='0', max_digits=8, null=True),
+        ),
+    ]
diff --git a/mooring/migrations/0039_auto_20180827_1422.py b/mooring/migrations/0039_auto_20180827_1422.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2018-08-27 06:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mooring', '0038_auto_20180827_1341'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rate',
+            name='adult',
+            field=models.DecimalField(blank=True, decimal_places=2, default='10.00', max_digits=8, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rate',
+            name='child',
+            field=models.DecimalField(blank=True, decimal_places=2, default='2.20', max_digits=8, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rate',
+            name='concession',
+            field=models.DecimalField(blank=True, decimal_places=2, default='6.60', max_digits=8, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rate',
+            name='infant',
+            field=models.DecimalField(blank=True, decimal_places=2, default='0', max_digits=8, null=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='rate',
+            unique_together=set([]),
+        ),
+    ]
diff --git a/mooring/migrations/0040_updateviews.py b/mooring/migrations/0040_updateviews.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# Manually Created
+
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mooring', '0039_auto_20180827_1422'),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            sql="""CREATE OR REPLACE VIEW mooring_mooringsiteclass_pricehistory_v AS
+                SELECT DISTINCT classes.campsite_class_id AS id,
+                classes.date_start,
+                classes.date_end,
+                r.id AS rate_id,
+                r.adult,
+                r.concession,
+                r.child,
+                classes.details,
+                classes.reason_id,
+                r.infant,
+                r.mooring
+                FROM mooring_rate r
+                INNER JOIN (
+                    SELECT distinct cc.id AS campsite_class_id,
+                    cr.rate_id AS campsite_rate_id,
+                    cr.date_start AS date_start,
+                    cr.date_end AS date_end,
+                    cr.details AS details,
+                    cr.reason_id AS reason_id
+                    FROM mooring_mooringsite cs,
+                    mooring_mooringsiteclass cc,
+                    mooring_mooringsiterate cr
+                    WHERE cs.mooringsite_class_id = cc.id AND
+                    cr.campsite_id = cs.id AND
+                    cr.update_level = 1
+                ) classes ON r.id = classes.campsite_rate_id;""",
+        ),
+        migrations.RunSQL(
+            sql="""CREATE OR REPLACE VIEW mooring_mooringarea_pricehistory_v AS
+                SELECT DISTINCT camps.mooringarea_id AS id,
+                cr.date_start,
+                cr.date_end,
+                r.id AS rate_id,
+                r.adult,
+                r.concession,
+                r.child,
+                cr.details,
+                cr.reason_id,
+                r.infant,
+                r.mooring
+                FROM mooring_mooringsiterate cr
+                INNER JOIN mooring_rate r ON r.id = cr.rate_id
+                INNER JOIN (
+                    SELECT cg.id AS mooringarea_id,
+                    cs.name AS name,
+                    cs.id AS campsite_id
+                    FROM mooring_mooringsite cs,
+                    mooring_mooringarea cg
+                    WHERE cs.mooringarea_id = cg.id AND
+                    cg.id = cs.mooringarea_id AND
+                    cg.price_level = 0
+                ) camps ON cr.campsite_id = camps.campsite_id;""",
+        ),
+    ]