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.

Added StoreCreditEvent#store and scope order/payments by store

Damian Legawiec6230050ad5ba
diff --git a/core/app/models/spree/store_credit_event.rb b/core/app/models/spree/store_credit_event.rb
index c8c4ee2daf..79603f1a3f 100644
--- a/core/app/models/spree/store_credit_event.rb
+++ b/core/app/models/spree/store_credit_event.rb
@@ -8,7 +8,7 @@ module Spree
scope :exposed_events, -> { where.not(action: [Spree::StoreCredit::ELIGIBLE_ACTION, Spree::StoreCredit::AUTHORIZE_ACTION]) }
scope :reverse_chronological, -> { order(created_at: :desc) }
- delegate :currency, to: :store_credit
+ delegate :currency, :store, to: :store_credit
def display_amount
Spree::Money.new(amount, currency: currency)
@@ -32,7 +32,7 @@ module Spree
end
def order
- Spree::Payment.find_by(response_code: authorization_code).try(:order)
+ store.payments.find_by(response_code: authorization_code).try(:order)
end
end
end
diff --git a/core/spec/models/spree/store_credit_event_spec.rb b/core/spec/models/spree/store_credit_event_spec.rb
index 37178925a3..cbc095eec8 100644
--- a/core/spec/models/spree/store_credit_event_spec.rb
+++ b/core/spec/models/spree/store_credit_event_spec.rb
@@ -75,8 +75,11 @@ describe 'StoreCreditEvent' do
end
describe '#order' do
+ let(:store) { create(:store) }
+ let(:store_credit) { create(:store_credit, store: store) }
+
context 'there is no associated payment with the event' do
- subject { create(:store_credit_auth_event) }
+ subject { create(:store_credit_auth_event, store_credit: store_credit) }
it 'returns nil' do
expect(subject.order).to be_nil
@@ -86,11 +89,12 @@ describe 'StoreCreditEvent' do
context 'there is an associated payment with the event' do
subject do
create(:store_credit_auth_event, action: Spree::StoreCredit::CAPTURE_ACTION,
- authorization_code: authorization_code)
+ authorization_code: authorization_code,
+ store_credit: store_credit)
end
let(:authorization_code) { '1-SC-TEST' }
- let(:order) { create(:order) }
+ let(:order) { create(:order, store: store) }
let!(:payment) { create(:store_credit_payment, order: order, response_code: authorization_code) }
it 'returns the order associated with the payment' do
@@ -98,4 +102,13 @@ describe 'StoreCreditEvent' do
end
end
end
+
+ describe '#store' do
+ let(:store) { create(:store) }
+ let(:store_credit) { create(:store_credit, store: store) }
+
+ subject { build(:store_credit_auth_event, store_credit: store_credit) }
+
+ it { expect(subject.store).to eq(store) }
+ end
end