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.

Add menu fallback to current_store.default_locale

Matthew Kennedy4206bda6a27a
diff --git a/backend/app/views/spree/admin/menu_items/new.html.erb b/backend/app/views/spree/admin/menu_items/new.html.erb
index 7328c14501..b08df78fa7 100644
--- a/backend/app/views/spree/admin/menu_items/new.html.erb
+++ b/backend/app/views/spree/admin/menu_items/new.html.erb
@@ -1,4 +1,5 @@
<% content_for :page_title do %>
+ <%= link_to Spree.t('admin.navigation.all_menus'), spree.admin_menus_path %> /
<%= link_to @menu.name, spree.edit_admin_menu_path(@menu) %> / <%= Spree.t('admin.navigation.new_menu_item') %>
<% end %>
diff --git a/core/app/models/concerns/spree/link.rb b/core/app/models/concerns/spree/link.rb
index efe876a970..8e68f03e2b 100644
--- a/core/app/models/concerns/spree/link.rb
+++ b/core/app/models/concerns/spree/link.rb
@@ -27,4 +27,4 @@ module Spree
end
end
end
-end
\ No newline at end of file
+end
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 2404070ad9..18e051d0c5 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -28,8 +28,10 @@ module Spree
self.whitelisted_ransackable_attributes = %w[name location locale store_id]
MENU_LOCATIONS_PARAMETERIZED.each do |name|
- define_singleton_method("for_#{name}") do |locale|
- menu = find_by(location: name, locale: locale.to_s) || find_by(location: 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)
if menu.present?
menu.root
end
diff --git a/core/spec/models/spree/menu_item_spec.rb b/core/spec/models/spree/menu_item_spec.rb
index 232139b6e7..ba44711558 100644
--- a/core/spec/models/spree/menu_item_spec.rb
+++ b/core/spec/models/spree/menu_item_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::MenuItem, type: :model do
- let!(:store) { create(:store) }
+ let!(:store) { create(:store, default_locale: 'en') }
let!(:menu) { create(:menu, name: 'Main Menu', store: store) }
describe 'validates name' do
diff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rb
index dd435cc469..647438ffde 100644
--- a/core/spec/models/spree/menu_spec.rb
+++ b/core/spec/models/spree/menu_spec.rb
@@ -31,6 +31,28 @@ describe Spree::Menu, type: :model do
end
end
+ describe '#for_header' do
+ let!(:fr_store) { create(:store, default_locale: 'fr', supported_locales: 'fr,en') }
+ 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
+
+ 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')
+ end
+
+ it 'returns a menu even if no locales are matched' do
+ expect(described_class.for_header(nil, nil).name).to eql('Main Menu EN')
+ end
+
+ it 'handels no args being passed and still returns a menu' do
+ expect(described_class.for_header.name).to eql('Main Menu EN')
+ end
+ end
+
describe 'creating new menu' do
let(:store_1) { create(:store) }
let(:store_2) { create(:store) }
diff --git a/frontend/app/helpers/spree/navigation_helper.rb b/frontend/app/helpers/spree/navigation_helper.rb
index fd3b0e17da..7aa8732b3d 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)
+ available_menus.send(method_name, I18n.locale, current_store.default_locale)
end
end