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

Add appropriate distributors and suppliers to the packing report

Browse Source 
ie. the ones that are distributing/supplying products the current user is distributing/supplying

 - As the orders_and_fullfillment reports already had the right filled distributors and suppliers, use the same method: add_appropriate_distributors_and_suppliers
This commit is contained in:
Jean-Baptiste Bellet
2021-07-27 18:06:30 +02:00
parent 440eb2a996
commit 4acc942100
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/spree/admin/reports_controller.rb
View File

@@ -75,6 +75,9 @@ module Spree
@report_types = report_types[:packing]
@report_type = params[:report_type]
# Add distributors/suppliers distributing/supplying products I distribute/supply
add_appropriate_distributors_and_suppliers
# -- Build Report with Order Grouper
@report = OpenFoodNetwork::PackingReport.new spree_current_user, raw_params, render_content?
@table = order_grouper_table
@@ -116,12 +119,8 @@ module Spree
def orders_and_fulfillment
raw_params[:q] ||= orders_and_fulfillment_default_filters
# -- Prepare Form Options
permissions = OpenFoodNetwork::Permissions.new(spree_current_user)
# My distributors and any distributors distributing products I supply
@distributors = permissions.visible_enterprises_for_order_reports.is_distributor
# My suppliers and any suppliers supplying products I distribute
@suppliers = permissions.visible_enterprises_for_order_reports.is_primary_producer
# Add distributors/suppliers distributing/supplying products I distribute/supply
add_appropriate_distributors_and_suppliers
@order_cycles = my_order_cycles
@@ -219,6 +218,15 @@ module Spree
# Rendering HTML is the default.
end
def add_appropriate_distributors_and_suppliers
# -- Prepare Form Options
permissions = OpenFoodNetwork::Permissions.new(spree_current_user)
# My distributors and any distributors distributing products I supply
@distributors = permissions.visible_enterprises_for_order_reports.is_distributor
# My suppliers and any suppliers supplying products I distribute
@suppliers = permissions.visible_enterprises_for_order_reports.is_primary_producer
end
def csv_report(header, table)
CSV.generate do |csv|
csv << header