Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Give the ledger a store of its own

Damian Legawiec256c860f0db3
diff --git a/spree/api/app/controllers/spree/api/v3/admin/seller_payouts_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/seller_payouts_controller.rb
index 68702cd1db..f5b7e053a7 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/seller_payouts_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/seller_payouts_controller.rb
@@ -41,10 +41,8 @@ module Spree
Spree.api.admin_seller_payout_serializer
end
- # Reached through the store's own sellers: a payout carries no store
- # of its own, and the seller is what ties it to one.
def scope
- super.where(seller_id: current_store.sellers.select(:id))
+ super.for_store(current_store)
end
def collection_includes
diff --git a/spree/api/app/controllers/spree/api/v3/admin/seller_transfers_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/seller_transfers_controller.rb
index be10f7f45c..7453aeae30 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/seller_transfers_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/seller_transfers_controller.rb
@@ -20,10 +20,8 @@ module Spree
Spree.api.admin_seller_transfer_serializer
end
- # Reached through the store's own sellers: a transfer carries no
- # store of its own, and the seller is what ties it to one.
def scope
- super.where(seller_id: current_store.sellers.select(:id))
+ super.for_store(current_store)
end
def collection_includes
diff --git a/spree/core/app/models/spree/seller_payout.rb b/spree/core/app/models/spree/seller_payout.rb
index 5b9b2ecb52..1ba26b0100 100644
--- a/spree/core/app/models/spree/seller_payout.rb
+++ b/spree/core/app/models/spree/seller_payout.rb
@@ -19,6 +19,12 @@ module Spree
has_prefix_id :vpo
include Spree::Metadata
+ # Denormalized from the seller, which never changes store — so the copy
+ # cannot drift, and tenancy is structural rather than a subquery every
+ # consumer must remember. Always set explicitly from the seller: ledger
+ # rows are written by jobs and subscribers, where the request-scoped
+ # default store is absent or wrong.
+ include Spree::SingleStoreResource
#
# Associations
diff --git a/spree/core/app/models/spree/seller_transfer.rb b/spree/core/app/models/spree/seller_transfer.rb
index 9dab59a181..d04de73886 100644
--- a/spree/core/app/models/spree/seller_transfer.rb
+++ b/spree/core/app/models/spree/seller_transfer.rb
@@ -21,6 +21,12 @@ module Spree
has_prefix_id :vtr
include Spree::Metadata
+ # Denormalized from the seller, which never changes store — so the copy
+ # cannot drift, and tenancy is structural rather than a subquery every
+ # consumer must remember. Always set explicitly from the seller: ledger
+ # rows are written by jobs and subscribers, where the request-scoped
+ # default store is absent or wrong.
+ include Spree::SingleStoreResource
KINDS = %w[earning refund_reversal].freeze
diff --git a/spree/core/app/workflows/spree/seller_payouts/sweep.rb b/spree/core/app/workflows/spree/seller_payouts/sweep.rb
index ceb97ce0e2..5dea4d8b81 100644
--- a/spree/core/app/workflows/spree/seller_payouts/sweep.rb
+++ b/spree/core/app/workflows/spree/seller_payouts/sweep.rb
@@ -70,6 +70,7 @@ module Spree
def claim_transfers
ApplicationRecord.transaction do
@payout = Spree::SellerPayout.create!(
+ store: seller.store,
seller: seller,
amount: @amount,
currency: currency,
diff --git a/spree/core/app/workflows/spree/seller_transfers/create.rb b/spree/core/app/workflows/spree/seller_transfers/create.rb
index ae7bc32d42..2ed01ea725 100644
--- a/spree/core/app/workflows/spree/seller_transfers/create.rb
+++ b/spree/core/app/workflows/spree/seller_transfers/create.rb
@@ -53,6 +53,7 @@ module Spree
def build_transfer
@seller_transfer = Spree::SellerTransfer.create!(
+ store: order.seller.store,
seller: order.seller,
order: order,
amount: earned_amount,
diff --git a/spree/core/app/workflows/spree/seller_transfers/reverse.rb b/spree/core/app/workflows/spree/seller_transfers/reverse.rb
index ac6d01ea92..2f374a887f 100644
--- a/spree/core/app/workflows/spree/seller_transfers/reverse.rb
+++ b/spree/core/app/workflows/spree/seller_transfers/reverse.rb
@@ -73,6 +73,7 @@ module Spree
next nil if bounded <= 0
Spree::SellerTransfer.create!(
+ store: @earning.store,
seller: @earning.seller,
order: order,
reversed_from: @earning,
diff --git a/spree/core/db/migrate/20260822000001_create_spree_seller_transfers.rb b/spree/core/db/migrate/20260822000001_create_spree_seller_transfers.rb
index e540c89127..7d8d45a7c4 100644
--- a/spree/core/db/migrate/20260822000001_create_spree_seller_transfers.rb
+++ b/spree/core/db/migrate/20260822000001_create_spree_seller_transfers.rb
@@ -1,6 +1,7 @@
class CreateSpreeSellerTransfers < ActiveRecord::Migration[8.1]
def change
create_table :spree_seller_transfers do |t|
+ t.references :store, null: false
t.references :seller, null: false
# The child order this earning came from. One earning per order — see the
# partial index below.
diff --git a/spree/core/db/migrate/20260822000002_create_spree_seller_payouts.rb b/spree/core/db/migrate/20260822000002_create_spree_seller_payouts.rb
index f5274a03b5..66274c21b0 100644
--- a/spree/core/db/migrate/20260822000002_create_spree_seller_payouts.rb
+++ b/spree/core/db/migrate/20260822000002_create_spree_seller_payouts.rb
@@ -1,6 +1,7 @@
class CreateSpreeSellerPayouts < ActiveRecord::Migration[8.1]
def change
create_table :spree_seller_payouts do |t|
+ t.references :store, null: false
t.references :seller, null: false
# The sum of the transfers this payout settles, fixed when it is
diff --git a/spree/core/lib/spree/testing_support/factories/seller_payout_factory.rb b/spree/core/lib/spree/testing_support/factories/seller_payout_factory.rb
index 7f3247dc44..8cd99f259f 100644
--- a/spree/core/lib/spree/testing_support/factories/seller_payout_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/seller_payout_factory.rb
@@ -1,6 +1,7 @@
FactoryBot.define do
factory :seller_payout, class: Spree::SellerPayout do
seller
+ store { seller.store }
amount { BigDecimal(20) }
currency { 'USD' }
provider { 'system' }
diff --git a/spree/core/lib/spree/testing_support/factories/seller_transfer_factory.rb b/spree/core/lib/spree/testing_support/factories/seller_transfer_factory.rb
index 21f1cfffdf..9ff90387d0 100644
--- a/spree/core/lib/spree/testing_support/factories/seller_transfer_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/seller_transfer_factory.rb
@@ -1,6 +1,7 @@
FactoryBot.define do
factory :seller_transfer, class: Spree::SellerTransfer do
seller
+ store { seller.store }
order
amount { BigDecimal(20) }
currency { 'USD' }
diff --git a/spree/core/spec/workflows/spree/seller_transfers/reverse_spec.rb b/spree/core/spec/workflows/spree/seller_transfers/reverse_spec.rb
index f520520bb5..e38afb4c89 100644
--- a/spree/core/spec/workflows/spree/seller_transfers/reverse_spec.rb
+++ b/spree/core/spec/workflows/spree/seller_transfers/reverse_spec.rb
@@ -86,11 +86,11 @@ RSpec.describe Spree::SellerTransfers::Reverse do
expect do
Spree::SellerTransfer.create!(
- seller: seller, order: order, reversed_from: earning, refund: refund,
+ store: store, seller: seller, order: order, reversed_from: earning, refund: refund,
amount: -30, currency: 'USD', kind: 'refund_reversal', provider: 'system', status: 'pending'
)
Spree::SellerTransfer.create!(
- seller: seller, order: order, reversed_from: earning, refund: refund,
+ store: store, seller: seller, order: order, reversed_from: earning, refund: refund,
amount: -30, currency: 'USD', kind: 'refund_reversal', provider: 'system', status: 'pending'
)
end.to raise_error(ActiveRecord::RecordNotUnique)