diff --git a/app/assets/javascripts/property_hire_calendar_frontend.js b/app/assets/javascripts/property_hire_calendar_frontend.js index e35f869..5c399bd 100644 --- a/app/assets/javascripts/property_hire_calendar_frontend.js +++ b/app/assets/javascripts/property_hire_calendar_frontend.js @@ -105,7 +105,7 @@ window.getDateString = function(date, format,is_chinese) { }; var Calendar = function(dom,property_id,currentView,display_hire_event){ - c = this; + var c = this; display_hire_event = (display_hire_event == undefined ? true : display_hire_event); this.title = $("#current_title"); this.calendar_dom = $(dom); diff --git a/app/models/p_hire.rb b/app/models/p_hire.rb index f321833..9187095 100644 --- a/app/models/p_hire.rb +++ b/app/models/p_hire.rb @@ -83,7 +83,7 @@ class PHire end def self.monthly_event(start_date,end_date,property_id,date_only=false) - events = self.where(:property_id => property_id, :recurring => false).any_of(:start_time.gte => start_date, :end_time.gte => start_date).and(:start_time.lte => end_date).asc(:start_time) + events = self.where(:property_id => property_id, :recurring => false).any_of([{:start_time.gte => start_date}, {:end_time.gte => start_date}]).and(:start_time.lte => end_date).asc(:start_time) if date_only events = events.where(:date.ne=>nil) end diff --git a/app/models/property.rb b/app/models/property.rb index 917f878..696cc92 100644 --- a/app/models/property.rb +++ b/app/models/property.rb @@ -370,7 +370,7 @@ class Property else d_step = 0 end - bookings = bookings.any_of({:start_time.gte => etime},{:end_time.gte => etime}) + bookings = bookings.any_of([{:start_time.gte => etime},{:end_time.gte => etime}]) if time_setting_id recurring_bookings = recurring_bookings.where(:property_day_setting_id=>time_setting_id) bookings = recurring_bookings.where(:property_day_setting_id=>time_setting_id)