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 menu last resort fallback to Spree::Store.default_menu

Matthew Kennedy3f065923c7e5
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 6df34a1e3e..89154371ee 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -31,9 +31,8 @@ module Spree
MENU_LOCATIONS_PARAMETERIZED.each do |location_name|
define_singleton_method("for_#{location_name}") do |locale, store|
- menu = find_by(location: location_name, locale: locale.to_s) ||
- store.default_menu(location_name) ||
- find_by(location: location_name)
+ menu = find_by(location: location_name, locale: locale.to_s) || store.default_menu(location_name)
+
if menu.present?
menu.root
end
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 7bc9ea8737..ce91f09438 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -59,7 +59,7 @@ module Spree
end
def default_menu(location)
- menus.find_by(location: location, locale: default_locale)
+ menus.find_by(location: location, locale: default_locale) || menus.find_by(location: location)
end
def supported_currencies_list