From 656361c82d23111e39746d93f78497b6e33cc465 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Wed, 13 Mar 2024 16:45:07 +1100 Subject: [PATCH] Fix API v0 packing report --- lib/reporting/queries/joins.rb | 4 ++-- lib/reporting/reports/packing/base.rb | 2 +- spec/controllers/api/v0/reports/packing_report_spec.rb | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/reporting/queries/joins.rb b/lib/reporting/queries/joins.rb index e0097aa3a0..e4ad23e802 100644 --- a/lib/reporting/queries/joins.rb +++ b/lib/reporting/queries/joins.rb @@ -19,8 +19,8 @@ module Reporting reflect query.join(association(Spree::Variant, :product)) end - def joins_product_supplier - reflect query.join(association(Spree::Product, :supplier, supplier_alias)) + def joins_variant_supplier + reflect query.join(association(Spree::Variant, :supplier, supplier_alias)) end def joins_variant_shipping_category diff --git a/lib/reporting/reports/packing/base.rb b/lib/reporting/reports/packing/base.rb index 8fb00736d8..07ac39a59a 100644 --- a/lib/reporting/reports/packing/base.rb +++ b/lib/reporting/reports/packing/base.rb @@ -18,7 +18,7 @@ module Reporting joins_order_bill_address. joins_variant. joins_variant_product. - joins_product_supplier. + joins_variant_supplier. joins_variant_shipping_category. selecting(select_fields). ordered_by(ordering_fields) diff --git a/spec/controllers/api/v0/reports/packing_report_spec.rb b/spec/controllers/api/v0/reports/packing_report_spec.rb index 1b35ddbe66..1dbf9f287d 100644 --- a/spec/controllers/api/v0/reports/packing_report_spec.rb +++ b/spec/controllers/api/v0/reports/packing_report_spec.rb @@ -34,7 +34,7 @@ RSpec.describe Api::V0::ReportsController, type: :controller do context "as an enterprise user with partial order permissions (supplier with P-OC)" do let!(:order) { create(:completed_order_with_totals) } - let(:supplier) { order.line_items.first.product.supplier } + let(:supplier) { order.line_items.first.variant.supplier } let(:current_user) { supplier.owner } let!(:perms) { create(:enterprise_relationship, parent: supplier, child: order.distributor, @@ -62,7 +62,7 @@ RSpec.describe Api::V0::ReportsController, type: :controller do { "hub" => line_item.order.distributor.name, "customer_code" => line_item.order.customer&.code, - "supplier" => line_item.product.supplier.name, + "supplier" => line_item.variant.supplier.name, "product" => line_item.product.name, "variant" => line_item.full_name, "quantity" => line_item.quantity, @@ -80,7 +80,7 @@ RSpec.describe Api::V0::ReportsController, type: :controller do 'first_name' => '< Hidden >', 'last_name' => '< Hidden >', 'phone' => '< Hidden >', - "supplier" => line_item.product.supplier.name, + "supplier" => line_item.variant.supplier.name, "product" => line_item.product.name, "variant" => line_item.full_name, "quantity" => line_item.quantity,