fix(#642): fix issue with dismissing edit modal on BlackoutList.vue

also fix the wording of out of bounds date validations
CSU-Booking-Platform · Apr 7, 2021 · f396a80 · f396a80
1 parent 4cf60c9
commit f396a80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/Models/Room.php b/app/Models/Room.php
@@ -150,9 +150,9 @@ public function verifyDatesAreWithinRoomRestrictionsValidation($startDate, $fail
         $max_days = $special_max ?? $this->max_days_advance;
 
         if (Carbon::today()->diffInDays($startTime) < $min_days) {
-            $fail('You can not book this room later than ' . $min_days . ' days in advance');
+            $fail('You can not book this room earlier than ' . $min_days . ' days in advance');
         } elseif (Carbon::today()->diffInDays($startTime) > $max_days) {
-            $fail('You can not book this room sooner than ' . $max_days . ' days in advance');
+            $fail('You can not book this room later than ' . $max_days . ' days in advance');
         }
     }
 
@@ -215,7 +215,7 @@ private function notWithinAvailabilities($startDate, $endDate)
       $endTime > $availabilityEnd->closing_hours;
   }
 
- 
+
 
   public function minimumReservationTime($startDate, $endDate, $fail)
   {

diff --git a/resources/js/Pages/Admin/Blackouts/BlackoutList.vue b/resources/js/Pages/Admin/Blackouts/BlackoutList.vue
@@ -22,7 +22,7 @@
         <!--Update Blackout Form -->
         <jet-confirmation-modal :show="blackoutBeingUpdated != null" @close="blackoutBeingUpdated = null">
             <template #title>
-                Update Blackout: {{ blackoutBeingUpdated.name}}
+                Update Blackout: {{ blackoutBeingUpdated != null && blackoutBeingUpdated.name }}
             </template>
 
             <template #content>