diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 1d3be2dd57..1e6a83dbbd 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -348,7 +348,7 @@ Spree::Admin::ReportsController.class_eval do @distributors = Enterprise.is_distributor #@suppliers = Enterprise.is_primary_producer - @order_cycles = OrderCycle.all + @order_cycles = OrderCycle.active_or_complete.order('orders_close_at DESC') @report_type = params[:report_type] case params[:report_type] diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index e53ae8e610..a6bc72ffe1 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -12,6 +12,7 @@ class OrderCycle < ActiveRecord::Base validates_presence_of :name, :coordinator_id scope :active, lambda { where('orders_open_at <= ? AND orders_close_at >= ?', Time.now, Time.now) } + scope :active_or_complete, lambda { where('orders_open_at <= ?', Time.now) } scope :inactive, lambda { where('orders_open_at > ? OR orders_close_at < ?', Time.now, Time.now) } scope :distributing_product, lambda { |product| joins(:exchanges => :variants).