From 51f89b995a94e2f13e11333394d84997084f9013 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 5 Jul 2024 12:04:14 +1000 Subject: [PATCH 1/2] Update database include statement for report Fixes: * spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb * spec/system/admin/reports_spec.rb --- lib/reporting/reports/orders_and_distributors/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting/reports/orders_and_distributors/base.rb b/lib/reporting/reports/orders_and_distributors/base.rb index 8de02541fe..4b695d33d1 100644 --- a/lib/reporting/reports/orders_and_distributors/base.rb +++ b/lib/reporting/reports/orders_and_distributors/base.rb @@ -42,7 +42,7 @@ module Reporting private def line_item_includes - [{ variant: { product: :supplier }, + [{ variant: [:supplier, :product], order: [:bill_address, :payments, { distributor: :address }] }] end From d602482d9183ab869d38fa568f71d447e285e53e Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 5 Jul 2024 12:08:33 +1000 Subject: [PATCH 2/2] Fix report spec referencing distributor --- spec/lib/reports/orders_and_distributors_report_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/lib/reports/orders_and_distributors_report_spec.rb b/spec/lib/reports/orders_and_distributors_report_spec.rb index 0f3d046638..1b31eb68f9 100644 --- a/spec/lib/reports/orders_and_distributors_report_spec.rb +++ b/spec/lib/reports/orders_and_distributors_report_spec.rb @@ -25,7 +25,8 @@ RSpec.describe Reporting::Reports::OrdersAndDistributors::Base do let(:distributor1) { create(:distributor_enterprise) } let(:supplier) { create(:supplier_enterprise) } let(:user) { create(:admin_user) } - let(:product) { create(:product, supplier:) } + let(:product) { variant.product } + let(:variant) { create(:variant, supplier:) } let(:shipping_method) { create(:shipping_method) } let(:shipping_instructions) { 'pick up on thursday please!' } let(:order) {