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
Add default_menu(location) method to Store model.
Matthew Kennedy57739c4fd6ac
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rbindex 18e051d0c5..d622999c97 100644--- a/core/app/models/spree/menu.rb+++ b/core/app/models/spree/menu.rb@@ -27,11 +27,11 @@ module Spreeself.whitelisted_ransackable_attributes = %w[name location locale store_id]- MENU_LOCATIONS_PARAMETERIZED.each do |name|- define_singleton_method("for_#{name}") do |locale = nil, fallback_locale = nil|- menu = find_by(location: name, locale: locale.to_s) ||- find_by(location: name, locale: fallback_locale.to_s) ||- find_by(location: name)+ MENU_LOCATIONS_PARAMETERIZED.each do |location_name|+ define_singleton_method("for_#{location_name}") do |store|+ menu = find_by(location: location_name, locale: I18n.locale.to_s) ||+ store.default_menu(location_name) ||+ find_by(location: location_name)if menu.present?menu.rootenddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 1c24b744df..7bc9ea8737 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -58,6 +58,10 @@ module Spreeendend+ def default_menu(location)+ menus.find_by(location: location, locale: default_locale)+ end+def supported_currencies_list@supported_currencies_list ||= (read_attribute(:supported_currencies).to_s.split(',') << default_currency).sort.map(&:to_s).map do |code|::Money::Currency.find(code.strip)diff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rbindex 647438ffde..1bdfdf0956 100644--- a/core/spec/models/spree/menu_spec.rb+++ b/core/spec/models/spree/menu_spec.rb@@ -32,24 +32,32 @@ describe Spree::Menu, type: :model doenddescribe '#for_header' do- let!(:fr_store) { create(:store, default_locale: 'fr', supported_locales: 'fr,en') }+ let!(:fr_store) { create(:store, default_locale: 'fr', supported_locales: 'fr,en,de') }let!(:menu_en) { create(:menu, name: 'Main Menu EN', store: fr_store, locale: 'en') }let!(:menu_fr) { create(:menu, name: 'Main Menu FR', store: fr_store, locale: 'fr') }- it 'returns a menu in the requested locale if one is available' do- expect(described_class.for_header('en', 'fr').name).to eql('Main Menu EN')- end+ context 'when the I18n.locale is set to a none default laguage and a menu is available' do+ before { I18n.locale = :en }- it 'returns a menu in the current stores default locale if one is available' do- expect(described_class.for_header('de', 'fr').name).to eql('Main Menu FR')+ it 'returns a menu in the correct locale' do+ expect(described_class.for_header(fr_store).name).to eql('Main Menu EN')+ endend- it 'returns a menu even if no locales are matched' do- expect(described_class.for_header(nil, nil).name).to eql('Main Menu EN')+ context 'when the I18n.locale is set to a none default laguage and a menu is not available' do+ before { I18n.locale = :de }++ it 'returns a menu in the current stores default locale if one is available' do+ expect(described_class.for_header(fr_store).name).to eql('Main Menu FR')+ endend- it 'handels no args being passed and still returns a menu' do- expect(described_class.for_header.name).to eql('Main Menu EN')+ context 'when the I18n.locale is set to the default laguage and a menu is available' do+ before { I18n.locale = :fr }++ it 'returns a the default menu' do+ expect(described_class.for_header(fr_store).name).to eql('Main Menu FR')+ endendenddiff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rbindex f5fb613181..789466683f 100644--- a/core/spec/models/spree/store_spec.rb+++ b/core/spec/models/spree/store_spec.rb@@ -82,6 +82,14 @@ describe Spree::Store, type: :model doit { expect(described_class.available_locales).to contain_exactly('en', 'de') }end+ describe '.default_menu' do+ let!(:store_a) { create(:store, default_locale: 'en') }+ let!(:menu_a) { create(:menu, store: store_a, locale: 'en') }+ let!(:menu_b) { create(:menu, store: store_a, locale: 'de') }++ it { expect(store_a.default_menu('header')).to eq(menu_a) }+ end+shared_context 'with checkout zone set' dolet!(:country1) { create(:country) }let!(:country2) { create(:country) }diff --git a/frontend/app/helpers/spree/navigation_helper.rb b/frontend/app/helpers/spree/navigation_helper.rbindex 2e1364c0d3..557ce18143 100644--- a/frontend/app/helpers/spree/navigation_helper.rb+++ b/frontend/app/helpers/spree/navigation_helper.rb@@ -57,7 +57,7 @@ module Spreemethod_name = "for_#{location}"if available_menus.respond_to?(method_name) && Spree::Menu::MENU_LOCATIONS_PARAMETERIZED.include?(location)- available_menus.send(method_name, I18n.locale, current_store.default_locale)+ available_menus.send(method_name, current_store)endend