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
Code reviews
Matthew Kennedy485ae89e7a60
diff --git a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb b/api/app/controllers/spree/api/v2/storefront/menus_controller.rbindex 20d5e1c6a1..cc0c4dc7ea 100644--- a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/menus_controller.rb@@ -8,23 +8,10 @@ module Spreedef serialize_collection(collection)collection_serializer.new(collection,- collection_options(collection).merge(params: collection_serializer_params)+ collection_options(collection).merge(params: serializer_params)).serializable_hashend- def collection_serializer_params- {- store: current_store- }- end-- def serializer_params- {- store: current_store,- include_menu_items: true- }- end-def resourcescope.find_by(unique_code: params[:unique_code])end@@ -44,6 +31,10 @@ module Spreedef model_classSpree::Menuend++ def scope+ super.by_store(current_store)+ endendendenddiff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rbindex b911b634ad..0db28489c9 100644--- a/core/app/models/spree/menu.rb+++ b/core/app/models/spree/menu.rb@@ -9,10 +9,13 @@ module Spreevalidates :name, :store, presence: truevalidates :unique_code, uniqueness: { scope: :store }- scope :by_unique_code, ->(menu_code) { where unique_code: menu_code }- scope :by_store, ->(store) { where store_id: store }+ scope :by_store, ->(store) { where store: store }- has_one :root, -> { where parent_id: nil }, class_name: 'Spree::MenuItem', dependent: :destroy+ has_one :root, -> { where(parent_id: nil) }, class_name: 'Spree::MenuItem', dependent: :destroy++ def self.by_unique_code(menu_code)+ find_by(unique_code: menu_code)+ endprivatediff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/lib/spree/core/controller_helpers/store.rbindex 54480ef7d6..c3701c8067 100644--- a/core/lib/spree/core/controller_helpers/store.rb+++ b/core/lib/spree/core/controller_helpers/store.rb@@ -15,7 +15,7 @@ module Spreeenddef available_menus- @available_menus ||= Spree::Menu.by_store(current_store)+ @available_menus ||= current_store.menusenddef store_localediff --git a/frontend/app/helpers/spree/navigation_helper.rb b/frontend/app/helpers/spree/navigation_helper.rbindex 3bf1c8561d..2a17dc8b86 100644--- a/frontend/app/helpers/spree/navigation_helper.rb+++ b/frontend/app/helpers/spree/navigation_helper.rb@@ -46,31 +46,14 @@ module Spree# this method will only return a menu if it is# available for use in the current store.def spree_menu(unique_code)- menu = available_menus.by_unique_code(unique_code)- menu[0]- end-- # Returns the root for the menu by unique_code.- # You can use .children to retrieve the top level of menu items,- # or .descendants to retrieve all menu items.- def spree_root_item_for_menu(unique_code)- return unless spree_menu(unique_code).present?-- spree_menu(unique_code).root+ available_menus.by_unique_code(unique_code)end# Returns only the top level items for the menu by unique_codedef spree_top_level_items_for_menu(unique_code)- return unless spree_root_item_for_menu(unique_code).present?-- spree_root_item_for_menu(unique_code).children- end-- # Returns all items for the menu by unique_code- def spree_all_items_for_menu(unique_code)- return unless spree_root_item_for_menu(unique_code).present?+ return unless spree_menu(unique_code).present?- spree_root_item_for_menu(unique_code).descendants+ spree_menu(unique_code).root.childrenenddef spree_localized_item_link(item)diff --git a/frontend/spec/helpers/navigation_helper_spec.rb b/frontend/spec/helpers/navigation_helper_spec.rbindex 610663d308..d69abf55a5 100644--- a/frontend/spec/helpers/navigation_helper_spec.rb+++ b/frontend/spec/helpers/navigation_helper_spec.rb@@ -32,7 +32,7 @@ module Spreeendcontext 'spree_localized_item_link' do- let(:menu) { create(:menu, unique_code: 'main-123', store_id: current_store.id) }+ let(:menu) { create(:menu, unique_code: 'main-123', store_id: current_store) }let(:product) { create(:product) }let(:taxon) { create(:taxon) }let(:item_url) { create(:menu_item, name: 'URL To Random Site', item_type: 'Link', menu_id: menu.id, parent_id: menu.root.id, linked_resource_type: 'URL', destination: 'https://some-other-website.com') }