Displaying all future bookings as 'currents'

malmostad · Feb 27, 2018 · 99dc599 · 99dc599
1 parent 8d77f58
commit 99dc599
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/controllers/booking_periods_controller.rb b/app/controllers/booking_periods_controller.rb
@@ -2,8 +2,7 @@ class BookingPeriodsController < ApplicationController
   before_action :set_booking_period, only: [:show, :edit, :update, :destroy]
 
   def index
-    # @booking_periods = BookingPeriod.all
-    @booking_periods = BookingPeriod.currents.or(BookingPeriod.bookables)
+    @booking_periods = BookingPeriod.currents
   end
 
   def show

diff --git a/app/models/booking_period.rb b/app/models/booking_period.rb
@@ -6,7 +6,7 @@ class BookingPeriod < ApplicationRecord
                         :booking_starts_at,
                         :booking_ends_at
   scope :currents, -> {
-    where('starts_at <= ? and ends_at >= ?', Date.today, Date.today)
+    where('ends_at >= ?', Date.today)
   }
 
   scope :bookables, -> {