diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 2f534f044d..e479982609 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -142,7 +142,7 @@ Spree::Admin::ReportsController.class_eval do prepare_date_params params @distributors = Enterprise.is_distributor.managed_by(spree_current_user) @report_type = params[:report_type] - @report = OpenFoodNetwork::SalesTaxReport.new spree_current_user, params + @report = OpenFoodNetwork::SalesTaxReport.new spree_current_user, params, render_content? render_report(@report.header, @report.table, params[:csv], "sales_tax.csv") end diff --git a/lib/open_food_network/sales_tax_report.rb b/lib/open_food_network/sales_tax_report.rb index 061fd4b64a..02f0651ecf 100644 --- a/lib/open_food_network/sales_tax_report.rb +++ b/lib/open_food_network/sales_tax_report.rb @@ -3,9 +3,10 @@ module OpenFoodNetwork include Spree::ReportsHelper attr_accessor :user, :params - def initialize(user, params) + def initialize(user, params, render_table) @user = user @params = params + @render_table = render_table end def header @@ -42,6 +43,7 @@ module OpenFoodNetwork end def table + return [] unless @render_table case params[:report_type] when "tax_rates" orders.map do |order| diff --git a/spec/controllers/spree/admin/reports_controller_spec.rb b/spec/controllers/spree/admin/reports_controller_spec.rb index 27e0f4bcae..2e0e70d65e 100644 --- a/spec/controllers/spree/admin/reports_controller_spec.rb +++ b/spec/controllers/spree/admin/reports_controller_spec.rb @@ -303,5 +303,12 @@ describe Spree::Admin::ReportsController, type: :controller do expect(assigns(:report).table.empty?).to be false end end + + describe "sales_tax" do + it "shows report search forms" do + spree_get :sales_tax + expect(assigns(:report).table).to eq [] + end + end end end diff --git a/spec/lib/open_food_network/sales_tax_report_spec.rb b/spec/lib/open_food_network/sales_tax_report_spec.rb index a6445fa1f9..ac7bc7e47f 100644 --- a/spec/lib/open_food_network/sales_tax_report_spec.rb +++ b/spec/lib/open_food_network/sales_tax_report_spec.rb @@ -3,7 +3,7 @@ require 'open_food_network/sales_tax_report' module OpenFoodNetwork describe SalesTaxReport do let(:user) { create(:user) } - let(:report) { SalesTaxReport.new(user, {}) } + let(:report) { SalesTaxReport.new(user, {}, true) } describe "calculating totals for line items" do let(:li1) { double(:line_item, quantity: 1, amount: 12) }