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: Refused payment captures above the payment amount and non-positive payment amounts
Damian Legawiec680c276f1f2a
diff --git a/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rbindex 7ff574825e..87046259dd 100644--- a/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rb@@ -28,8 +28,13 @@ module Spreedef createwith_order_lock dopayment_method = current_store.payment_methods.accessible_by(current_ability, :show).find_by_prefix_id!(params[:payment_method_id])+ amount = money_param(:amount, @parent.currency)+ unless amount.nil? || amount.positive?+ raise Spree::Money::InvalidFormat.new('must be greater than 0', field: :amount)+ end+@resource = @parent.payments.build(- amount: params[:amount] || @parent.order_total_after_store_credit,+ amount: amount || @parent.order_total_after_store_credit,payment_method: payment_method)diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rbindex aace145b87..28b605fdf7 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb@@ -191,6 +191,22 @@ RSpec.describe Spree::Api::V3::Admin::Orders::PaymentsController, type: :controlexpect(payment.amount).to eq(order.order_total_after_store_credit)endend++ context 'when amount is not positive' do+ %w[-100.00 0].each do |amount|+ it "refuses #{amount}" do+ post :create, params: {+ order_id: order.prefixed_id,+ payment_method_id: payment_method.prefixed_id,+ amount: amount+ }, as: :json++ expect(response).to have_http_status(:unprocessable_content)+ expect(json_response['error']['code']).to eq('invalid_money_format')+ expect(order.payments).to be_empty+ end+ end+ endenddescribe 'PATCH #capture' dodiff --git a/spree/core/app/workflows/spree/payments/capture.rb b/spree/core/app/workflows/spree/payments/capture.rbindex 40805ff43f..b1cb2c2bb5 100644--- a/spree/core/app/workflows/spree/payments/capture.rb+++ b/spree/core/app/workflows/spree/payments/capture.rb@@ -23,6 +23,7 @@ module Spree@amount = capture_amount(amount)step :ensure_capturable+ step :ensure_within_payment_amount# Veto point — fraud holds, manual review. Before any money moves.run_hooks :validaterun_hooks :before_capture@@ -69,6 +70,15 @@ module Spreefailure(payment, :payment_not_capturable)end+ # A capture takes some or all of what was authorized, never more: a+ # gateway may let a larger figure through, and the books would then+ # carry a capture the authorization never covered.+ def ensure_within_payment_amount+ return if @amount <= payment.amount++ failure(payment, :capture_exceeds_payment_amount)+ end+def claimhalt!(payment) unless payment.started_processing!rescue Spree::Core::GatewayError => errordiff --git a/spree/core/config/locales/en.yml b/spree/core/config/locales/en.ymlindex d7ebfdbaf1..9d415ef287 100644--- a/spree/core/config/locales/en.yml+++ b/spree/core/config/locales/en.yml@@ -685,6 +685,7 @@ en:canceler: Cancelercannot_be_destroyed: Order cannot be destroyed.capture: Capture+ capture_exceeds_payment_amount: The capture amount cannot exceed the payment amount.cart: Cartcart_already_updated: The cart has already been updated.cart_completion_in_progress: The cart is being completed. Please retry in a moment.diff --git a/spree/core/spec/workflows/spree/payments/capture_spec.rb b/spree/core/spec/workflows/spree/payments/capture_spec.rbindex cb1e22f27b..46913bbe8f 100644--- a/spree/core/spec/workflows/spree/payments/capture_spec.rb+++ b/spree/core/spec/workflows/spree/payments/capture_spec.rb@@ -62,6 +62,16 @@ RSpec.describe Spree::Payments::Capture doexpect(payment.capture_events.sum(:amount)).to eq(BigDecimal('10.04'))end+ it 'refuses to capture more than the payment amount' do+ expect(gateway).not_to receive(:capture)++ result = described_class.call(payment: payment, amount: BigDecimal('100'))++ expect(result).to be_failure+ expect(result.error.value).to eq(:capture_exceeds_payment_amount)+ expect(payment.reload).to be_pending+ end+context 'with exact amounts' do%w[0.29 1.15 1234567.89].each do |amount|it "records a capture of #{amount} to the cent" do