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

Use accessible_by method instead of involving_managed_distributors method to fetch all order cycles

Browse Source
This commit is contained in:
Hugo Daniel
2018-02-07 15:56:39 +01:00
committed by Maikel Linke
parent 65fea6291e
commit 3fa5ca7eae
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,7 +208,7 @@ Spree::Admin::ReportsController.class_eval do
# My suppliers and any suppliers supplying products I distribute
@suppliers = permissions.visible_enterprises_for_order_reports.is_primary_producer
@order_cycles = load_order_cycles
@order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
@report_types = report_types[:orders_and_fulfillment]
@report_type = params[:report_type]
@@ -331,16 +331,4 @@ Spree::Admin::ReportsController.class_eval do
def timestamp
Time.zone.now.strftime("%Y%m%d")
end
# Loads all order cycles concerned by current user, may he be producer, distributor or coordinator
def load_order_cycles
@order_cycles = OrderCycle.active_or_complete.involving_managed_distributors_of(spree_current_user)
# Avoids duplicates
OrderCycle.active_or_complete.involving_managed_producers_of(spree_current_user).each do |order_cycle|
@order_cycles << order_cycle unless @order_cycles.include?(order_cycle)
end
@order_cycles.sort_by!(&:orders_close_at)
end
end