Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix filters on the storefront (#12541)

Damian Kaczmarczykc5d3dc028cb3
diff --git a/storefront/app/helpers/spree/filters_helper.rb b/storefront/app/helpers/spree/filters_helper.rb
index ce5d53a9e1..afd66de300 100644
--- a/storefront/app/helpers/spree/filters_helper.rb
+++ b/storefront/app/helpers/spree/filters_helper.rb
@@ -83,7 +83,9 @@ module Spree
def filter_values_for_filter(filter)
selected = single_option_filter_selected?(filter.name)
if filter.option_values.loaded?
- filter.option_values.find_all { |option_value| storefront_filter_values_scope(selected).include?(option_value.id) }
+ storefront_filter_values_ids = storefront_filter_values_scope(selected).pluck(:id)
+
+ filter.option_values.find_all { |option_value| storefront_filter_values_ids.include?(option_value.id) }
else
filter.option_values.where(id: storefront_filter_values_scope(selected))
end
diff --git a/storefront/app/views/themes/default/spree/products/_filters.html.erb b/storefront/app/views/themes/default/spree/products/_filters.html.erb
index 86ed9eea7e..4cdb9ff067 100644
--- a/storefront/app/views/themes/default/spree/products/_filters.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_filters.html.erb
@@ -24,7 +24,7 @@
<% end %>
<% Spree::OptionType.filterable.order(:position).includes(:option_values).each do |filter| %>
- <% if filter.name == 'color'%>
+ <% if filter.color? %>
<%= render 'spree/products/filters/colors', filter: filter, f: f %>
<% else %>
<%= render 'spree/products/filters/generic', filter: filter, f: f %>