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 #for_store scopes to single store resources
Damian Legawiec41163054e71b
diff --git a/backend/spec/controllers/spree/admin/store_credits_controller_spec.rb b/backend/spec/controllers/spree/admin/store_credits_controller_spec.rbindex 7935fa07e8..20f2c65cc9 100644--- a/backend/spec/controllers/spree/admin/store_credits_controller_spec.rb+++ b/backend/spec/controllers/spree/admin/store_credits_controller_spec.rb@@ -12,12 +12,14 @@ module Spreelet!(:store_credit_1) { create(:store_credit, user: user, store: store) }let!(:store_credit_2) { create(:store_credit, user: user, amount_used: 10, store: store) }let!(:store_credit_3) { create(:store_credit, user: user) }+ let!(:store_credit_4) { create(:store_credit, store: store, user: create(:user)) }it 'should assign only the store credits for user and current store' doget :index, params: { user_id: user.id }expect(assigns(:store_credits)).to include store_credit_1expect(assigns(:store_credits)).to include store_credit_2expect(assigns(:store_credits)).not_to include store_credit_3+ expect(assigns(:store_credits)).not_to include store_credit_4endenddiff --git a/core/app/models/concerns/spree/multiple_stores_resource.rb b/core/app/models/concerns/spree/multiple_stores_resource.rbindex ff8c7c2702..d61a5ee172 100644--- a/core/app/models/concerns/spree/multiple_stores_resource.rb+++ b/core/app/models/concerns/spree/multiple_stores_resource.rb@@ -3,6 +3,8 @@ 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/concerns/spree/single_store_resource.rb b/core/app/models/concerns/spree/single_store_resource.rbnew file mode 100644index 0000000000..c1fdeb5955--- /dev/null+++ b/core/app/models/concerns/spree/single_store_resource.rb@@ -0,0 +1,9 @@+module Spree+ module SingleStoreResource+ extend ActiveSupport::Concern++ included do+ scope :for_store, ->(store) { where(store_id: store.id) }+ end+ end+enddiff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rbindex bf7ed51358..25d82984f0 100644--- a/core/app/models/spree/menu.rb+++ b/core/app/models/spree/menu.rb@@ -1,5 +1,7 @@module Spreeclass Menu < Spree::Base+ include SingleStoreResource+MENU_LOCATIONS = ['Header', 'Footer']MENU_LOCATIONS_PARAMETERIZED = []@@ -24,7 +26,6 @@ module Spreedefault_scope { order(created_at: :asc) }- scope :by_store, ->(store) { where(store: store) }scope :by_locale, ->(locale) { where(locale: locale) }self.whitelisted_ransackable_attributes = %w[name location locale store_id]diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 00150c4663..dd910646c7 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -19,6 +19,7 @@ module Spreeinclude Spree::Core::TokenGeneratorinclude NumberAsParam+ include SingleStoreResourceextend Spree::DisplayMoneymoney_methods :outstanding_balance, :item_total, :adjustment_total,diff --git a/core/app/models/spree/store_credit.rb b/core/app/models/spree/store_credit.rbindex 469aa4f4cd..9791bd13ba 100644--- a/core/app/models/spree/store_credit.rb+++ b/core/app/models/spree/store_credit.rb@@ -1,5 +1,7 @@module Spreeclass StoreCredit < Spree::Base+ include SingleStoreResource+acts_as_paranoidVOID_ACTION = 'void'.freezediff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rbindex 36c5997540..e3aa8b2097 100644--- a/core/spec/models/spree/menu_spec.rb+++ b/core/spec/models/spree/menu_spec.rb@@ -9,7 +9,7 @@ describe Spree::Menu, type: :model doexpect(described_class).not_to respond_to(:for_some_other_location)end- describe 'by_store' do+ describe '.for_store' dolet!(:store) { create(:store) }let!(:store_b) { create(:store) }@@ -17,11 +17,11 @@ describe Spree::Menu, type: :model dolet!(:menu_b) { create(:menu, store: store_b) }it 'returns menus for the requested store' do- expect(described_class.by_store(store)).to eq([menu_a])+ expect(described_class.for_store(store)).to eq([menu_a])endend- describe 'by_locale' do+ describe '.by_locale' dolet!(:store_milti) { create(:store) }let!(:menu_en) { create(:menu, store: store_milti, locale: 'en') }let!(:menu_fr) { create(:menu, store: store_milti, locale: 'fr') }