Show Unique Variants regardless of stock location

solidusio · Jan 30, 2019 · 4b5f2d6 · 4b5f2d6
1 parent 51eae53
commit 4b5f2d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rb
@@ -121,7 +121,7 @@ def self.suppliable
         Spree::StockItem.arel_table[:count_on_hand].gt(0),
         Spree::StockItem.arel_table[:backorderable].eq(true)
       ]
-      joins(:stock_items).where(arel_conditions.inject(:or))
+      joins(:stock_items).where(arel_conditions.inject(:or)).distinct
     end
 
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]

diff --git a/core/spec/models/spree/variant_spec.rb b/core/spec/models/spree/variant_spec.rb
@@ -783,6 +783,10 @@
       expect( subject ).not_to include(out_of_stock_variant)
     end
 
+    it "includes variants only once" do
+      expect(subject.to_a.count(in_stock_variant)).to be 1
+    end
+
     context "inventory levels globally not tracked" do
       before { Spree::Config.track_inventory_levels = false }