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
Fix: accepted only active storefront payment methods at checkout
Damian Legawieca9bf756bfae1
diff --git a/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb b/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rbindex f7ca3eb645..07fae029f4 100644--- a/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb@@ -13,7 +13,16 @@ module Spree# POST /api/v3/store/carts/:cart_id/payment_sessionsdef createwith_order_lock do- payment_method = current_store.payment_methods.find_by_prefix_id!(permitted_params[:payment_method_id])+ payment_method = current_store.payment_methods.active.storefront_visible.+ find_by_prefix_id!(permitted_params[:payment_method_id])++ unless payment_method.available_for_order?(@cart)+ return render_error(+ code: 'payment_method_unavailable',+ message: Spree.t('api.v3.payments.method_unavailable'),+ status: :unprocessable_content+ )+ end@payment_session = payment_method.create_payment_session(order: @cart,diff --git a/spree/api/app/controllers/spree/api/v3/store/carts/payments_controller.rb b/spree/api/app/controllers/spree/api/v3/store/carts/payments_controller.rbindex 3cec092031..1e1ec5c8c8 100644--- a/spree/api/app/controllers/spree/api/v3/store/carts/payments_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/carts/payments_controller.rb@@ -11,7 +11,11 @@ module Spree# POST /api/v3/store/carts/:cart_id/payments# Creates a payment for non-session payment methods (e.g. Check, Cash on Delivery, Bank Transfer)def create- payment_method = current_store.payment_methods.find_by_prefix_id!(params[:payment_method_id])+ # The same methods the cart offers: a disabled or staff-only+ # method (an offline one marks the order paid) must not be+ # reachable by naming its id.+ payment_method = current_store.payment_methods.active.storefront_visible.+ find_by_prefix_id!(params[:payment_method_id])if payment_method.session_required?return render_error(diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rbindex 639a46d5d6..872dae47c7 100644--- a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb@@ -31,6 +31,23 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :cexpect(json_response['order_id']).to eq(order.prefixed_id)end+ it 'does not accept a staff-only payment method' do+ payment_method.update!(storefront_visible: false)++ post :create, params: { cart_id: order.prefixed_id, payment_method_id: payment_method.prefixed_id }++ expect(response).to have_http_status(:not_found)+ end++ it 'rejects a payment method unavailable for the cart' do+ allow_any_instance_of(payment_method.class).to receive(:available_for_order?).and_return(false)++ post :create, params: { cart_id: order.prefixed_id, payment_method_id: payment_method.prefixed_id }++ expect(response).to have_http_status(:unprocessable_content)+ expect(json_response['error']['code']).to eq('payment_method_unavailable')+ end+it 'passes external_data to the gateway' dopost :create, params: {cart_id: order.prefixed_id,diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rbindex 81c3c64316..949787149e 100644--- a/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/payments_controller_spec.rb@@ -62,6 +62,25 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentsController, type: :controllexpect(json_response['error']['code']).to eq('payment_method_unavailable')end+ # The cart only offers active, storefront-visible methods; an offline+ # staff-only method would otherwise mark the order paid.+ it 'does not accept a staff-only payment method' do+ staff_only = create(:check_payment_method, storefront_visible: false)++ post :create, params: { cart_id: order.prefixed_id, payment_method_id: staff_only.prefixed_id }++ expect(response).to have_http_status(:not_found)+ expect(order.payments.reload).to be_empty+ end++ it 'does not accept an inactive payment method' do+ inactive = create(:check_payment_method, active: false)++ post :create, params: { cart_id: order.prefixed_id, payment_method_id: inactive.prefixed_id }++ expect(response).to have_http_status(:not_found)+ end+it 'returns not found for invalid payment method' dopost :create, params: { cart_id: order.prefixed_id, payment_method_id: 'pm_invalid' }