Merge 82458c6 into 31f0d60

dbca-wa · Sep 4, 2018 · c84b3ab · c84b3ab
2 parents 31f0d60 + 82458c6
commit c84b3ab
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 75 deletions.
diff --git a/mooring/api.py b/mooring/api.py
@@ -1065,14 +1065,20 @@ def retrieve(self, request, pk=None, ratis_id=None, format=None, show_all=False)
         if ground.vessel_size_limit < vessel_size:
              return Response({'name':'   ', 'error': 'Vessel size is too large for mooring', 'error_type': 'vessel_error', 'vessel_size': ground.vessel_size_limit}, status=200 )
 
+
         #if not ground._is_open(start_date):
         #    return Response({'closed': 'MooringArea is closed for your selected dates'}, status=status.HTTP_400_BAD_REQUEST)
 
         # get a length of the stay (in days), capped if necessary to the request maximum
+        today = date.today()
         length = max(0, (end_date-start_date).days)
+        max_advance_booking_days = max(0, (start_date-today).days) 
         #if length > settings.PS_MAX_BOOKING_LENGTH:
         #    length = settings.PS_MAX_BOOKING_LENGTH
         #    end_date = start_date+timedelta(days=settings.PS_MAX_BOOKING_LENGTH)
+        if max_advance_booking_days > ground.max_advance_booking:
+           return Response({'name':'   ', 'error': 'Max advanced booking limit is '+str(ground.max_advance_booking)+' day/s. You can not book longer than this period.', 'error_type': 'stay_error', 'max_advance_booking': ground.max_advance_booking, 'days': length, 'max_advance_booking_days': max_advance_booking_days }, status=200 )
+
 
         # fetch all the campsites and applicable rates for the campground
         context = {}
@@ -1106,7 +1112,8 @@ def retrieve(self, request, pk=None, ratis_id=None, format=None, show_all=False)
             'maxChildren': 30,
             'sites': [],
             'classes': {},
-            'vessel_size' : ground.vessel_size_limit
+            'vessel_size' : ground.vessel_size_limit,
+            'max_advance_booking': ground.max_advance_booking 
         }
 
         # group results by campsite class

diff --git a/mooring/frontend/availability/src/availability.vue b/mooring/frontend/availability/src/availability.vue
@@ -187,6 +187,20 @@
           </table>
      </div>
 
+     <div v-if="max_advance_booking_days > max_advance_booking" class="small-12 medium-12 large-12">
+          <table class="hover">
+                <tbody>
+                  <tr>
+
+                     <td>
+          	Advanced booking is limited to {{ max_advance_booking }} day/s. 
+                     </td>
+                  </tr>
+                </tbody>
+          </table>
+     </div>
+
+
         </div>
        </div>
 
@@ -346,6 +360,8 @@ export default {
             maxChildren: 30,
             gearType: getQueryParam('gear_type', 'tent'),
             mooring_vessel_size: 0,
+            max_advance_booking: 0,
+            max_advance_booking_days: 0,
             gearTotals: {
                 tent: 0,
                 campervan: 0,
@@ -438,8 +454,6 @@ export default {
                 submitData.campground = vm.parkstayGroundId;
                 submitData.campsite_class = site.type;
             }
-            //console.log(site);
-            //console.log(submitData);
             $.ajax({
                 url: vm.parkstayUrl + '/api/create_booking',
                 method: 'POST',
@@ -514,6 +528,8 @@ export default {
                         vm.ongoing_booking = data.ongoing_booking;
                         vm.ongoing_booking_id = data.ongoing_booking_id;
                         vm.mooring_vessel_size = data.vessel_size;
+                        vm.max_advance_booking = data.max_advance_booking;
+                        vm.max_advance_booking_days = data.max_advance_booking_days;
 
                         if (data.error_type != null) {
                             vm.status = 'online';