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.

Fix code issues.

Matthew Kennedycc219f740687
diff --git a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb b/api/app/controllers/spree/api/v2/storefront/menus_controller.rb
index 6b391a23fa..6c4a94f3f9 100644
--- a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/menus_controller.rb
@@ -31,6 +31,10 @@ module Spree
def model_class
Spree::Menu
end
+
+ def scope
+ super.by_store(current_store)
+ end
end
end
end
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 6b426f5da2..96f9429763 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -22,6 +22,8 @@ module Spree
has_one :root, -> { where(parent_id: nil) }, class_name: 'Spree::MenuItem', dependent: :destroy
+ scope :by_store, ->(store) { where(store: store) }
+
self.whitelisted_ransackable_attributes = %w[name location locale store_id]
MENU_LOCATIONS_PARAMETERIZED.each do |name|
diff --git a/frontend/app/helpers/spree/navigation_helper.rb b/frontend/app/helpers/spree/navigation_helper.rb
index 7f104bc6e0..08789c1d66 100644
--- a/frontend/app/helpers/spree/navigation_helper.rb
+++ b/frontend/app/helpers/spree/navigation_helper.rb
@@ -88,13 +88,11 @@ module Spree
rel = opts[:rel] || 'noopener noreferrer'
end
+ link_opts = { target: target, rel: rel, class: opts[:class], id: opts[:id], data: opts[:data], aria: opts[:aria] }
if block_given?
- link_to spree_localized_item_link(item), target: target, rel: rel, class: opts[:class],
- id: opts[:id], data: opts[:data], aria: opts[:aria], &block
-
+ link_to spree_localized_item_link(item), spree_localized_item_link(item), link_opts, &block
else
- link_to item.name, spree_localized_item_link(item), target: target, rel: rel, class: opts[:class],
- id: opts[:id], data: opts[:data], aria: opts[:aria]
+ link_to item.name, spree_localized_item_link(item), link_opts
end
end
diff --git a/frontend/app/views/spree/shared/_main_nav_bar.html.erb b/frontend/app/views/spree/shared/_main_nav_bar.html.erb
index a58f390f98..f0cd47204a 100644
--- a/frontend/app/views/spree/shared/_main_nav_bar.html.erb
+++ b/frontend/app/views/spree/shared/_main_nav_bar.html.erb
@@ -7,7 +7,7 @@
<% dropdown_toggle_class = has_dropdown ? "dropdown-toggle" : "" %>
<% data_attr = has_dropdown ? { toggle: "dropdown" } : {} %>
<% aria_attr = has_dropdown ? { haspopup: true, expanded: false } : {} %>
- <% if parent.item_type == "Container" %>
+ <% if parent.container? %>
<%= content_tag :span, parent.name, class: "nav-link main-nav-bar-item main-nav-bar-category-button #{dropdown_toggle_class}", data: data_attr, aria: aria_attr %>
<% else %>
<%= spree_nav_link_tag(parent, { class: "nav-link main-nav-bar-item main-nav-bar-category-button #{dropdown_toggle_class}", data: data_attr, aria: aria_attr }) %>