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.

Move `Store` `default_currency` and `default_locale` into `Markets` module

Damian Legawiec30090311becf
diff --git a/backend/engines/admin/app/controllers/spree/admin/translations_controller.rb b/backend/engines/admin/app/controllers/spree/admin/translations_controller.rb
index fdbcc4f737..0d0459e6af 100644
--- a/backend/engines/admin/app/controllers/spree/admin/translations_controller.rb
+++ b/backend/engines/admin/app/controllers/spree/admin/translations_controller.rb
@@ -57,6 +57,7 @@ module Spree
# Load available locales for this resource, excluding default
def load_data
+ @default_locale = current_store.default_locale
@locales = (current_store.supported_locales_list - [@default_locale]).sort
end
diff --git a/backend/engines/core/app/models/concerns/spree/stores/markets.rb b/backend/engines/core/app/models/concerns/spree/stores/markets.rb
index 81c704060c..c713ec674b 100644
--- a/backend/engines/core/app/models/concerns/spree/stores/markets.rb
+++ b/backend/engines/core/app/models/concerns/spree/stores/markets.rb
@@ -13,6 +13,20 @@ module Spree
@default_market ||= Spree::Market.default_for_store(self)
end
+ # Returns the default locale, delegating to the default market when markets exist
+ # Falls back to the store's own default_locale column
+ # @return [String, nil]
+ def default_locale
+ default_market&.default_locale || read_attribute(:default_locale)
+ end
+
+ # Returns the default currency, delegating to the default market when markets exist
+ # Falls back to the store's own default_currency column
+ # @return [String, nil]
+ def default_currency
+ default_market&.currency || read_attribute(:default_currency)
+ end
+
# Returns the market that contains the given country
# @param country [Spree::Country]
# @return [Spree::Market, nil]
@@ -48,7 +62,7 @@ module Spree
# @return [Array<String>]
def supported_locales_list
@supported_locales_list ||= if markets.any?
- markets.flat_map(&:supported_locales_list).uniq.sort
+ (markets.flat_map(&:supported_locales_list) << default_locale).compact.uniq.sort
else
legacy_supported_locales_list
end
diff --git a/backend/engines/core/app/models/spree/store.rb b/backend/engines/core/app/models/spree/store.rb
index 7c7b07ef30..1493f0d6df 100644
--- a/backend/engines/core/app/models/spree/store.rb
+++ b/backend/engines/core/app/models/spree/store.rb
@@ -135,7 +135,7 @@ module Spree
# Validations
#
with_options presence: true do
- validates :name, :url, :mail_from_address, :default_currency, :default_country, :code
+ validates :name, :url, :mail_from_address, :default_country, :code
end
validates :preferred_digital_asset_authorized_clicks, numericality: { only_integer: true, greater_than: 0 }
validates :preferred_digital_asset_authorized_days, numericality: { only_integer: true, greater_than: 0 }
diff --git a/backend/engines/core/spec/models/spree/store_spec.rb b/backend/engines/core/spec/models/spree/store_spec.rb
index 97d1338e7d..61e02b72db 100644
--- a/backend/engines/core/spec/models/spree/store_spec.rb
+++ b/backend/engines/core/spec/models/spree/store_spec.rb
@@ -612,16 +612,103 @@ describe Spree::Store, type: :model, without_global_store: true do
end
end
+ describe '#default_currency' do
+ context 'with markets' do
+ let!(:store) { create(:store, default_currency: 'USD') }
+
+ before do
+ create(:market, store: store, currency: 'EUR', default: true)
+ create(:market, store: store, currency: 'GBP')
+ end
+
+ it 'delegates to default market' do
+ expect(store.default_currency).to eq('EUR')
+ end
+ end
+
+ context 'with markets but no default_currency on store column' do
+ let!(:store) { create(:store, default_currency: 'USD') }
+
+ before do
+ create(:market, store: store, currency: 'GBP', default: true)
+ store.update_column(:default_currency, nil)
+ end
+
+ it 'returns default market currency' do
+ expect(store.default_currency).to eq('GBP')
+ end
+ end
+
+ context 'without markets' do
+ let(:store) { build(:store, default_currency: 'USD') }
+
+ it 'returns the store column value' do
+ expect(store.default_currency).to eq('USD')
+ end
+ end
+
+ context 'without markets and no default_currency on store column' do
+ let(:store) { build(:store, default_currency: nil) }
+
+ it 'returns nil' do
+ expect(store.default_currency).to be_nil
+ end
+ end
+ end
+
+ describe '#default_locale' do
+ context 'with markets' do
+ let!(:store) { create(:store, default_locale: 'en') }
+
+ before do
+ create(:market, store: store, default_locale: 'de', default: true)
+ create(:market, store: store, default_locale: 'fr')
+ end
+
+ it 'delegates to default market' do
+ expect(store.default_locale).to eq('de')
+ end
+ end
+
+ context 'with markets but no default_locale on store column' do
+ let!(:store) { create(:store, default_locale: nil) }
+
+ before do
+ create(:market, store: store, default_locale: 'fr', default: true)
+ end
+
+ it 'returns default market locale' do
+ expect(store.default_locale).to eq('fr')
+ end
+ end
+
+ context 'without markets' do
+ let(:store) { build(:store, default_locale: 'en') }
+
+ it 'returns the store column value' do
+ expect(store.default_locale).to eq('en')
+ end
+ end
+
+ context 'without markets and no default_locale on store column' do
+ let(:store) { build(:store, default_locale: nil) }
+
+ it 'returns nil' do
+ expect(store.default_locale).to be_nil
+ end
+ end
+ end
+
describe '#supported_locales_list' do
context 'with markets' do
let!(:store) { create(:store, default_locale: 'en') }
before do
- create(:market, store: store, default_locale: 'en', supported_locales: 'en,fr', default: true)
- create(:market, store: store, default_locale: 'de', supported_locales: 'de')
+ create(:market, store: store, default_locale: 'en', supported_locales: 'fr', default: true)
+ create(:market, store: store, default_locale: 'de', supported_locales: nil)
end
- it 'derives locales from markets' do
+ it 'includes default_locale from each market even when not in supported_locales' do
expect(store.supported_locales_list).to contain_exactly('de', 'en', 'fr')
end
end