diff --git a/lib/reporting/queries/joins.rb b/lib/reporting/queries/joins.rb index 39d73fd05e..e0097aa3a0 100644 --- a/lib/reporting/queries/joins.rb +++ b/lib/reporting/queries/joins.rb @@ -23,8 +23,8 @@ module Reporting reflect query.join(association(Spree::Product, :supplier, supplier_alias)) end - def joins_product_shipping_category - reflect query.join(association(Spree::Product, :shipping_category)) + def joins_variant_shipping_category + reflect query.join(association(Spree::Variant, :shipping_category)) end def joins_order_and_distributor diff --git a/lib/reporting/reports/order_cycle_management/delivery.rb b/lib/reporting/reports/order_cycle_management/delivery.rb index 3208ce7624..04a5030579 100644 --- a/lib/reporting/reports/order_cycle_management/delivery.rb +++ b/lib/reporting/reports/order_cycle_management/delivery.rb @@ -26,7 +26,7 @@ module Reporting def has_temperature_controlled_items?(order) order.line_items.any? { |line_item| - line_item.product.shipping_category&.temperature_controlled + line_item.variant.shipping_category&.temperature_controlled } end end diff --git a/lib/reporting/reports/packing/base.rb b/lib/reporting/reports/packing/base.rb index 19e60155b2..8fb00736d8 100644 --- a/lib/reporting/reports/packing/base.rb +++ b/lib/reporting/reports/packing/base.rb @@ -19,7 +19,7 @@ module Reporting joins_variant. joins_variant_product. joins_product_supplier. - joins_product_shipping_category. + joins_variant_shipping_category. selecting(select_fields). ordered_by(ordering_fields) end