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
Admin: fixed creating payments with existing credit cards (#12294)
Damian Legawiecc0b08a86a473
diff --git a/admin/spec/controllers/spree/admin/payments_controller_spec.rb b/admin/spec/controllers/spree/admin/payments_controller_spec.rbindex 68a5b91568..ec72123443 100644--- a/admin/spec/controllers/spree/admin/payments_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/payments_controller_spec.rb@@ -105,9 +105,36 @@ RSpec.describe Spree::Admin::PaymentsController, type: :controller doit 'processes payment correctly' dosubject- expect(order.payments.count).to eq(1)+ expect(order.reload.payments.count).to eq(1)expect(response).to redirect_to(spree.edit_admin_order_path(order))- expect(order.reload.state).to eq('complete')+ expect(order.state).to eq('complete')+ end+ end++ context 'with existing card' do+ let(:credit_card) { create(:credit_card, user: order.user, payment_method: payment_method, gateway_customer_profile_id: 'BGS-1234567890') }++ let(:params) do+ {+ order_id: order.number,+ payment: {+ amount: order.total,+ payment_method_id: payment_method.id.to_s,+ source_attributes: {+ id: credit_card.id+ }+ }+ }+ end++ it 'processes payment correctly' do+ subject++ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ order.reload+ expect(order.payments.count).to eq(1)+ expect(order.payments.first.source).to eq(credit_card)+ expect(order.state).to eq('complete')endenddiff --git a/core/app/models/spree/payment.rb b/core/app/models/spree/payment.rbindex 054e44d722..e1f01ec73a 100644--- a/core/app/models/spree/payment.rb+++ b/core/app/models/spree/payment.rb@@ -161,7 +161,17 @@ module Spreereturn unless new_record?if source_attributes.present? && source.blank? && payment_method.try(:payment_source_class)- self.source = payment_method.payment_source_class.new(source_attributes)+ self.source = if source_attributes[:id].present? && source_attributes[:id] != :new+ payment_method.payment_source_class.find(source_attributes[:id])+ else+ payment_method.payment_source_class.new(source_attributes)+ end++ if source.user_id.present? && source.user_id != order.user_id+ self.source = nil+ return+ end+source.payment_method_id = payment_method.idsource.user_id = order.user_id if orderenddiff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex 712b87aca1..67f21b7ecf 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -113,7 +113,7 @@ module Spree# month / year may be provided by some sources, or others may elect to use one field@@source_attributes = [- :number, :month, :year, :expiry, :verification_value,+ :id, :number, :month, :year, :expiry, :verification_value,:first_name, :last_name, :cc_type, :gateway_customer_profile_id,:gateway_payment_profile_id, :last_digits, :name, :encrypted_data]diff --git a/core/spec/models/spree/payment_spec.rb b/core/spec/models/spree/payment_spec.rbindex 9a7e70adf8..af63d62a67 100644--- a/core/spec/models/spree/payment_spec.rb+++ b/core/spec/models/spree/payment_spec.rb@@ -2,7 +2,7 @@ require 'spec_helper'describe Spree::Payment, type: :model dolet(:store) { Spree::Store.default }- let(:order) { store.orders.create }+ let(:order) { create(:order, store: store) }let(:refund_reason) { create(:refund_reason) }let(:gateway) do@@ -746,6 +746,27 @@ describe Spree::Payment, type: :model dopayment.source_attributes = params[:source_attributes]expect { payment.dup }.not_to change { payment.source }end++ context 'existing card' do+ let!(:credit_card) { create(:credit_card, number: '4111111111111112', user: order.user, payment_method: gateway, gateway_customer_profile_id: 'BGS-1234567890') }++ let(:params) do+ {+ amount: 100,+ order: order,+ payment_method: gateway,+ source_attributes: {+ id: credit_card.id+ }+ }+ end++ it 'assigns the existing card' do+ payment = Spree::Payment.new(params)+ expect(payment.source).to eq(credit_card)+ expect(payment.source.gateway_customer_profile_id).to eq('BGS-1234567890')+ end+ endenddescribe '#currency' do