raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only show active or complete order cycles, ordered by cycle close date

Browse Source
This commit is contained in:
David Cook
2013-08-13 16:47:23 +10:00
parent 6bad6e2675
commit 015dbc5c01
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/spree/admin/reports_controller_decorator.rb
View File

@@ -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]

1
app/models/order_cycle.rb
View File

@@ -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).