Merge branch 'CLDC-1854-make-empty-schemes-show-inactive' into CLDC-2140-scheme-typeahead-with-inactive-locations

# Conflicts: # app/models/scheme.rb
3 years ago · b5ca0611be
1 changed files with 1 additions and 1 deletions
--- a/app/models/scheme.rb
+++ b/app/models/scheme.rb
@ -235,7 +235,7 @@ class Scheme < ApplicationRecord
  end

  def status_at(date)
-    return :incomplete unless confirmed && has_confirmed_locations?
+    return :incomplete unless confirmed && locations.confirmed.any?
    return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date
    return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date