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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
CR remarks, add mobiles filter
piotrpanko1ecaee353742
diff --git a/core/app/finders/spree/products/find.rb b/core/app/finders/spree/products/find.rbindex 4b04fe52a0..ae0e124942 100644--- a/core/app/finders/spree/products/find.rb+++ b/core/app/finders/spree/products/find.rb@@ -174,10 +174,14 @@ module Spreeproducts.joins(:product_properties).- where(spree_product_properties: { value: properties.values }).+ where(spree_product_properties: { value: product_properties_values, property_id: properties.keys }).distinctend+ def product_properties_values+ Spree::ProductProperty.where(id: properties.values.join(',').split(',')).pluck(:value)+ end+def option_types_count(option_value_ids)Spree::OptionValue.where(id: option_value_ids).diff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rbindex 82cb3b8567..55103126f8 100644--- a/core/app/models/spree/property.rb+++ b/core/app/models/spree/property.rb@@ -19,6 +19,10 @@ module Spreeproduct_properties.pluck(:value).compact.uniqend+ def first_with_value(value)+ product_properties.where(value: value).first+ end+privatedef touch_all_productsdiff --git a/core/lib/spree/core/search/base.rb b/core/lib/spree/core/search/base.rbindex 8e8e7833cf..e256cd30f9 100644--- a/core/lib/spree/core/search/base.rb+++ b/core/lib/spree/core/search/base.rb@@ -121,10 +121,6 @@ module Spreeendend- def build_product_properties(params)- params.slice(*Spree::Property.pluck(:name))- end-def prepare(params)@properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])@properties[:keywords] = params[:keywords]@@ -141,7 +137,7 @@ module Spreeelse1end- @properties[:product_properties] = build_product_properties(params)+ @properties[:product_properties] = params[:properties]endendenddiff --git a/frontend/app/helpers/spree/frontend_helper.rb b/frontend/app/helpers/spree/frontend_helper.rbindex 669613c228..ef1bd661e3 100644--- a/frontend/app/helpers/spree/frontend_helper.rb+++ b/frontend/app/helpers/spree/frontend_helper.rb@@ -267,7 +267,7 @@ module Spreeenddef available_properties_cache_key- @available_properties_cache_key ||= Spree::Property.filterable.maximum(:updated_at)&.utc&.to_i+ @available_properties_cache_key ||= Spree::Property.filterable.maximum(:updated_at).utc.to_ienddef available_propertiesdiff --git a/frontend/app/views/spree/products/_filters_desktop.html.erb b/frontend/app/views/spree/products/_filters_desktop.html.erbindex 8b98f7e2a4..d43eee8d99 100644--- a/frontend/app/views/spree/products/_filters_desktop.html.erb+++ b/frontend/app/views/spree/products/_filters_desktop.html.erb@@ -29,12 +29,12 @@</div></div><% end %>+<% available_properties.each do |property| %><% if property.uniq_values.present? %><div class="w-100 card plp-filters-card"><% property_name = property.name %>- <% collapsed = params[property_name].blank? %>-+ <% collapsed = params.dig(:properties, property.id.to_s).blank? %><button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= property_name %>" data-toggle="collapse" data-target="#collapseFilter<%= property_name %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= property_name %>" role="heading" aria-level="2"><%= property.presentation.titleize %><%= icon(name: 'plus',@@ -59,6 +59,7 @@</div><% end %><% end %>+<% price_collapsed = params[:price].blank? %><div class="w-100 card plp-filters-card"><button class="card-header text-capitalize <%= 'collapsed' if price_collapsed %> px-1 plp-filters-card-header" id="filtersPrice" data-toggle="collapse" data-target="#collapseFilterPrice" aria-expanded="<% !price_collapsed %>" aria-controls="collapseFilterPrice" role="heading" aria-level="2">diff --git a/frontend/app/views/spree/products/_filters_mobile.html.erb b/frontend/app/views/spree/products/_filters_mobile.html.erbindex 48c6b8ab35..1959349f5a 100644--- a/frontend/app/views/spree/products/_filters_mobile.html.erb+++ b/frontend/app/views/spree/products/_filters_mobile.html.erb@@ -30,6 +30,32 @@</div><% end %>+ <% available_properties.each do |property| %>+ <% if property.uniq_values.present? %>+ <% property_name = property.name %>+ <% collapsed = params.dig(:product_properties, property.id.to_s).blank? %>+ <div class="card plp-overlay-card">+ <div class="card-header text-uppercase <%= 'collapsed' if collapsed %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= property_name %>" data-target="#collapseFilterMobile<%= property_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= property_name %>" role="heading" aria-level="3">+ <%= property_name %>+ <%= icon(name: 'arrow-right',+ classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',+ width: 16,+ height: 16) %>+ </div>+ <div id="collapseFilterMobile<%= property_name %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filtersMobile<%= property_name %>" data-parent="#filters-accordion">+ <div class="card-body pt-1">+ <%= render 'spree/shared/properties',+ params_property_name: params[property_name],+ property: property,+ permitted_params: permitted_params,+ property_name: property_name+ %>+ </div>+ </div>+ </div>+ <% end %>+ <% end %>+<div class="card plp-overlay-card"><div class="card-header text-uppercase <%= 'collapsed' if params[:price].blank? %> plp-overlay-card-header" id="headingFour" data-toggle="collapse" data-target="#collapseFour" aria-expanded="true" aria-controls="collapseFour" role="heading" aria-level="3"><%= Spree.t('plp.price') %>diff --git a/frontend/app/views/spree/shared/_properties.html.erb b/frontend/app/views/spree/shared/_properties.html.erbindex b4a73e2127..535462f7cd 100644--- a/frontend/app/views/spree/shared/_properties.html.erb+++ b/frontend/app/views/spree/shared/_properties.html.erb@@ -1,10 +1,11 @@<% cache base_cache_key + [filtering_params_cache_key, @taxon&.id] do %>- <% selected_properties = params[property_name]&.split(',') || [] %>+ <% selected_properties = params.dig(:properties, "#{property.id}")&.split(',')&.map(&:to_i) || [] %>+ <% param_key = "properties[#{property.id}]" %><% property.uniq_values.each do |value| %>- <% value_slug = CGI.escape(value) %>- <% property_value_param = (selected_properties.include?(value_slug) ? selected_properties - [value_slug] : selected_properties + [value_slug]).join(',') %>- <%= link_to permitted_params.merge(property.name => property_value_param, menu_open: 1), data: { params: permitted_params.merge(property.name => property_value_param, menu_open: 1), id: value_slug, filter_name: property.name, multiselect: true } do %>- <div class="d-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if selected_properties.include?(value_slug) %>">+ <% value_id = property.first_with_value(value).id %>+ <% property_values = (selected_properties.include?(value_id) ? selected_properties - [value_id] : selected_properties + [value_id]) %>+ <%= link_to permitted_params.merge(properties: { property.id => property_values }, menu_open: 1), data: { params: permitted_params.merge(param_key => property_values, menu_open: 1), id: value_id, filter_name: param_key, multiselect: true } do %>+ <div class="d-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if selected_properties.include?(value_id) %>"><%= value %></div><% end %>