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.

V-3053 FIX disabled payment methods on storefront (#12627)

brozek0b555aab6790
diff --git a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
index 4e84a83da4..987cf02bfb 100644
--- a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
@@ -91,7 +91,7 @@ module Spree
end
def payment_methods
- render_serialized_payload { serialize_payment_methods(spree_current_order.available_payment_methods) }
+ render_serialized_payload { serialize_payment_methods(spree_current_order.collect_frontend_payment_methods) }
end
def validate_order_for_payment
diff --git a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
index 271904d090..af9a5c796d 100644
--- a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
@@ -586,7 +586,7 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
describe 'checkout#payment_methods' do
let(:execute) { get '/api/v2/storefront/checkout/payment_methods', headers: headers }
let!(:payment_method) { create(:credit_card_payment_method, stores: [store]) }
- let(:payment_methods) { order.available_payment_methods }
+ let(:payment_methods) { order.collect_frontend_payment_methods }
shared_examples 'returns a list of available payment methods' do
before { execute }
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index b833a2d042..59195d1d9e 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -504,6 +504,7 @@ module Spree
end
def available_payment_methods(store = nil)
+ Spree::Deprecation.warn('`Order#available_payment_methods` is deprecated and will be removed in Spree 6. Use `collect_frontend_payment_methods` instead.')
if store.present?
Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
end
@@ -754,7 +755,11 @@ module Spree
end
def collect_backend_payment_methods
- PaymentMethod.active.available_on_back_end.select { |pm| pm.available_for_order?(self) }
+ store.payment_methods.active.available_on_back_end.select { |pm| pm.available_for_order?(self) }
+ end
+
+ def collect_frontend_payment_methods
+ store.payment_methods.active.available_on_front_end.select { |pm| pm.available_for_order?(self) }
end
# determines whether the inventory is fully discounted
@@ -771,19 +776,6 @@ module Spree
Spree::CouponCode.find_by(order: self, promotion: promotions).try(:code) || promotions.pluck(:code).compact.first
end
- def validate_payments_attributes(attributes)
- Spree::Deprecation.warn('`Order#validate_payments_attributes` is deprecated and will be removed in Spree 5')
-
- # Ensure the payment methods specified are allowed for this user
- payment_method_ids = available_payment_methods.map(&:id).map(&:to_s)
-
- attributes.each do |payment_attributes|
- payment_method_id = payment_attributes[:payment_method_id].to_s
-
- raise ActiveRecord::RecordNotFound unless payment_method_ids.include?(payment_method_id)
- end
- end
-
def valid_promotions
order_promotions.where(promotion_id: valid_promotion_ids).uniq(&:promotion_id)
end
@@ -887,6 +879,7 @@ module Spree
end
def collect_payment_methods(store = nil)
+ Spree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 6. Use `collect_frontend_payment_methods` instead.')
if store.present?
Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
end
diff --git a/core/app/services/spree/payments/create.rb b/core/app/services/spree/payments/create.rb
index ca022dd12f..75c38c7ebd 100644
--- a/core/app/services/spree/payments/create.rb
+++ b/core/app/services/spree/payments/create.rb
@@ -14,7 +14,7 @@ module Spree
protected
def prepare_payment_attributes(order:, params:)
- payment_method = order.available_payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id]&.to_s }
+ payment_method = order.collect_frontend_payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id]&.to_s }
payment_attributes = {
amount: params[:amount] || order.order_total_after_store_credit,
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 10ea94c489..917273e953 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -144,7 +144,7 @@ describe Spree::Order, type: :model do
create(:shipment, order: order, state: 'ready')
end
- it 'should return true' do
+ it 'returns true' do
expect(order.reload.allow_cancel?).to eq true
end
end
@@ -592,7 +592,7 @@ describe Spree::Order, type: :model do
end
# Regression test for #4199
- describe '#available_payment_methods' do
+ describe '#collect_frontend_payment_methods' do
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] }
@@ -603,45 +603,42 @@ describe Spree::Order, type: :model do
payment_method = Spree::PaymentMethod.create!(name: 'Fake',
active: true,
display_on: 'front_end',
- stores: [store]
- )
- expect(order.available_payment_methods).to include(payment_method)
+ stores: [store])
+ expect(order.collect_frontend_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',
- stores: [store]
- )
- expect(order.available_payment_methods).to include(payment_method)
+ stores: [store])
+ expect(order.collect_frontend_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',
- stores: [store]
- )
- expect(order.available_payment_methods.count).to eq(1)
- expect(order.available_payment_methods).to include(payment_method)
+ it 'does not include backend payment method ' do
+ Spree::PaymentMethod.create!(name: 'Fake', active: true, display_on: 'back_end', stores: [store])
+ expect(order.collect_frontend_payment_methods.count).to eq(0)
+ end
+
+ it 'does not include inactive payment methods' do
+ Spree::PaymentMethod.create!(name: 'Fake', active: false, display_on: 'front_end', stores: [store])
+ expect(order.collect_frontend_payment_methods.count).to eq(0)
end
it 'does not include a payment method that is not suitable for this order' do
allow(Spree::PaymentMethod).to receive(:available_on_front_end).and_return(methods)
- expect(order.available_payment_methods).to match_array [ok_method]
+ expect(order.collect_frontend_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)
+ stores: [store_2])
+ expect(order.collect_frontend_payment_methods).not_to include(payment_method)
- expect(order_from_different_store.available_payment_methods).to include(payment_method)
+ expect(order_from_different_store.collect_frontend_payment_methods).to include(payment_method)
end
end
@@ -939,6 +936,7 @@ describe Spree::Order, type: :model do
allow(order).to receive_message_chain(:line_items, :exists?).and_return(true)
expect(order.checkout_allowed?).to be true
end
+
it 'is false if there are no line_items in the order' do
allow(order).to receive_message_chain(:line_items, :exists?).and_return(false)
expect(order.checkout_allowed?).to be false
@@ -1231,6 +1229,7 @@ describe Spree::Order, type: :model do
describe '#promo_code' do
context 'without promo code' do
let(:order) { build_stubbed(:order, user: nil, email: nil) }
+
it 'returns nil' do
expect(order.promo_code).to be_nil
end
@@ -1275,27 +1274,6 @@ describe Spree::Order, type: :model do
end
end
- describe '#validate_payments_attributes' do
- let(:payment_method) { create(:credit_card_payment_method, stores: [store]) }
- let(:attributes) do
- [{ amount: 50, payment_method_id: payment_method.id }]
- end
-
- context 'with existing payment method' do
- it "doesn't raise error and returns collection" do
- expect(order.validate_payments_attributes(attributes)).to eq attributes
- end
- end
-
- context 'not existing payment method' do
- 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)
- end
- end
- end
-
describe 'order transit to returned state from resumed state' do
let!(:resumed_order) { create(:order_with_line_items, line_items_count: 3, state: :resumed) }
@@ -1466,10 +1444,10 @@ describe Spree::Order, type: :model do
end
describe '#cart_promo_total' do
- let!(:order) { create(:order_with_line_items, line_items_count: 10) }
-
subject { order.reload.cart_promo_total }
+ let!(:order) { create(:order_with_line_items, line_items_count: 10) }
+
context 'without promotions' do
it 'returns 0' do
expect(subject).to eq(BigDecimal('0.00'))
@@ -1595,12 +1573,12 @@ describe Spree::Order, type: :model do
end
describe 'bill_address_id=' do
+ subject { order.bill_address_id = address.id }
+
let(:user) { create(:user) }
let(:order) { create(:order, user: user) }
let(:address) { create(:address, user: user) }
- subject { order.bill_address_id = address.id }
-
context 'when assigned address exist' do
context 'when assigned address belongs to user' do
it 'assigns address to order as bill address' do
@@ -1618,11 +1596,11 @@ describe Spree::Order, type: :model do
end
describe '#bill_address_attributes=' do
+ subject { order.bill_address_attributes = address_attributes }
+
let(:order) { create(:order, user: user) }
let(:address_attributes) { attributes_for(:address) }
- subject { order.bill_address_attributes = address_attributes }
-
context 'when user has default bill address' do
let!(:user) { create(:user_with_addresses) }
@@ -1671,12 +1649,12 @@ describe Spree::Order, type: :model do
end
describe 'ship_address_id=' do
+ subject { order.ship_address_id = address.id }
+
let(:user) { create(:user) }
let(:order) { create(:order, user: user) }
let(:address) { create(:address, user: user) }
- subject { order.ship_address_id = address.id }
-
context 'when assigned address exist' do
context 'when assigned address belongs to user' do
it 'assigns address to order as ship address' do
@@ -1694,11 +1672,11 @@ describe Spree::Order, type: :model do
end
describe '#ship_address_attributes=' do
+ subject { order.ship_address_attributes = address_attributes }
+
let(:order) { create(:order, user: user) }
let(:address_attributes) { attributes_for(:address) }
- subject { order.ship_address_attributes = address_attributes }
-
context 'when user has default ship address' do
let!(:user) { create(:user_with_addresses) }
diff --git a/storefront/app/helpers/spree/checkout_helper.rb b/storefront/app/helpers/spree/checkout_helper.rb
index c18764f5c3..8ba309815b 100644
--- a/storefront/app/helpers/spree/checkout_helper.rb
+++ b/storefront/app/helpers/spree/checkout_helper.rb
@@ -29,7 +29,7 @@ module Spree
end
def checkout_available_payment_methods
- @checkout_available_payment_methods ||= @order.available_payment_methods.reject(&:store_credit?)
+ @checkout_available_payment_methods ||= @order.collect_frontend_payment_methods.reject(&:store_credit?)
end
def checkout_started?