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
Improve handling of currency filtering in Product Finder and pass Store default currency in Base searcher
Damian Legawiec47152e6c142c
diff --git a/core/app/finders/spree/products/find.rb b/core/app/finders/spree/products/find.rbindex 9ecf2f596d..afe75a2630 100644--- a/core/app/finders/spree/products/find.rb+++ b/core/app/finders/spree/products/find.rb@@ -1,13 +1,22 @@module Spreemodule Productsclass Find- def initialize(scope:, params:, current_currency:)+ def initialize(scope:, params:, current_currency: nil)@scope = scope+ ActiveSupport::Deprecation.warn('`current_currency` param is deprecated and will be removed in Spree 5') if current_currency++ if current_currency.present?+ ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)+ `current_currency` param is deprecated and will be removed in Spree 5.+ Please pass `:currency` in `params` hash instead.+ DEPRECATION+ end+@ids = String(params.dig(:filter, :ids)).split(',')@skus = String(params.dig(:filter, :skus)).split(',')@price = map_prices(String(params.dig(:filter, :price)).split(','))- @currency = current_currency+ @currency = current_currency || params.dig(:filter, :currency) || params[:currency]@taxons = taxon_ids(params.dig(:filter, :taxons))@concat_taxons = taxon_ids(params.dig(:filter, :concat_taxons))@name = params.dig(:filter, :name)diff --git a/core/lib/spree/core/search/base.rb b/core/lib/spree/core/search/base.rbindex 84412afcca..6d89136388 100644--- a/core/lib/spree/core/search/base.rb+++ b/core/lib/spree/core/search/base.rb@@ -6,8 +6,8 @@ module Spreedef initialize(params)@properties = {}- @current_currency = Spree::Config[:currency]@current_store = params[:current_store] || Spree::Store.default+ @current_currency = @current_store.default_currency@taxon = params[:taxon]prepare(params)@@ -37,11 +37,11 @@ module Spreeprice: price,option_value_ids: option_value_ids,properties: product_properties,- taxons: taxon&.id+ taxons: taxon&.id,+ currency: current_currency},sort_by: sort_by- },- current_currency: current_currency+ }).executebase_scope = add_search_scopes(base_scope)add_eagerload_scopes(base_scope)diff --git a/core/spec/finders/spree/products/find_spec.rb b/core/spec/finders/spree/products/find_spec.rbindex f2e646c0f7..b039ad49f9 100644--- a/core/spec/finders/spree/products/find_spec.rb+++ b/core/spec/finders/spree/products/find_spec.rb@@ -16,7 +16,7 @@ module Spreeids: '',skus: '',price: '',- currency: false,+ currency: 'USD',taxons: '',concat_taxons: '',name: false,@@ -29,8 +29,7 @@ module Spreeexpect(described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).execute).to include(product, product_2, discontinued_product)end@@ -45,8 +44,8 @@ module Spreeids: '',skus: '',price: '',- currency: false,taxons: '',+ currency: 'USD',concat_taxons: '',name: false,options: false,@@ -58,8 +57,7 @@ module Spreeexpect(described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).execute).to include(product, product_2, deleted_product)end@@ -72,7 +70,7 @@ module Spreeids: '',skus: '',price: '',- currency: false,+ currency: 'USD',taxons: '',concat_taxons: '',name: false,@@ -85,8 +83,7 @@ module Spreeexpect(described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).execute).to include(product, product_2)end@@ -96,8 +93,7 @@ module Spreesubject(:products) dodescribed_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeend@@ -166,8 +162,7 @@ module Spreesubject(:products) dodescribed_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeend@@ -261,8 +256,7 @@ module Spreesubject(:products) dodescribed_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeend@@ -293,8 +287,7 @@ module Spreesubject(:products) dodescribed_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeend@@ -365,8 +358,7 @@ module Spreesubject(:products) dodescribed_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeend@@ -411,8 +403,7 @@ module Spreeproduct_ids = described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).execute.map(&:id)expect(product_ids).to eq Spree::Product.available.order(available_on: :desc).map(&:id)@@ -425,8 +416,7 @@ module Spreeproducts = described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).execute.to_aexpect(products).to eq [product_2, product_3, product]@@ -439,8 +429,7 @@ module Spreeproducts = described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeexpect(products).to eq [product, product_3, product_2]@@ -453,8 +442,7 @@ module Spreeproducts = described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeexpect(products).to eq [product, product_2, product_3]@@ -467,8 +455,7 @@ module Spreeproducts = described_class.new(scope: Spree::Product.all,- params: params,- current_currency: 'USD'+ params: params).executeexpect(products).to eq [product_3, product_2, product]