Don't compile Sales Tax report data before search

This commit is contained in:
Maikel Linke
2018-05-03 15:25:13 +10:00
parent 983e128d90
commit d464216027
4 changed files with 12 additions and 3 deletions

View File

@@ -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

View File

@@ -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|

View File

@@ -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

View File

@@ -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) }