app/models/tramway/event/event.rb in tramway-event-1.9.25 vs app/models/tramway/event/event.rb in tramway-event-1.9.25.1
- old
+ new
@@ -18,11 +18,12 @@
scope :past, -> { where 'end_date < ?', DateTime.now }
def request_collecting_state
return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?
return :will_begin_soon if request_collecting_begin_date > DateTime.now
- return :is_over if request_collecting_end_date < DateTime.now
+ return :is_over if request_collecting_end_date.present? && request_collecting_end_date < DateTime.now
return :are_being_right_now if request_collecting_begin_date&.past? && request_collecting_end_date&.future?
+ return :are_being_right_now if request_collecting_begin_date < DateTime.now && !request_collecting_end_date.present?
end
include ::Tramway::Partner::Scopes if defined? ::Tramway::Partner
end