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
Update code for MenuItem#link
Matthew Kennedye33b023c0db2
diff --git a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb b/api/app/controllers/spree/api/v2/storefront/menus_controller.rbindex 5619498399..6b391a23fa 100644--- a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/menus_controller.rb@@ -13,7 +13,7 @@ module Spreeenddef resource- scope.find_by(location: params[:location])+ @resource ||= scope.find_by(location: params[:location])enddef resource_serializerdiff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.jsindex a69e9f63a2..c000787d2f 100644--- a/backend/app/assets/javascripts/spree/backend.js+++ b/backend/app/assets/javascripts/spree/backend.js@@ -89,7 +89,7 @@ Spree.routes.stock_items_api = function (stockLocationId) {// API v2Spree.routes.countries_api_v2 = Spree.pathFor('api/v2/platform/countries')Spree.routes.menus_api_v2 = Spree.pathFor('api/v2/platform/menus')-Spree.routes.menus_items_api_v2 = Spree.pathFor('api/v2/platform/menu_items/reposition')+Spree.routes.menus_items_api_v2 = Spree.pathFor('api/v2/platform/menu_items')Spree.routes.option_types_api_v2 = Spree.pathFor('api/v2/platform/option_types')Spree.routes.option_values_api_v2 = Spree.pathFor('api/v2/platform/option_values')Spree.routes.products_api_v2 = Spree.pathFor('/api/v2/platform/products')diff --git a/backend/app/assets/javascripts/spree/backend/menus/menu.es6 b/backend/app/assets/javascripts/spree/backend/menus/menu.es6index 0e1f55eb2e..c7f776e454 100644--- a/backend/app/assets/javascripts/spree/backend/menus/menu.es6+++ b/backend/app/assets/javascripts/spree/backend/menus/menu.es6@@ -27,14 +27,14 @@ document.addEventListener('DOMContentLoaded', function() {}})-function handleMenuItemMove(evt, successCallback) {+function handleMenuItemMove(evt) {const data = {moved_item_id: parseInt(evt.item.dataset.itemId, 10),new_parent_id: parseInt(evt.to.dataset.parentId, 10) || null,new_position_idx: parseInt(evt.newIndex, 10)}- fetch(Spree.routes.menus_items_api_v2, {+ fetch(Spree.routes.menus_items_api_v2 + '/reposition', {method: 'PATCH',headers: {Authorization: 'Bearer ' + OAUTH_TOKEN,diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rbindex a1e15eb60c..8d4a2746ea 100644--- a/core/app/models/spree/menu_item.rb+++ b/core/app/models/spree/menu_item.rb@@ -43,14 +43,18 @@ module Spreedef linkcase linked_resource_typewhen 'Spree::Taxon'- if linked_resource.nil?- nil+ return if linked_resource.nil?++ if frontend_available?+ Spree::Core::Engine.routes.url_helpers.nested_taxons_path(linked_resource.permalink)else"/#{Spree::Config[:storefront_taxon_path]}/#{linked_resource.permalink}"endwhen 'Spree::Product'- if linked_resource.nil?- nil+ return if linked_resource.nil?++ if frontend_available?+ Spree::Core::Engine.routes.url_helpers.product_path(linked_resource)else"/#{Spree::Config[:storefront_product_path]}/#{linked_resource.slug}"end@@ -63,6 +67,10 @@ module Spreeprivate+ def frontend_available?+ Spree::Core::Engine.frontend_available?+ end+def reset_link_attributesif linked_resource_type_changed? || item_type == 'Container'self.linked_resource_id = nil