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.

Order#available_payment_methods should return only PaymentMethods associated with the Order's Store

Damian Legawiec8f52301c8178
diff --git a/api/spec/controllers/spree/api/v1/checkouts_controller_spec.rb b/api/spec/controllers/spree/api/v1/checkouts_controller_spec.rb
index 34bd254629..c2b8fd8dc8 100644
--- a/api/spec/controllers/spree/api/v1/checkouts_controller_spec.rb
+++ b/api/spec/controllers/spree/api/v1/checkouts_controller_spec.rb
@@ -4,6 +4,8 @@ module Spree
describe Api::V1::CheckoutsController, type: :controller do
render_views
+ let(:store) { Spree::Store.default }
+
shared_examples_for 'action which loads order using load_order_with_lock' do
before do
allow(controller).to receive(:load_order).with(true).and_return(true)
@@ -44,7 +46,7 @@ module Spree
create(:stock_location)
@shipping_method = create(:shipping_method, zones: [country_zone])
- @payment_method = create(:credit_card_payment_method)
+ @payment_method = create(:credit_card_payment_method, stores: [store], display_on: 'both')
end
after do
@@ -53,7 +55,7 @@ module Spree
context "PUT 'update'" do
let(:order) do
- order = create(:order_with_line_items)
+ order = create(:order_with_line_items, store: store)
# Order should be in a pristine state
# Without doing this, the order may transition from 'cart' straight to 'delivery'
Spree::ShippingRate.where(shipment_id: order.shipment_ids).delete_all
@@ -305,7 +307,7 @@ module Spree
end
context "PUT 'next'" do
- let!(:order) { create(:order_with_line_items) }
+ let!(:order) { create(:order_with_line_items, store: store) }
it 'cannot transition to address without a line item' do
order.line_items.delete_all
@@ -355,7 +357,7 @@ module Spree
end
context "PUT 'advance'" do
- let!(:order) { create(:order_with_line_items) }
+ let!(:order) { create(:order_with_line_items, store: store) }
it 'continues to advance advances an order while it can move forward' do
expect_any_instance_of(Spree::Order).to receive(:next).exactly(3).times.and_return(true, true, false)
diff --git a/api/spec/controllers/spree/api/v1/payments_controller_spec.rb b/api/spec/controllers/spree/api/v1/payments_controller_spec.rb
index 178090f1b9..4e9d576326 100644
--- a/api/spec/controllers/spree/api/v1/payments_controller_spec.rb
+++ b/api/spec/controllers/spree/api/v1/payments_controller_spec.rb
@@ -3,7 +3,8 @@ require 'spec_helper'
module Spree
describe Api::V1::PaymentsController, type: :controller do
render_views
- let!(:order) { create(:order) }
+ let(:store) { Spree::Store.default }
+ let!(:order) { create(:order, store: store) }
let!(:payment) { create(:payment, order: order) }
let!(:attributes) do
[:id, :source_type, :source_id, :amount, :display_amount,
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index c81cfe1457..3f3dd5480a 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -389,6 +389,10 @@ module Spree
end
def available_payment_methods(store = nil)
+ if store.present?
+ ActiveSupport::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
+ end
+
@available_payment_methods ||= collect_payment_methods(store)
end
@@ -627,12 +631,12 @@ module Spree
def validate_payments_attributes(attributes)
# Ensure the payment methods specified are allowed for this user
- payment_methods = Spree::PaymentMethod.where(id: available_payment_methods.map(&:id))
+ payment_method_ids = available_payment_methods.map(&:id)
+
attributes.each do |payment_attributes|
- payment_method_id = payment_attributes[:payment_method_id]
+ payment_method_id = payment_attributes[:payment_method_id].to_i
- # raise RecordNotFound unless it is an allowed payment method
- payment_methods.find(payment_method_id) if payment_method_id
+ raise ActiveRecord::RecordNotFound unless payment_method_ids.include?(payment_method_id)
end
end
@@ -725,7 +729,12 @@ module Spree
end
def collect_payment_methods(store = nil)
- PaymentMethod.available_on_front_end.select { |pm| pm.available_for_order?(self) && pm.available_for_store?(store) }
+ if store.present?
+ ActiveSupport::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
+ end
+ store ||= self.store
+
+ PaymentMethod.for_store(store).available_on_front_end.select { |pm| pm.available_for_order?(self) }
end
def credit_card_nil_payment?(attributes)
diff --git a/core/spec/models/spree/order/checkout_spec.rb b/core/spec/models/spree/order/checkout_spec.rb
index 0b28bfc49f..a1bd92e622 100644
--- a/core/spec/models/spree/order/checkout_spec.rb
+++ b/core/spec/models/spree/order/checkout_spec.rb
@@ -2,9 +2,10 @@ require 'spec_helper'
require 'spree/testing_support/order_walkthrough'
describe Spree::Order, type: :model do
- let(:order) { Spree::Order.new }
-
- before { create(:store) }
+ let!(:store) { create(:store, default: true) }
+ let(:order) { build(:order, store: store) }
+ let(:country) { create(:country) }
+ let!(:state) { country.states.first || create(:state, country: country) }
def assert_state_changed(order, from, to)
state_change_exists = order.state_changes.where(previous_state: from, next_state: to).exists?
@@ -136,10 +137,11 @@ describe Spree::Order, type: :model do
end
context 'with default addresses' do
- let(:default_address) { FactoryBot.create(:address) }
+ let(:default_address) { create(:address, state: state) }
before do
- order.user = FactoryBot.create(:user, "#{address_kind}_address" => default_address)
+ order.update("#{address_kind}_address_id": nil)
+ order.update(user: create(:user, "#{address_kind}_address" => default_address))
order.next!
order.reload
end
@@ -148,7 +150,6 @@ describe Spree::Order, type: :model do
it do
default_attributes = default_address.attributes
order_attributes = order.send("#{address_kind}_address".to_sym).try(:attributes) || {}
-
expect(order_attributes.except('id', 'created_at', 'updated_at')).to eql(default_attributes.except('id', 'created_at', 'updated_at'))
end
end
diff --git a/core/spec/models/spree/order/payment_spec.rb b/core/spec/models/spree/order/payment_spec.rb
index 3915760938..3a9370ecf0 100644
--- a/core/spec/models/spree/order/payment_spec.rb
+++ b/core/spec/models/spree/order/payment_spec.rb
@@ -120,8 +120,9 @@ module Spree
end
it 'keeps source attributes after updating' do
- persisted_order = Spree::Order.create
- credit_card_payment_method = create(:credit_card_payment_method)
+ store = create(:store)
+ persisted_order = create(:order, store: store)
+ credit_card_payment_method = create(:credit_card_payment_method, stores: [store])
attributes = {
payments_attributes: [
{
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 062a1febb5..0d0924564f 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -8,10 +8,10 @@ end
describe Spree::Order, type: :model do
let(:user) { stub_model(Spree::LegacyUser, email: '[email protected]') }
- let(:order) { stub_model(Spree::Order, user: user) }
+ let(:store) { create(:store, default: true) }
+ let(:order) { stub_model(Spree::Order, user: user, store: store) }
before do
- create(:store)
allow(Spree::LegacyUser).to receive_messages(current: mock_model(Spree::LegacyUser, id: 123))
end
@@ -47,7 +47,7 @@ describe Spree::Order, type: :model do
end
context '#cancel' do
- let(:order) { create(:completed_order_with_totals) }
+ let(:order) { create(:completed_order_with_totals, store: store) }
let!(:payment) do
create(
:payment,
@@ -125,7 +125,7 @@ describe Spree::Order, type: :model do
end
context '#finalize!' do
- let(:order) { Spree::Order.create(email: '[email protected]') }
+ let(:order) { Spree::Order.create(email: '[email protected]', store: store) }
before do
order.update_column :state, 'complete'
@@ -511,28 +511,35 @@ describe Spree::Order, type: :model do
# Regression test for #4199
context '#available_payment_methods' do
- let(:ok_method) { double :payment_method, available_for_order?: true, available_for_store?: true }
- let(:no_method) { double :payment_method, available_for_order?: false, available_for_store?: true }
+ let(:ok_method) { double :payment_method, available_for_order?: true, available_for_store?: true, stores: [store] }
+ let(:no_method) { double :payment_method, available_for_order?: false, available_for_store?: true, stores: [store] }
let(:methods) { [ok_method, no_method] }
+ let(:store_2) { create(:store) }
it 'includes frontend payment methods' do
payment_method = Spree::PaymentMethod.create!(name: 'Fake',
active: true,
- display_on: 'front_end')
+ display_on: 'front_end',
+ stores: [store]
+ )
expect(order.available_payment_methods).to include(payment_method)
end
it "includes 'both' payment methods" do
payment_method = Spree::PaymentMethod.create!(name: 'Fake',
active: true,
- display_on: 'both')
+ display_on: 'both',
+ stores: [store]
+ )
expect(order.available_payment_methods).to include(payment_method)
end
it 'does not include a payment method twice if display_on is blank' do
payment_method = Spree::PaymentMethod.create!(name: 'Fake',
active: true,
- display_on: 'both')
+ display_on: 'both',
+ stores: [store]
+ )
expect(order.available_payment_methods.count).to eq(1)
expect(order.available_payment_methods).to include(payment_method)
end
@@ -542,6 +549,18 @@ describe Spree::Order, type: :model do
expect(order.available_payment_methods).to match_array [ok_method]
end
+
+ it 'does not include a payment method from different stores' do
+ payment_method = Spree::PaymentMethod.create!(name: 'Fake',
+ active: true,
+ display_on: 'both',
+ stores: [store_2]
+ )
+ expect(order.available_payment_methods).not_to include(payment_method)
+
+ order = stub_model(Spree::Order, user: user, store: store_2)
+ expect(order.available_payment_methods).to include(payment_method)
+ end
end
context '#apply_free_shipping_promotions' do
@@ -1107,7 +1126,7 @@ describe Spree::Order, type: :model do
end
describe '#validate_payments_attributes' do
- let(:payment_method) { create(:credit_card_payment_method) }
+ let(:payment_method) { create(:credit_card_payment_method, stores: [store]) }
let(:attributes) do
[{ amount: 50, payment_method_id: payment_method.id }]
end
@@ -1119,7 +1138,7 @@ describe Spree::Order, type: :model do
end
context 'not existing payment method' do
- let(:payment_method) { create(:credit_card_payment_method, display_on: 'backend') }
+ let(:payment_method) { create(:credit_card_payment_method, display_on: 'backend', stores: [store]) }
it 'raises RecordNotFound' do
expect { order.validate_payments_attributes(attributes) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -1150,8 +1169,8 @@ describe Spree::Order, type: :model do
end
describe 'credit_card_nil_payment' do
- let!(:order) { create(:order_with_line_items, line_items_count: 2) }
- let!(:credit_card_payment_method) { create(:simple_credit_card_payment_method) }
+ let!(:order) { create(:order_with_line_items, line_items_count: 2, store: store) }
+ let!(:credit_card_payment_method) { create(:simple_credit_card_payment_method, stores: [store]) }
let!(:store_credits) { create(:store_credit_payment, order: order) }
def attributes(amount = 0)