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
Add custom validation for unique_code within scope of stores.
Matthew Kennedy6562d98a0b17
diff --git a/api/app/controllers/spree/api/v2/platform/menu_items_controller.rb b/api/app/controllers/spree/api/v2/platform/menu_items_controller.rbindex 36f80b2985..6442c560aa 100644--- a/api/app/controllers/spree/api/v2/platform/menu_items_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/menu_items_controller.rb@@ -3,6 +3,8 @@ module Spreemodule V2module Platformclass MenuItemsController < ResourceController+ before_action -> { doorkeeper_authorize! :write, :admin }, only: WRITE_ACTIONS << :reposition+def repositionspree_authorize! :update, @moved_itemdiff --git a/api/app/controllers/spree/api/v2/platform/resource_controller.rb b/api/app/controllers/spree/api/v2/platform/resource_controller.rbindex b0da450f8e..3656ea2c1c 100644--- a/api/app/controllers/spree/api/v2/platform/resource_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/resource_controller.rb@@ -4,7 +4,7 @@ module Spreemodule Platformclass ResourceController < ::Spree::Api::V2::ResourceControllerREAD_ACTIONS = %i[show index]- WRITE_ACTIONS = %i[create update destroy reposition]+ WRITE_ACTIONS = %i[create update destroy]# doorkeeper scopes usage: https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopesbefore_action -> { doorkeeper_authorize! :read, :admin }, only: READ_ACTIONSdiff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rbindex 7d52947b68..5fdbc2c01b 100644--- a/core/app/models/spree/menu.rb+++ b/core/app/models/spree/menu.rb@@ -7,8 +7,9 @@ module Spreebefore_validation :paremeterize_unique_codeafter_create :set_root+ validate :uniqueness_of_code_within_scope_of_stores+validates :name, presence: true- validates :unique_code, presence: true, uniqueness: truescope :by_store, ->(store) { joins(:stores).where('store_id = ?', store) }scope :by_unique_code, ->(menu_code) { where unique_code: menu_code }@@ -24,5 +25,17 @@ module Spreedef set_rootself.root ||= MenuItem.create!(menu_id: id, name: name, item_type: 'Container', code: "#{name}-root")end++ def uniqueness_of_code_within_scope_of_stores+ existing_menu = []++ store_ids.map do |s|+ Spree::Menu.by_store(s).by_unique_code(unique_code).each { |m| existing_menu << m.name unless id == m.id }+ end++ unless existing_menu.empty?+ errors.add(:unique_code, Spree.t('admin.navigation.scope_unique_name_store_id_error', code: unique_code, menus: existing_menu[0]))+ end+ endendenddiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 11b6d424cd..f1badf4514 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -601,6 +601,7 @@ en:menus: Menusmenu_items: '%{menu_name} Items'public_details: Public Details+ scope_unique_name_store_id_error: 'The code: %{code} is already used for Menu: %{menus}, make sure your unique code is unique within the store it is being used for.'subtitle: Subtitlesettings: Settingsset_a_code: Give your Menu Item a code, this is optional, but can be useful if you need to identify this menu item.diff --git a/core/db/migrate/20210407200948_create_spree_menus.rb b/core/db/migrate/20210407200948_create_spree_menus.rbindex b55d9545b3..116f257d3d 100644--- a/core/db/migrate/20210407200948_create_spree_menus.rb+++ b/core/db/migrate/20210407200948_create_spree_menus.rb@@ -8,6 +8,6 @@ class CreateSpreeMenus < ActiveRecord::Migration[6.0]endadd_index :spree_menus, :name- add_index :spree_menus, :unique_code, unique: true+ add_index :spree_menus, :unique_codeendend