raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update enterprise fee report tax_category fetching

Browse Source
This commit is contained in:
Matt-Yorkley
2023-07-04 10:00:20 +01:00
committed by Maikel Linke
parent 07774c4572
commit e2094665c5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/reporting/reports/enterprise_fee_summary/scope.rb
View File

@@ -236,7 +236,7 @@ module Reporting
LEFT OUTER JOIN spree_tax_categories AS product_tax_categories
ON (
enterprise_fees.inherits_tax_category IS TRUE
AND product_tax_categories.id = spree_products.tax_category_id
AND product_tax_categories.id = spree_variants.tax_category_id
)
JOIN_STRING
)

7
spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb
View File

@@ -31,9 +31,9 @@ describe Reporting::Reports::EnterpriseFeeSummary::FeeSummary do
# Set up other requirements for ordering.
let!(:order_cycle) { create(:simple_order_cycle, coordinator: coordinator) }
let!(:product) { create(:product, tax_category: product_tax_category) }
let!(:product) { create(:product) }
let!(:product_tax_category) { create(:tax_category, name: "Sample Product Tax") }
let!(:variant) { prepare_variant }
let!(:variant) { prepare_variant(tax_category: product_tax_category) }
# Create customers.
let!(:customer) { create(:customer, first_name: "Sample", last_name: "Customer") }
@@ -54,7 +54,8 @@ describe Reporting::Reports::EnterpriseFeeSummary::FeeSummary do
end
let!(:variant) do
prepare_variant(incoming_exchange_fees: variant_incoming_exchange_fees,
prepare_variant(tax_category: product_tax_category,
incoming_exchange_fees: variant_incoming_exchange_fees,
outgoing_exchange_fees: variant_outgoing_exchange_fees)
end