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.

allow filtering Products by a price amount more than 300

Łukasz Adamczyk676b5a694fb2
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 41f80212f0..f8272c25e0 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -101,6 +101,7 @@ en:
shipping_category: Shipping Category
tax_category: Tax Category
less_than: Less than
+ more_than: More than
spree/promotion:
advertise: Advertise
code: Code
diff --git a/core/lib/spree/core/search/base.rb b/core/lib/spree/core/search/base.rb
index dd137b293d..633e532e2d 100644
--- a/core/lib/spree/core/search/base.rb
+++ b/core/lib/spree/core/search/base.rb
@@ -108,7 +108,7 @@ module Spree
high_price = Monetize.parse(price_param.remove("#{less_than_string} ")).to_i
else
low_price, high_price = Monetize.parse_collection(price_param).map(&:to_i)
- high_price = Float::INFINITY if high_price.zero?
+ high_price = Float::INFINITY if high_price&.zero?
end
"#{low_price},#{high_price}"
diff --git a/core/spec/finders/spree/products/find_spec.rb b/core/spec/finders/spree/products/find_spec.rb
index a78178f87b..64a8d12624 100644
--- a/core/spec/finders/spree/products/find_spec.rb
+++ b/core/spec/finders/spree/products/find_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe Products::Find do
let!(:product) { create(:product, price: 15.99) }
let!(:product_2) { create(:product, discontinue_on: Time.current + 1.day, price: 23.99) }
- let!(:product_3) { create(:variant).product }
+ let!(:product_3) { create(:variant, price: 19.99).product }
let!(:option_value) { create(:option_value) }
let!(:deleted_product) { create(:product, deleted_at: Time.current - 1.day) }
let!(:discontinued_product) { create(:product, discontinue_on: Time.current - 1.day) }
@@ -238,6 +238,38 @@ module Spree
end
end
+ describe 'filter by prices' do
+ subject(:products) do
+ described_class.new(
+ scope: Spree::Product.all,
+ params: params,
+ current_currency: 'USD'
+ ).execute
+ end
+
+ let(:params) { { filter: { price: price_param } } }
+
+ context 'for a price less than 20' do
+ let(:price_param) { '0,20' }
+
+ it { is_expected.to contain_exactly(product, product_3) }
+ end
+
+ context 'for a price between 16 and 24' do
+ let(:price_param) { '16,24' }
+
+ it { is_expected.to contain_exactly(product_2, product_3) }
+ end
+
+ context 'for a price more than 23' do
+ let(:price_param) { '23,Infinity' }
+
+ it do
+ is_expected.to contain_exactly(product_2)
+ end
+ end
+ end
+
context 'ordered' do
context 'default' do
subject(:products) do
diff --git a/frontend/app/assets/javascripts/spree/frontend/views/spree/products/price_filters.es6 b/frontend/app/assets/javascripts/spree/frontend/views/spree/products/price_filters.es6
index c7d5c01021..d7fc3f86c2 100644
--- a/frontend/app/assets/javascripts/spree/frontend/views/spree/products/price_filters.es6
+++ b/frontend/app/assets/javascripts/spree/frontend/views/spree/products/price_filters.es6
@@ -21,7 +21,7 @@ Spree.ready(function() {
}
updatePricesForFiltering(minPrice, maxPrice) {
- const formattedPriceRange = `${minPrice} - ${maxPrice}`
+ const formattedPriceRange = `${minPrice}-${maxPrice}`
const dataParams = JSON.parse(this.filterButton.dataset.params)
const urlParams = new URLSearchParams(dataParams)
diff --git a/frontend/app/helpers/spree/frontend_helper.rb b/frontend/app/helpers/spree/frontend_helper.rb
index 0c779d6646..20be41a0ed 100644
--- a/frontend/app/helpers/spree/frontend_helper.rb
+++ b/frontend/app/helpers/spree/frontend_helper.rb
@@ -227,16 +227,21 @@ module Spree
inline_svg_tag "#{name}.svg", class: "spree-icon #{classes}", size: "#{width}px*#{height}px"
end
- def price_filter_values
- @price_filter_values ||= [
- "#{I18n.t('activerecord.attributes.spree/product.less_than')} #{formatted_price(50)}",
- "#{formatted_price(50)} - #{formatted_price(100)}",
- "#{formatted_price(101)} - #{formatted_price(150)}",
- "#{formatted_price(151)} - #{formatted_price(200)}",
- "#{formatted_price(201)} - #{formatted_price(300)}"
+ def price_filters
+ @price_filters ||= [
+ less_than_price_range(50),
+ price_range(50, 100),
+ price_range(101, 150),
+ price_range(151, 200),
+ price_range(201, 300),
+ more_than_price_range(300)
]
end
+ def price_filter_values
+ @price_filter_values ||= price_filters.map(&:to_s)
+ end
+
def static_filters
@static_filters ||= Spree::Frontend::Config[:products_filters]
end
@@ -336,8 +341,23 @@ module Spree
private
- def formatted_price(value)
- Spree::Money.new(value, currency: current_currency, no_cents_if_whole: true).to_s
+ def price_range(min_amount, max_amount)
+ Filters::PriceRange.new(
+ min_price: price(min_amount),
+ max_price: price(max_amount)
+ )
+ end
+
+ def less_than_price_range(amount)
+ Filters::LessThanPriceRange.new(price: price(amount))
+ end
+
+ def more_than_price_range(amount)
+ Filters::MoreThanPriceRange.new(price: price(amount))
+ end
+
+ def price(amount)
+ Filters::Price.new(amount: amount, currency: current_currency)
end
def credit_card_icon(type)
diff --git a/frontend/app/models/spree/filters/less_than_price_range.rb b/frontend/app/models/spree/filters/less_than_price_range.rb
new file mode 100644
index 0000000000..1b838c5ac0
--- /dev/null
+++ b/frontend/app/models/spree/filters/less_than_price_range.rb
@@ -0,0 +1,21 @@
+module Spree
+ module Filters
+ class LessThanPriceRange
+ def initialize(price:)
+ @price = price
+ end
+
+ def to_param
+ "0-#{price.to_i}"
+ end
+
+ def to_s
+ "#{I18n.t('activerecord.attributes.spree/product.less_than')} #{price}"
+ end
+
+ private
+
+ attr_reader :price
+ end
+ end
+end
diff --git a/frontend/app/models/spree/filters/more_than_price_range.rb b/frontend/app/models/spree/filters/more_than_price_range.rb
new file mode 100644
index 0000000000..9d5ad2bb11
--- /dev/null
+++ b/frontend/app/models/spree/filters/more_than_price_range.rb
@@ -0,0 +1,21 @@
+module Spree
+ module Filters
+ class MoreThanPriceRange
+ def initialize(price:)
+ @price = price
+ end
+
+ def to_param
+ "#{price.to_i}-0"
+ end
+
+ def to_s
+ "#{I18n.t('activerecord.attributes.spree/product.more_than')} #{price}"
+ end
+
+ private
+
+ attr_reader :price
+ end
+ end
+end
diff --git a/frontend/app/models/spree/filters/price.rb b/frontend/app/models/spree/filters/price.rb
new file mode 100644
index 0000000000..b3fd636258
--- /dev/null
+++ b/frontend/app/models/spree/filters/price.rb
@@ -0,0 +1,22 @@
+module Spree
+ module Filters
+ class Price
+ def initialize(amount:, currency:)
+ @amount = amount.to_i
+ @currency = currency
+ end
+
+ def to_i
+ amount
+ end
+
+ def to_s
+ Spree::Money.new(amount, currency: currency, no_cents_if_whole: true).to_s
+ end
+
+ private
+
+ attr_reader :amount, :currency
+ end
+ end
+end
diff --git a/frontend/app/models/spree/filters/price_range.rb b/frontend/app/models/spree/filters/price_range.rb
new file mode 100644
index 0000000000..ca743b3267
--- /dev/null
+++ b/frontend/app/models/spree/filters/price_range.rb
@@ -0,0 +1,22 @@
+module Spree
+ module Filters
+ class PriceRange
+ def initialize(min_price:, max_price:)
+ @min_price = min_price
+ @max_price = max_price
+ end
+
+ def to_param
+ "#{min_price.to_i}-#{max_price.to_i}"
+ end
+
+ def to_s
+ "#{min_price} - #{max_price}"
+ end
+
+ private
+
+ attr_reader :min_price, :max_price
+ end
+ end
+end
diff --git a/frontend/app/views/spree/products/_filters_desktop.html.erb b/frontend/app/views/spree/products/_filters_desktop.html.erb
index 3433ddaf9c..d555669147 100644
--- a/frontend/app/views/spree/products/_filters_desktop.html.erb
+++ b/frontend/app/views/spree/products/_filters_desktop.html.erb
@@ -75,11 +75,11 @@
</button>
<div id="collapseFilterPrice" class="collapse <%= 'show' unless price_collapsed %>" aria-labelledby="filtersPrice">
<div class="card-body px-0 pt-1">
- <% price_filter_values.each do |name| %>
- <% price_param = params[:price] == name ? '' : name %>
- <%= link_to permitted_params.merge({ price: price_param }), class: "d-block" do %>
- <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-filters-card-item <%= 'plp-filters-card-item--selected' if params[:price] == name %>">
- <%= name %>
+ <% price_filters.each do |price_range| %>
+ <% price_param = params[:price] == price_range.to_param ? '' : price_range.to_param %>
+ <%= link_to permitted_params.merge(price: price_param), class: "d-block" do %>
+ <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-filters-card-item <%= 'plp-filters-card-item--selected' if params[:price] == price_range.to_param %>">
+ <%= price_range %>
</div>
<% end %>
<% end %>
diff --git a/frontend/app/views/spree/products/_filters_mobile.html.erb b/frontend/app/views/spree/products/_filters_mobile.html.erb
index 9c3f504cac..362e2fcf93 100644
--- a/frontend/app/views/spree/products/_filters_mobile.html.erb
+++ b/frontend/app/views/spree/products/_filters_mobile.html.erb
@@ -66,11 +66,11 @@
</div>
<div id="collapseFour" class="collapse <%= 'show' unless params[:price].blank? %>" aria-labelledby="headingFour" data-parent="#filters-accordion">
<div class="card-body pt-1">
- <% price_filter_values.each do |name| %>
- <% price_param = params[:price] == name ? '' : name %>
+ <% price_filters.each do |price_range| %>
+ <% price_param = params[:price] == price_range.to_param ? '' : price_range.to_param %>
<%= link_to permitted_params.merge(price: price_param, menu_open: 1), data: { params: permitted_params.merge(price: price_param, menu_open: 1), filter_name: 'price' } do %>
- <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if params[:price] == name %>">
- <%= name %>
+ <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if params[:price] == price_range.to_param %>">
+ <%= price_range %>
</div>
<% end %>
<% end %>
diff --git a/frontend/spec/models/spree/filters/less_than_price_range_spec.rb b/frontend/spec/models/spree/filters/less_than_price_range_spec.rb
new file mode 100644
index 0000000000..44269833d9
--- /dev/null
+++ b/frontend/spec/models/spree/filters/less_than_price_range_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module Spree
+ module Filters
+ RSpec.describe LessThanPriceRange do
+ let(:price_range) { described_class.new(price: price) }
+ let(:price) { Price.new(amount: 50, currency: 'USD') }
+
+ describe '#to_param' do
+ it 'returns price range as param' do
+ expect(price_range.to_param).to eq('0-50')
+ end
+ end
+
+ describe '#to_s' do
+ it 'returns a formatted price range' do
+ expect(price_range.to_s).to eq('Less than $50')
+ end
+ end
+ end
+ end
+end
diff --git a/frontend/spec/models/spree/filters/more_than_price_range_spec.rb b/frontend/spec/models/spree/filters/more_than_price_range_spec.rb
new file mode 100644
index 0000000000..7cfd6a721c
--- /dev/null
+++ b/frontend/spec/models/spree/filters/more_than_price_range_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module Spree
+ module Filters
+ RSpec.describe MoreThanPriceRange do
+ let(:price_range) { described_class.new(price: price) }
+ let(:price) { Price.new(amount: 50, currency: 'USD') }
+
+ describe '#to_param' do
+ it 'returns price range as param' do
+ expect(price_range.to_param).to eq('50-0')
+ end
+ end
+
+ describe '#to_s' do
+ it 'returns a formatted price range' do
+ expect(price_range.to_s).to eq('More than $50')
+ end
+ end
+ end
+ end
+end
diff --git a/frontend/spec/models/spree/filters/price_range_spec.rb b/frontend/spec/models/spree/filters/price_range_spec.rb
new file mode 100644
index 0000000000..28720fe3af
--- /dev/null
+++ b/frontend/spec/models/spree/filters/price_range_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+module Spree
+ module Filters
+ RSpec.describe PriceRange do
+ let(:price_range) { described_class.new(min_price: min_price, max_price: max_price) }
+
+ let(:min_price) { Price.new(amount: 50, currency: 'USD') }
+ let(:max_price) { Price.new(amount: 100, currency: 'USD') }
+
+ describe '#to_param' do
+ it 'returns price range as param' do
+ expect(price_range.to_param).to eq('50-100')
+ end
+ end
+
+ describe '#to_s' do
+ it 'returns a formatted price range' do
+ expect(price_range.to_s).to eq('$50 - $100')
+ end
+ end
+ end
+ end
+end
diff --git a/frontend/spec/models/spree/filters/price_spec.rb b/frontend/spec/models/spree/filters/price_spec.rb
new file mode 100644
index 0000000000..a604a16d10
--- /dev/null
+++ b/frontend/spec/models/spree/filters/price_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Filters::Price do
+ let(:price) { described_class.new(amount: 50, currency: 'USD') }
+
+ describe '#to_i' do
+ it 'returns price amount' do
+ expect(price.to_i).to eq(50)
+ end
+ end
+
+ describe '#to_s' do
+ it 'returns a formatted price' do
+ expect(price.to_s).to eq('$50')
+ end
+ end
+end