diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index 9c7837c4c4..607d49b061 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -240,8 +240,8 @@ class OrderCycle < ActiveRecord::Base end def exchanges_supplying(order) - variants_relation = Spree::Variant.joins(:line_items).merge(Spree::LineItem.in_orders(order)) - exchanges.supplying_to(order.distributor).with_any_variant(variants_relation) + variant_ids_relation = Spree::LineItem.in_orders(order).select(:variant_id) + exchanges.supplying_to(order.distributor).with_any_variant(variant_ids_relation) end def coordinated_by?(user)