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
Added universal Base#for_store method
Damian Legawiec2aefb8daae21
diff --git a/api/app/controllers/spree/api/v2/resource_controller.rb b/api/app/controllers/spree/api/v2/resource_controller.rbindex 9e6bf0829a..93e65a0edf 100644--- a/api/app/controllers/spree/api/v2/resource_controller.rb+++ b/api/app/controllers/spree/api/v2/resource_controller.rb@@ -27,14 +27,7 @@ module Spreeenddef scope(skip_cancancan: false)- plural_model_name = model_class.model_name.plural.gsub(/spree_/, '').to_sym-- base_scope = if current_store.respond_to?(plural_model_name)- current_store.send(plural_model_name)- else- model_class- end-+ base_scope = model_class.for_store(current_store)base_scope = base_scope.accessible_by(current_ability, :show) unless skip_cancancanbase_scope = base_scope.includes(scope_includes) if scope_includes.any?base_scopediff --git a/backend/app/controllers/spree/admin/resource_controller.rb b/backend/app/controllers/spree/admin/resource_controller.rbindex 3e1678801e..fed8a8d942 100644--- a/backend/app/controllers/spree/admin/resource_controller.rb+++ b/backend/app/controllers/spree/admin/resource_controller.rb@@ -64,9 +64,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerenddef update_positions+ base_scope = model_class.try(:for_store, current_store) || model_class+ApplicationRecord.transaction doparams[:positions].each do |id, index|- model_class.find(id).set_list_position(index)+ base_scope.find(id).set_list_position(index)endend@@ -154,7 +156,9 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerdef parentif parent_data.present?- @parent ||= parent_data[:model_class].+ base_scope = parent_data[:model_class].try(:for_store, current_store) || parent_data[:model_class]++ @parent ||= base_scope.# Don't use `find_by_attribute_name` to workaround globalize/globalize#423 bugsend(:find_by, parent_data[:find_by].to_s => params["#{resource.model_name}_id"])instance_variable_set("@#{resource.model_name}", @parent)@@ -165,7 +169,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerif parent_data.present?parent.send(controller_name).find(params[:id])else- model_class.find(params[:id])+ base_scope = model_class.try(:for_store, current_store) || model_class+ base_scope.find(params[:id])endenddiff --git a/core/app/models/concerns/spree/multiple_stores_resource.rb b/core/app/models/concerns/spree/multiple_stores_resource.rbindex d61a5ee172..ff8c7c2702 100644--- a/core/app/models/concerns/spree/multiple_stores_resource.rb+++ b/core/app/models/concerns/spree/multiple_stores_resource.rb@@ -3,8 +3,6 @@ module Spreeextend ActiveSupport::Concernincluded do- scope :for_store, ->(store) { joins(:stores).where(Store.table_name => { id: store.id }) }-validate :must_have_one_store, unless: :disable_store_presence_validation?enddiff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rbindex 32d5361031..b2a4ca5d5e 100644--- a/core/app/models/spree/base.rb+++ b/core/app/models/spree/base.rb@@ -22,6 +22,16 @@ class Spree::Base < ApplicationRecordfalseend+ def self.for_store(store)+ plural_model_name = model_name.plural.gsub(/spree_/, '').to_sym++ if store.respond_to?(plural_model_name)+ store.send(plural_model_name)+ else+ self+ end+ end+def self.spree_base_scopeswhere(nil)enddiff --git a/core/lib/generators/spree/dummy_model/templates/model.rb.tt b/core/lib/generators/spree/dummy_model/templates/model.rb.ttindex fb0846746e..099ad2c578 100644--- a/core/lib/generators/spree/dummy_model/templates/model.rb.tt+++ b/core/lib/generators/spree/dummy_model/templates/model.rb.tt@@ -1,5 +1,5 @@module Spree- class Spree::DummyModel < ApplicationRecord+ class DummyModel < Spree::Baseacts_as_listvalidates :name, presence: trueend