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 Stripe checkout for logged-in customers (#14517)
Damian Legawieca48b7fad5f8f
diff --git a/spree/core/app/models/spree/cart.rb b/spree/core/app/models/spree/cart.rbindex 72d0b1737d..512cca14d7 100644--- a/spree/core/app/models/spree/cart.rb+++ b/spree/core/app/models/spree/cart.rb@@ -115,6 +115,15 @@ module Spreeprefixed_idend+ # Billed or shipped name, matching {Spree::Order#name}.+ #+ # @return [String, nil]+ def name+ if (address = bill_address || ship_address)+ address.full_name+ end+ end+# A completed cart is an immutable audit record — post-checkout life# belongs to the order. Blocks save/update_columns/touch/destroy at the# model level; the completion write itself passes because it fires whilediff --git a/spree/core/spec/models/spree/cart_spec.rb b/spree/core/spec/models/spree/cart_spec.rbindex 36683cd486..b5647fec89 100644--- a/spree/core/spec/models/spree/cart_spec.rb+++ b/spree/core/spec/models/spree/cart_spec.rb@@ -255,6 +255,26 @@ describe Spree::Cart, type: :model doendend+ describe '#name' do+ it 'returns the billing address full name' do+ bill_address = create(:address, firstname: 'John', lastname: 'Doe')+ cart = create(:cart, store: store, bill_address: bill_address)++ expect(cart.name).to eq('John Doe')+ end++ it 'falls back to the shipping address when billing is blank' do+ ship_address = create(:address, firstname: 'Jane', lastname: 'Roe')+ cart = create(:cart, store: store, bill_address: nil, ship_address: ship_address)++ expect(cart.name).to eq('Jane Roe')+ end++ it 'is nil with no addresses' do+ expect(build(:cart, store: store, bill_address: nil, ship_address: nil).name).to be_nil+ end+ end+describe '#preferred_stock_location' dolet(:cart) { create(:cart, store: store) }let(:pickup_location) { create(:stock_location, pickup_enabled: true) }diff --git a/spree/providers/stripe/app/models/spree_stripe/gateway.rb b/spree/providers/stripe/app/models/spree_stripe/gateway.rbindex d69f571898..684a852691 100644--- a/spree/providers/stripe/app/models/spree_stripe/gateway.rb+++ b/spree/providers/stripe/app/models/spree_stripe/gateway.rb@@ -124,7 +124,8 @@ module SpreeStripeendend- # @param customer [Spree::Customer]+ # @param order [Spree::Cart, Spree::Order, nil]+ # @param customer [Spree::Customer, nil]# @return [Spree::GatewayCustomer, nil]def fetch_or_create_customer(order: nil, customer: nil)customer ||= order&.customerdiff --git a/spree/providers/stripe/spec/models/spree_stripe/gateway_spec.rb b/spree/providers/stripe/spec/models/spree_stripe/gateway_spec.rbindex 0a10e67a09..4a52b909b9 100644--- a/spree/providers/stripe/spec/models/spree_stripe/gateway_spec.rb+++ b/spree/providers/stripe/spec/models/spree_stripe/gateway_spec.rb@@ -778,6 +778,31 @@ RSpec.describe SpreeStripe::Gateway doVCR.use_cassette('create_customer_based_on_user') { subject }endend++ context 'when the purchase is a cart' do+ let(:order) do+ create(:cart, store: store, customer: customer, email: '[email protected]', bill_address: bill_address)+ end++ before do+ allow(Stripe::Customer).to receive(:create).and_return(double(id: 'cus_cart_123'))+ end++ it 'creates a Stripe customer from the cart' do+ expect { subject }.to change(Spree::GatewayCustomer, :count).by(1)+ expect(subject.customer).to eq(customer)+ expect(subject.profile_id).to eq('cus_cart_123')+ expect(subject.persisted?).to be(true)+ end++ it 'builds the Stripe payload from the cart' do+ expect(SpreeStripe::CustomerPresenter).to receive(:new).with(+ name: order.name, email: order.email, address: bill_address+ ).and_call_original++ subject+ end+ endenddescribe '#update_customer' do