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
Ensure supported locales / currencies are set for Store
Damian Legawiecd9255d433d52
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 3372f03728..2f3bad830e 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -24,6 +24,7 @@ module Spreevalidates :mailer_logo, content_type: ['image/png', 'image/jpg', 'image/jpeg']before_save :ensure_default_exists_and_is_unique+ before_save :ensure_supported_currencies, :ensure_supported_localesbefore_destroy :validate_not_defaultscope :by_url, ->(url) { where('url like ?', "%#{url}%") }@@ -96,6 +97,22 @@ module Spreeendend+ def ensure_supported_locales+ return unless attributes.keys.include?('supported_locales')+ return if supported_locales.present?+ return if default_locale.blank?++ self.supported_locales = default_locale+ end++ def ensure_supported_currencies+ return unless attributes.keys.include?('supported_currencies')+ return if supported_currencies.present?+ return if default_currency.blank?++ self.supported_currencies = default_currency+ end+def validate_not_defaultif defaulterrors.add(:base, :cannot_destroy_default_store)diff --git a/core/lib/spree/testing_support/factories/store_factory.rb b/core/lib/spree/testing_support/factories/store_factory.rbindex f097cc4b5d..8f6f8126d4 100644--- a/core/lib/spree/testing_support/factories/store_factory.rb+++ b/core/lib/spree/testing_support/factories/store_factory.rb@@ -8,6 +8,7 @@ FactoryBot.define donew_order_notifications_email { '[email protected]' }default_currency { 'USD' }supported_currencies { 'USD,EUR,GBP' }+ default_locale { 'en' }facebook { 'spreecommerce' }twitter { 'spreecommerce' }instagram { 'spreecommerce' }diff --git a/core/spec/lib/spree/core/controller_helpers/locale_spec.rb b/core/spec/lib/spree/core/controller_helpers/locale_spec.rbindex db89c30c2e..24982bc28a 100644--- a/core/spec/lib/spree/core/controller_helpers/locale_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/locale_spec.rb@@ -41,7 +41,7 @@ describe Spree::Core::ControllerHelpers::Locale, type: :controller doendcontext 'store without locale set' do- let!(:store) { create :store, default: true }+ let!(:store) { create :store, default: true, default_locale: nil }context 'without I18n.default_locale set' doit 'fallbacks to english' dodiff --git a/core/spec/mailers/order_mailer_spec.rb b/core/spec/mailers/order_mailer_spec.rbindex eb1a2c4905..7060753045 100644--- a/core/spec/mailers/order_mailer_spec.rb+++ b/core/spec/mailers/order_mailer_spec.rb@@ -5,10 +5,10 @@ describe Spree::OrderMailer, type: :mailer doinclude EmailSpec::Helpersinclude EmailSpec::Matchers- before { create(:store) }+ before { create(:store, default_locale: nil) }- let(:first_store) { create(:store, name: 'First Store') }- let(:second_store) { create(:store, name: 'Second Store', url: 'other.example.com') }+ let(:first_store) { create(:store, name: 'First Store', default_locale: nil) }+ let(:second_store) { create(:store, name: 'Second Store', url: 'other.example.com', default_locale: nil) }let(:order) doorder = stub_model(Spree::Order, email: '[email protected]')@@ -167,19 +167,33 @@ describe Spree::OrderMailer, type: :mailer doI18n.enforce_available_locales = trueend- context 'confirm_email' do- specify do- confirmation_email = Spree::OrderMailer.confirm_email(order)- expect(confirmation_email).to have_body_text('Caro Cliente,')+ shared_examples 'translates emails' do+ context 'confirm_email' do+ specify do+ confirmation_email = Spree::OrderMailer.confirm_email(order)+ expect(confirmation_email).to have_body_text('Caro Cliente,')+ endend- end- context 'cancel_email' do- specify do- cancel_email = Spree::OrderMailer.cancel_email(order)- expect(cancel_email).to have_body_text('Resumo da Pedido [CANCELADA]')+ context 'cancel_email' do+ specify do+ cancel_email = Spree::OrderMailer.cancel_email(order)+ expect(cancel_email).to have_body_text('Resumo da Pedido [CANCELADA]')+ endendend++ context 'via I18n' do+ before { I18n.locale = :'pt-BR' }++ it_behaves_like 'translates emails'+ end++ context 'via Store locale' do+ before { order.store.update!(default_locale: 'pt-BR') }++ it_behaves_like 'translates emails'+ endendenddiff --git a/core/spec/mailers/shipment_mailer_spec.rb b/core/spec/mailers/shipment_mailer_spec.rbindex 6117b1d9a1..5fec94a7f7 100644--- a/core/spec/mailers/shipment_mailer_spec.rb+++ b/core/spec/mailers/shipment_mailer_spec.rb@@ -5,7 +5,7 @@ describe Spree::ShipmentMailer, type: :mailer doinclude EmailSpec::Helpersinclude EmailSpec::Matchers- let!(:store) { create(:store) }+ let!(:store) { create(:store, default_locale: nil) }let(:order) { stub_model(Spree::Order, number: 'R12345', store: store, email: '[email protected]') }let(:shipping_method) { stub_model(Spree::ShippingMethod, name: 'USPS') }diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rbindex e715960a9a..ad97935704 100644--- a/core/spec/models/spree/store_spec.rb+++ b/core/spec/models/spree/store_spec.rb@@ -230,7 +230,7 @@ describe Spree::Store, type: :model doenddescribe '#unique_name' do- let!(:store) { create(:store) }+ let!(:store) { build(:store) }it 'returns the Store Name followed by the Store Code in parentheses' doexpect(store.unique_name).to eq("#{store.name} (#{store.code})")@@ -240,7 +240,7 @@ describe Spree::Store, type: :model dodescribe '#supported_currencies_list' docontext 'with supported currencies set' dolet(:currencies) { 'USD, EUR, dummy' }- let!(:store) { create(:store, default_currency: 'USD', supported_currencies: currencies) }+ let!(:store) { build(:store, default_currency: 'USD', supported_currencies: currencies) }it 'returns supported currencies list' doexpect(store.supported_currencies_list).to contain_exactly(@@ -250,7 +250,7 @@ describe Spree::Store, type: :model doendcontext 'without supported currencies set' do- let!(:store) { create(:store, default_currency: 'EUR', supported_currencies: nil) }+ let!(:store) { build(:store, default_currency: 'EUR', supported_currencies: nil) }it 'returns supported currencies list' doexpect(store.supported_currencies_list).to contain_exactly(@@ -262,7 +262,7 @@ describe Spree::Store, type: :model dodescribe '#supported_locales_list' docontext 'with supported locale set' do- let(:store) { create(:store, default_locale: 'fr', supported_locales: 'fr,de') }+ let(:store) { build(:store, default_locale: 'fr', supported_locales: 'fr,de') }it 'returns supported currencies list' doexpect(store.supported_locales_list).to be_an_instance_of(Array)@@ -271,7 +271,7 @@ describe Spree::Store, type: :model doendcontext 'without supported currencies set' do- let(:store) { create(:store) }+ let(:store) { build(:store, default_locale: nil, supported_locales: nil) }it 'returns supported currencies list' doexpect(store.supported_locales_list).to be_an_instance_of(Array)@@ -279,4 +279,38 @@ describe Spree::Store, type: :model doendendend++ describe '#ensure_supported_locales' do+ context 'store with default_locale' do+ let(:store) { build(:store, default_locale: 'fr', supported_locales: nil) }++ it { expect { store.save! }.to change(store, :supported_locales).from(nil).to('fr') }+ end++ context 'store without default locale' do+ let(:store) { build(:store, default_locale: nil, supported_locales: nil) }++ it { expect { store.save! }.not_to change(store, :supported_locales).from(nil) }+ end++ context 'store with supported locales' do+ let(:store) { build(:store, default_locale: 'fr', supported_locales: 'fr,de') }++ it { expect { store.save! }.not_to change(store, :supported_locales) }+ end+ end++ describe '#ensure_supported_currencies' do+ context 'store with default_currency' do+ let(:store) { build(:store, default_currency: 'EUR', supported_currencies: nil) }++ it { expect { store.save! }.to change(store, :supported_currencies).from(nil).to('EUR') }+ end++ context 'store with supported currencies' do+ let(:store) { build(:store, default_currency: 'EUR', supported_currencies: 'EUR,GBP') }++ it { expect { store.save! }.not_to change(store, :supported_currencies) }+ end+ endenddiff --git a/frontend/spec/controllers/controller_helpers_spec.rb b/frontend/spec/controllers/controller_helpers_spec.rbindex a619b9a278..a573e76173 100644--- a/frontend/spec/controllers/controller_helpers_spec.rb+++ b/frontend/spec/controllers/controller_helpers_spec.rb@@ -44,6 +44,7 @@ describe Spree::ProductsController, type: :controller docontext 'when rails application default locale is set' docontext 'and in available_locales' dobefore do+ Spree::Store.default.update(default_locale: nil, supported_locales: nil)Rails.application.config.i18n.default_locale = available_localeenddiff --git a/frontend/spec/features/main_nav_bar_spec.rb b/frontend/spec/features/main_nav_bar_spec.rbindex 452bee569a..284ed4203c 100644--- a/frontend/spec/features/main_nav_bar_spec.rb+++ b/frontend/spec/features/main_nav_bar_spec.rb@@ -33,11 +33,11 @@ describe 'Main navigation bar', type: :feature dolet(:stores_number) { 2 }let(:first_store) { stores.first }let(:first_store_currency_symbol) { ::Money::Currency.find(first_store.default_currency).symbol }- let(:first_link_name) { "#{first_store.name} (#{first_store_currency_symbol})" }+ let(:first_link_name) { "#{Spree.t('i18n.this_file_language', locale: first_store.default_locale)} (#{first_store_currency_symbol})" }let(:first_url) { first_store.formatted_url }let(:second_store) { stores.second }let(:second_store_currency_symbol) { ::Money::Currency.find(second_store.default_currency).symbol }- let(:second_link_name) { "#{second_store.name} (#{first_store_currency_symbol})" }+ let(:second_link_name) { "#{Spree.t('i18n.this_file_language', locale: second_store.default_locale)} (#{first_store_currency_symbol})" }let(:second_url) { second_store.formatted_url }it 'shows currency selector button' do