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
Added `currency` support to `Spree::Current`
Damian Legawiec7a7b9567629d
diff --git a/core/app/models/spree/current.rb b/core/app/models/spree/current.rbindex e5378a93ff..119394920d 100644--- a/core/app/models/spree/current.rb+++ b/core/app/models/spree/current.rb@@ -1,9 +1,13 @@module Spreeclass Current < ::ActiveSupport::CurrentAttributes- attribute :store+ attribute :store, :currencydef storesuper || Spree::Store.defaultend++ def currency+ super || store&.default_currency+ endendenddiff --git a/core/lib/spree/core/controller_helpers/currency.rb b/core/lib/spree/core/controller_helpers/currency.rbindex ff63c218a6..e5dd752547 100644--- a/core/lib/spree/core/controller_helpers/currency.rb+++ b/core/lib/spree/core/controller_helpers/currency.rb@@ -17,15 +17,19 @@ module Spree# Returns the currently selected currency.# @return [String] the currently selected currency, eg. `USD`def current_currency- @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])- session[:currency]- elsif params[:currency].present? && supported_currency?(params[:currency])- params[:currency]- elsif current_store.present?- current_store.default_currency- else- Spree::Store.default.default_currency- end&.upcase+ @current_currency ||= begin+ currency = if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])+ session[:currency]+ elsif params[:currency].present? && supported_currency?(params[:currency])+ params[:currency]+ elsif current_store.present?+ current_store.default_currency+ else+ Spree::Store.default.default_currency+ end&.upcase+ Spree::Current.currency = currency+ currency+ endend# Returns the list of supported currencies for the current store.diff --git a/core/spec/lib/spree/core/controller_helpers/currency_spec.rb b/core/spec/lib/spree/core/controller_helpers/currency_spec.rbindex 9e0fd37572..65c8f8afd8 100644--- a/core/spec/lib/spree/core/controller_helpers/currency_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/currency_spec.rb@@ -16,6 +16,11 @@ describe Spree::Core::ControllerHelpers::Currency, type: :controller doit 'returns current store default currency' doexpect(controller.current_currency).to eq('GBP')end++ it 'sets Spree::Current.currency' do+ controller.current_currency+ expect(Spree::Current.currency).to eq('GBP')+ endenddescribe '#supported_currencies' do