diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 2016eaba72..ee65299073 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -84,7 +84,7 @@ Spree::Admin::ReportsController.class_eval do @report_type = params[:report_type] # -- Build Report with Order Grouper - @report = OpenFoodNetwork::OrderCycleManagementReport.new spree_current_user, params + @report = OpenFoodNetwork::OrderCycleManagementReport.new spree_current_user, params, render_content? @table = @report.table_items render_report(@report.header, @table, params[:csv], "order_cycle_management_#{timestamp}.csv") diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index 53310e6fe1..d9921d15c2 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -3,9 +3,10 @@ require 'open_food_network/user_balance_calculator' module OpenFoodNetwork class OrderCycleManagementReport attr_reader :params - def initialize(user, params = {}) + def initialize(user, params = {}, render_table = false) @params = params @user = user + @render_table = render_table end def header @@ -50,6 +51,8 @@ module OpenFoodNetwork end def table_items + return [] unless @render_table + if is_payment_methods? orders.map { |o| payment_method_row o } else diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb index 99ebf575af..49a9915301 100644 --- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb +++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb @@ -10,7 +10,7 @@ module OpenFoodNetwork user.spree_roles << Spree::Role.find_or_create_by_name!("admin") user end - subject { OrderCycleManagementReport.new user } + subject { OrderCycleManagementReport.new user, {}, true } describe "fetching orders" do it "fetches completed orders" do @@ -30,7 +30,7 @@ module OpenFoodNetwork context "as an enterprise user" do let!(:user) { create_enterprise_user } - subject { OrderCycleManagementReport.new user } + subject { OrderCycleManagementReport.new user, {}, true } describe "fetching orders" do let(:supplier) { create(:supplier_enterprise) }