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.

Use current_store.default_menu(location)

Matthew Kennedy5470192fa35c
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 4cada59c24..cba0e28f3a 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -30,10 +30,8 @@ module Spree
self.whitelisted_ransackable_attributes = %w[name location locale store_id]
MENU_LOCATIONS_PARAMETERIZED.each do |location_name|
- define_singleton_method("for_#{location_name}") do |locale, default_locale|
- menu = find_by(location: location_name, locale: locale.to_s) ||
- find_by(location: location_name, locale: default_locale.to_s) ||
- find_by(location: location_name)
+ define_singleton_method("for_#{location_name}") do |locale|
+ menu = find_by(location: location_name, locale: locale.to_s)
if menu.present?
menu.root
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index ce91f09438..e07843b36e 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -59,7 +59,11 @@ module Spree
end
def default_menu(location)
- menus.find_by(location: location, locale: default_locale) || menus.find_by(location: location)
+ menu = menus.find_by(location: location, locale: default_locale) || menus.find_by(location: location)
+
+ if menu.present?
+ menu.root
+ end
end
def supported_currencies_list
diff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/lib/spree/core/controller_helpers/store.rb
index e03c610310..c3701c8067 100644
--- a/core/lib/spree/core/controller_helpers/store.rb
+++ b/core/lib/spree/core/controller_helpers/store.rb
@@ -8,7 +8,6 @@ module Spree
helper_method :current_store
helper_method :current_price_options
helper_method :available_menus
- helper_method :store_locale
end
def current_store
diff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rb
index ba48aa9d88..212e41f60d 100644
--- a/core/spec/models/spree/menu_spec.rb
+++ b/core/spec/models/spree/menu_spec.rb
@@ -38,19 +38,19 @@ describe Spree::Menu, type: :model do
context 'when the I18n.locale is set to a none default laguage and a menu is available' do
it 'returns a menu in the correct locale' do
- expect(described_class.for_header('en', fr_store.default_locale).name).to eql('Main Menu EN')
+ expect(described_class.for_header('en').name).to eql('Main Menu EN')
end
end
context 'when the I18n.locale is set to a none default laguage and a menu is not available' do
it 'returns a menu in the current stores default locale if one is available' do
- expect(described_class.for_header('de',fr_store.default_locale).name).to eql('Main Menu FR')
+ expect(described_class.for_header('de')).to be nil
end
end
context 'when the I18n.locale is set to the default laguage and a menu is available' do
it 'returns a the default menu' do
- expect(described_class.for_header('fr', fr_store.default_locale).name).to eql('Main Menu FR')
+ expect(described_class.for_header('fr').name).to eql('Main Menu FR')
end
end
end
diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
index 789466683f..1cee1378f8 100644
--- a/core/spec/models/spree/store_spec.rb
+++ b/core/spec/models/spree/store_spec.rb
@@ -84,10 +84,25 @@ describe Spree::Store, type: :model do
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') }
+ let!(:store_b) { create(:store, default_locale: 'en') }
- it { expect(store_a.default_menu('header')).to eq(menu_a) }
+ context 'when default menu is available' do
+ let!(:menu_a) { create(:menu, store: store_a, locale: 'en') }
+ let!(:menu_b) { create(:menu, store: store_a, locale: 'de') }
+
+ it 'returns the default menu root' do
+ expect(store_a.default_menu('header')).to eq(menu_a.root)
+ end
+ end
+
+ context 'when default menu is not available' do
+ let!(:menu_c) { create(:menu, store: store_b, locale: 'de') }
+ let!(:menu_d) { create(:menu, store: store_b, locale: 'pl') }
+
+ it 'returns the first created menu root' do
+ expect(store_b.default_menu('header')).to eq(menu_c.root)
+ end
+ end
end
shared_context 'with checkout zone set' do
diff --git a/frontend/app/helpers/spree/navigation_helper.rb b/frontend/app/helpers/spree/navigation_helper.rb
index aa138e8e8b..2ac0d9ce59 100644
--- a/frontend/app/helpers/spree/navigation_helper.rb
+++ b/frontend/app/helpers/spree/navigation_helper.rb
@@ -57,7 +57,7 @@ module Spree
method_name = "for_#{location}"
if available_menus.respond_to?(method_name) && Spree::Menu::MENU_LOCATIONS_PARAMETERIZED.include?(location)
- available_menus.send(method_name, I18n.locale, store_locale)
+ available_menus.send(method_name, I18n.locale) || current_store.default_menu(location)
end
end