raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added loading of all active or complete order cycles concerned by the current user to the reports form collection

Browse Source 
User will see all order cycles he is concerned by as producer, distributor or coordinator
This commit is contained in:
Hugo Daniel
2018-02-06 12:22:46 +01:00
committed by Maikel Linke
parent 183621f90b
commit 64c2bdda1c
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,8 +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 = OrderCycle.active_or_complete.
involving_managed_distributors_of(spree_current_user).order('orders_close_at DESC')
@order_cycles = load_order_cycles
@report_types = report_types[:orders_and_fulfillment]
@report_type = params[:report_type]
@@ -332,4 +331,17 @@ 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! {|order_cycle| order_cycle.orders_close_at}
return @order_cycles
end
end