solidus_stripe 5.0.0.alpha.1 → 5.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58adb3a4786a07b4728a38452a8b45389e4947078a6696c421e66d9202bec935
-  data.tar.gz: ceb39ec60811d59e8544cef740d470b41fdfa2b7dad668c557e5f7a55622536c
+  metadata.gz: 8412267c2867988b55d4bc57fc50016663e3d0ad552bc04fb9cbf6892e5c6841
+  data.tar.gz: 932bc36b4468551af890932637d9b3db32bb9a36f4a6a591cfebe758aa73a143
 SHA512:
-  metadata.gz: c2964495f7edeab038c993972069bd72788b7c978a738889277eecfe2c688c62a124e25e9b511d483ee6df67accb33d0bdb311f718cb97d883a6f9bd306de09e
-  data.tar.gz: 24547d5de71774cfdb1c82b955118067f9abb27a472a2d0d767ed5d21a12f997d5e60cdef3ebbe0298bb2916ec789d850a80bb3d9fd3d1310941d4c7b26be7b5
+  metadata.gz: 4355fdfc27bb24394e0014c1e26862c84ebb33f256712856fec33187d68fe860b5781e6425ef1099bf200484bd74039a06a3eec62d80e7b6a0e06d39bdc63859
+  data.tar.gz: 696f19ccf8d27fe984dd617fb836e139d7350c39486c42718379e15a172371c9b1e9cd54f60aad0cbea7678fa71e6a8c644c8d872cf832cbeb7b7f5d7ae189ff

data/.circleci/config.yml

@@ -49,8 +49,8 @@ jobs:
             cat /tmp/.tool-versions
       - restore_cache:
           keys:
-            - solidus-stripe-gems-v1-{{ checksum "/tmp/.tool-versions" }}
-            - solidus-stripe-gems-v1-
+            - solidus-stripe-gems-v1-<<parameters.ruby>>-{{ checksum "/tmp/.tool-versions" }}
+            - solidus-stripe-gems-v1-<<parameters.ruby>>-
       - run:
           name: "Install gems"
           command: |
@@ -64,7 +64,7 @@ jobs:
             FRONTEND: starter
             SOLIDUS_BRANCH: master
       - save_cache:
-          key: solidus-stripe-gems-v1-{{ checksum "/tmp/.tool-versions" }}
+          key: solidus-stripe-gems-v1-<<parameters.ruby>>-{{ checksum "/tmp/.tool-versions" }}
           paths:
             - /home/circleci/.rubygems
       - run:
@@ -104,12 +104,19 @@ workflows:
   build:
     jobs:
       - run-specs:
-          name: "run-specs-ruby-<<matrix.ruby>>-db-<<matrix.database>>"
+          name: &name "run-specs-ruby-<<matrix.ruby>>-db-<<matrix.database>>"
           context: stripe-test-credentials
           matrix:
-            parameters:
-              ruby: ["3.2"] # TODO: ['3.2', '3.1', '3.0']
-              database: ["sqlite"] # TODO: ['mysql', 'sqlite', 'postgres']
-              coverage: [true]
+            parameters: { ruby: ["3.2"], database: ["sqlite"], coverage: [true] }
+      - run-specs:
+          name: *name
+          context: stripe-test-credentials
+          matrix:
+            parameters: { ruby: ["3.1"], database: ["mysql"], coverage: [false] }
+      - run-specs:
+          name: *name
+          context: stripe-test-credentials
+          matrix:
+            parameters: { ruby: ["3.0"], database: ["postgres"], coverage: [false] }
       - lint-code:
           ruby: "3.0"

data/README.md

@@ -1,71 +1,81 @@
-## 🚧 **WARNING** 🚧 Work In Progress
-
-You're looking at the source for `solidus_stripe` v5, which will only support the **starter frontend**
-but at the moment **it is not ready to be used**.
-
-Please use [`solidus_stripe` v4 on the corresponding branch](https://github.com/solidusio/solidus_stripe/tree/v4).
-
-## 🚧 **WARNING** 🚧 Supporting `solidus_frontend`
-
-If you need support for `solidus_frontend` please add `< 5` as a version requirement in your gemfile:
-`gem 'solidus_stripe', '< 5'`
-or if your tracking the github version please switch to the `v4` branch:
-`gem 'solidus_stripe', git: 'https://github.com/solidusio/solidus_stripe.git', branch: 'v4'`
-
----
-
 # Solidus Stripe
 
 [![CircleCI](https://circleci.com/gh/solidusio/solidus_stripe.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_stripe)
-[![codecov](https://codecov.io/gh/solidusio/solidus_stripe/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_stripe)
+[![codecov](https://codecov.io/gh/solidusio/solidus_stripe/branch/main/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_stripe)
+[![yardoc](https://img.shields.io/badge/docs-rubydoc.info-informational)](https://rubydoc.info/gems/solidus_stripe)
 
 <!-- Explain what your extension does. -->
 
 ## Installation
 
-Add solidus_stripe to your Gemfile:
+Add solidus_stripe to your bundle and run the installation generator:
 
-```ruby
-gem 'solidus_stripe'
+```shell
+bundle add solidus_stripe
+bin/rails generate solidus_stripe:install
 ```
 
-Bundle your dependencies and run the installation generator:
+Then set the following environment variables both locally and in production in order
+to setup the `solidus_stripe_env_credentials` static preference as defined in the initializer:
 
 ```shell
-bin/rails generate solidus_stripe:install
+SOLIDUS_STRIPE_API_KEY                # will prefill the `api_key` preference
+SOLIDUS_STRIPE_PUBLISHABLE_KEY        # will prefill the `publishable_key` preference
+SOLIDUS_STRIPE_WEBHOOK_SIGNING_SECRET # will prefill the `webhook_signing_secret` preference
 ```
 
-### Webhooks
+Once those are available you can create a new Stripe payment method in the /admin interface
+and select the `solidus_stripe_env_credentials` static preference.
 
-This library makes use of some [Stripe webhooks](https://stripe.com/docs/webhooks).
+⚠️ Be sure to set the enviroment variables to the values for test mode in your development environment.
 
-Every Solidus Stripe payment method you create will get a slug assigned. You
-need to append it to a generic webhook endpoint to get the URL for that payment
-method. For example:
+### Webhooks setup
 
-```ruby
-SolidusStripe::PaymentMethod.last.slug
-# "365a8435cd11300e87de864c149516e0"
-```
+The webhooks URLs are automatically generated based on the enviroment, 
+by default it will be scoped to `live` in production and `test` everywhere else.
 
-For the above example, and if you mounted the `SolidusStripe::Engine` routes on
-the default scope, the webhook endpoint would look like:
-
-```
-/solidus_stripe/webhooks/365a8435cd11300e87de864c149516e0
-```
-
-Besides, you also need to configure the webhook signing secret for that payment
-method. You can do that through the `webhook_endpoint_signing_secret`
-preference on the payment method.
+#### Production enviroment
 
 Before going to production, you'll need to [register the webhook endpoint with
 Stripe](https://stripe.com/docs/webhooks/go-live), and make sure to subscribe
 to the events listed in [the `SolidusStripe::Webhook::Event::CORE`
-constant](https://github.com/solidusio/solidus_stripe/blob/master/lib/solidus_stripe/webhook/event.rb).
+constant](https://github.com/solidusio/solidus_stripe/blob/main/lib/solidus_stripe/webhook/event.rb).
+
+So in your Stripe dashboard you'll need to set the webhook URL to:
+
+    https://store.example.com/solidus_stripe/live/webhooks
+
+#### Non-production enviroments
+
+While for development [you should use the stripe CLI to forward the webhooks to your local server](https://stripe.com/docs/webhooks/test#webhook-test-cli):
+
+```shell
+# Please refer to `stripe listen --help` for more options
+stripe listen --forward-to http://localhost:3000/solidus_stripe/test/webhooks
+```
 
-On development, you can
-[test webhooks by using Stripe CLI](https://stripe.com/docs/webhooks/test).
+### Supporting `solidus_frontend`
+
+If you need support for `solidus_frontend` please refer to the [README of solidus_stripe v4](https://github.com/solidusio/solidus_stripe/tree/v4#readme).
+
+### Installing on a custom frontend
+
+If you're using a custom frontend you'll need to adjust the code copied to your application by the installation generator. Given frontend choices can vary wildly, we can't provide a one-size-fits-all solution, but we are providing this simple integration with `solidus_starter_frontend` as a reference implementation. The amount of code is intentionally kept to a minimum, so you can easily adapt it to your needs.
+
+## Caveats
+
+### Authorization and capture and checkout finalization
+
+Stripe supports two different flows for payments: [authorization and capture](https://stripe.com/docs/payments/capture-later) and immediate payment. 
+
+Both flows are supported by this extension, but you should be aware that they will happen before the order finalization, just before the final confirmation. At that moment if the payment method of choice will require additional authentication (e.g. 3D Secure) the extra authentication will be shown to the user.
+
+### Upgrading from v4
+
+This extension is a complete rewrite of the previous version, and it's not generally compatible with v4.
+
+That being said, if you're upgrading from v4 you can check out this guide to help you with the transition
+from payment tokens to payment intents: https://stripe.com/docs/payments/payment-intents/migration.
 
 ## Usage
 
@@ -99,13 +109,23 @@ Stripe Payment Method other than "card" on the admin interface, you must include
 
 `app/views/spree/admin/payments/source_forms/existing_payment/stripe/`
 
-### Custom webhooks
+### Customizing Webhooks
+
+Solidus Stripe comes with support for a few [webhook events](https://stripe.com/docs/webhooks), to which there's a default handler. You can customize the behavior of those handlers by or add to their behavior by replacing or adding subscribers in the internal Solidus event bus.
+
+Each event will have the original Stripe name, prefixed by `stripe.`. For example, the `payment_intent.succeeded` event will be published as `stripe.payment_intent.succeeded`.
 
-You can also use [Stripe webhooks](https://stripe.com/docs/webhooks) to trigger
-custom actions in your application.
+Here's the list of events that are supported by default:
 
-First, you need to register the event you want to listen to, both [in
-Stripe](https://stripe.com/docs/webhooks/go-live) and in your application:
+        payment_intent.succeeded
+        payment_intent.payment_failed
+        payment_intent.canceled
+        charge.refunded
+
+#### Adding a new event handler
+
+In order to add a new handler you need to register the event you want to listen to, 
+both [in Stripe](https://stripe.com/docs/webhooks/go-live) and in your application:
 
 ```ruby
 # config/initializers/solidus_stripe.rb
@@ -117,7 +137,7 @@ end
 That will register a new `:"stripe.charge.succeeded"` event in the [Solidus
 bus](https://guides.solidus.io/customization/subscribing-to-events). The
 Solidus event will be published whenever a matching incoming webhook event is
-received. You can subscribe to it as regular:
+received. You can subscribe to it [as usual](https://guides.solidus.io/customization/subscribing-to-events):
 
 ```ruby
 # app/subscribers/update_account_balance_subscriber.rb
@@ -127,7 +147,13 @@ class UpdateAccountBalanceSubscriber
   handle :"stripe.charge.succeeded", with: :call
 
   def call(event)
-    # ...
+    # Please refere to the Stripe gem and API documentation for more details on the
+    # structure of the event object. All methods called on `event` will be forwarded
+    # to the Stripe event object:
+    # - https://www.rubydoc.info/gems/stripe/Stripe/Event
+    # - https://stripe.com/docs/webhooks/stripe-events
+
+    Rails.logger.info "Charge succeeded: #{event.data.to_json}"
   end
 end
 
@@ -145,6 +171,8 @@ underlying stripe event object. It can also be used in async [
 adapters](https://github.com/nebulab/omnes#adapters), which is recommended as
 otherwise the response to Stripe will be delayed until subscribers are done.
 
+#### Configuring the webhook signature tolerance
+
 You can also configure the signature verification tolerance in seconds (it
 defaults to the [same value as Stripe
 default](https://stripe.com/docs/webhooks/signatures#replay-attacks)):
@@ -156,6 +184,16 @@ SolidusStripe.configure do |config|
 end
 ```
 
+### Customizing the list of available Stripe payment methods
+
+By default, the extension will show all the payment methods that are supported by Stripe in the current currency and for the merchant country.
+
+You can customize the list of available payment methods by overriding the `payment_method_types` option in the `app/views/checkouts/payment/_stripe.html.erb` partial. Please refer to the [Stripe documentation](https://stripe.com/docs/payments/payment-methods) for the full list of supported payment methods.
+
+### Non-card payment methods and "auto_capture"
+
+Solidus payment methods are configured with a `auto_capture` option, which is used to determine if the payment should be captured immediately or not. If you intend to use a non-card payment method, it's likely that you'll need to set `auto_capture` to `true` in the payment method configuration. Please refer to the [Stripe documentation](https://stripe.com/docs/payments/payment-methods/integration-options#additional-api-supportability) for more details.
+
 ## Implementation
 
 ### Payment state-machine vs. PaymentIntent statuses
@@ -169,7 +207,7 @@ In order to map these concepts SolidusStripe will match states in a slightly une
 | --------------------------- | --------------------- |
 | requires_payment_method     | checkout              |
 | requires_action             | checkout              |
-| processing                  | checkout              |
+| processing                  | processing            |
 | requires_confirmation       | checkout              |
 | requires_capture            | pending               |
 | succeeded                   | completed             |
@@ -179,6 +217,10 @@ Reference:
 - https://stripe.com/docs/payments/intents?intent=payment
 - https://github.com/solidusio/solidus/blob/master/core/lib/spree/core/state_machines/payment.rb
 
+### Deferred payment confirmation
+
+This extensions is using the [two-step payment confirmation](https://stripe.com/docs/payments/build-a-two-step-confirmation) flow. This means that at the payment step the payment form will just collect the basic payment information (e.g. credit card details) and any additional confirmation is deferred to the confirmation step.
+
 ## Development
 
 Retrieve your API Key and Publishable Key from your [Stripe testing dashboard](https://stripe.com/docs/testing). You can

data/app/models/solidus_stripe/gateway.rb

@@ -75,16 +75,16 @@ module SolidusStripe
     # @see https://stripe.com/docs/payments/capture-later
     #
     # @todo add support for capturing custom amounts
-    def capture(amount_in_cents, payment_intent_id, options = {})
+    def capture(amount_in_cents, stripe_payment_intent_id, options = {})
       check_given_amount_matches_payment_intent(amount_in_cents, options)
-      check_payment_intent_id(payment_intent_id)
+      check_stripe_payment_intent_id(stripe_payment_intent_id)
 
-      payment_intent = capture_stripe_payment_intent(payment_intent_id)
+      stripe_payment_intent = capture_stripe_payment_intent(stripe_payment_intent_id, amount_in_cents)
       build_payment_log(
         success: true,
         message: "PaymentIntent was confirmed successfully",
-        response_code: payment_intent.id,
-        data: payment_intent,
+        response_code: stripe_payment_intent.id,
+        data: stripe_payment_intent,
       )
     rescue Stripe::InvalidRequestError => e
       build_payment_log(
@@ -130,18 +130,18 @@ module SolidusStripe
     end
 
     # Voids a previously authorized transaction, releasing the funds that are on hold.
-    def void(payment_intent_id, _options = {})
-      check_payment_intent_id(payment_intent_id)
+    def void(stripe_payment_intent_id, _options = {})
+      check_stripe_payment_intent_id(stripe_payment_intent_id)
 
-      payment_intent = request do
-        Stripe::PaymentIntent.cancel(payment_intent_id)
+      stripe_payment_intent = request do
+        Stripe::PaymentIntent.cancel(stripe_payment_intent_id)
       end
 
       build_payment_log(
         success: true,
         message: "PaymentIntent was canceled successfully",
-        response_code: payment_intent_id,
-        data: payment_intent,
+        response_code: stripe_payment_intent_id,
+        data: stripe_payment_intent,
       )
     rescue Stripe::InvalidRequestError => e
       build_payment_log(
@@ -158,8 +158,8 @@ module SolidusStripe
     # {RefundsSynchronizer}.
     #
     # TODO: check this method params twice.
-    def credit(amount_in_cents, payment_intent_id, options = {})
-      check_payment_intent_id(payment_intent_id)
+    def credit(amount_in_cents, stripe_payment_intent_id, options = {})
+      check_stripe_payment_intent_id(stripe_payment_intent_id)
 
       payment = options[:originator].payment
       currency = payment.currency
@@ -167,10 +167,8 @@ module SolidusStripe
       stripe_refund = request do
         Stripe::Refund.create(
           amount: to_stripe_amount(amount_in_cents, currency),
-          payment_intent: payment_intent_id,
-          metadata: {
-            RefundsSynchronizer::SKIP_SYNC_METADATA_KEY => RefundsSynchronizer::SKIP_SYNC_METADATA_VALUE
-          }
+          payment_intent: stripe_payment_intent_id,
+          metadata: RefundsSynchronizer.skip_sync_metadata
         )
       end
 
@@ -203,8 +201,8 @@ module SolidusStripe
       request { Stripe::PaymentIntent.confirm(stripe_payment_intent_id) }
     end
 
-    def capture_stripe_payment_intent(stripe_payment_intent_id)
-      request { Stripe::PaymentIntent.capture(stripe_payment_intent_id) }
+    def capture_stripe_payment_intent(stripe_payment_intent_id, amount)
+      request { Stripe::PaymentIntent.capture(stripe_payment_intent_id, amount: amount) }
     end
 
     def check_given_amount_matches_payment_intent(amount_in_cents, options)
@@ -218,12 +216,12 @@ module SolidusStripe
         "tried #{amount_in_cents} but can only accept #{payment.display_amount.cents}."
     end
 
-    def check_payment_intent_id(payment_intent_id)
-      unless payment_intent_id
-        raise ArgumentError, "missing payment_intent_id"
+    def check_stripe_payment_intent_id(stripe_payment_intent_id)
+      unless stripe_payment_intent_id
+        raise ArgumentError, "missing stripe_payment_intent_id"
       end
 
-      return if payment_intent_id.start_with?('pi_')
+      return if stripe_payment_intent_id.start_with?('pi_')
 
       raise ArgumentError, "the payment intent id has the wrong format"
     end

data/app/models/solidus_stripe/payment_intent.rb

@@ -5,17 +5,9 @@ module SolidusStripe
     belongs_to :order, class_name: 'Spree::Order'
     belongs_to :payment_method, class_name: 'SolidusStripe::PaymentMethod'
 
-    def self.prepare_for_payment(payment, **stripe_intent_options)
+    def self.prepare_for_payment(payment, **stripe_creation_options)
       # Find or create the intent for the payment.
-      intent =
-        retrieve_last_usable_intent(payment) ||
-          new(payment_method: payment.payment_method, order: payment.order)
-            .tap { _1.update!(stripe_intent_id: _1.create_stripe_intent(**stripe_intent_options).id) }
-
-      # Update the intent with the previously acquired payment method.
-      intent.payment_method.gateway.request {
-        Stripe::PaymentIntent.update(intent.stripe_intent_id, payment_method: payment.source.stripe_payment_method_id)
-      }
+      intent = retrieve_for_payment(payment) || create_for_payment(payment, **stripe_creation_options)
 
       # Attach the payment intent to the payment.
       payment.update!(response_code: intent.stripe_intent.id)
@@ -23,14 +15,31 @@ module SolidusStripe
       intent
     end
 
-    def self.retrieve_last_usable_intent(payment)
+    def self.create_for_payment(payment, **stripe_intent_options)
+      new(payment_method: payment.payment_method, order: payment.order)
+        .tap { _1.update!(stripe_intent_id: _1.create_stripe_intent(payment, **stripe_intent_options).id) }
+    end
+
+    def self.retrieve_for_payment(payment)
       intent = where(payment_method: payment.payment_method, order: payment.order).last
-      intent if intent&.usable?
+
+      return unless intent&.usable?
+
+      # Update the intent with the previously acquired payment method.
+      intent.payment_method.gateway.request {
+        Stripe::PaymentIntent.update(
+          intent.stripe_intent_id,
+          payment_method: payment.source.stripe_payment_method_id,
+          payment_method_types: [payment.source.stripe_payment_method.type],
+        )
+      }
+
+      intent
     end
 
     def usable?
       stripe_intent_id &&
-      stripe_intent.status == 'requires_payment_method'
+      stripe_intent.status == 'requires_payment_method' &&
       stripe_intent.amount == stripe_order_amount
     end
 
@@ -50,6 +59,8 @@ module SolidusStripe
       payment.started_processing!
 
       case stripe_intent.status
+      when 'processing'
+        successful = true
       when 'requires_capture'
         payment.pend! unless payment.pending?
         successful = true
@@ -89,7 +100,7 @@ module SolidusStripe
       super
     end
 
-    def create_stripe_intent(**stripe_intent_options)
+    def create_stripe_intent(payment, **stripe_intent_options)
       stripe_customer_id = SolidusStripe::Customer.retrieve_or_create_stripe_customer_id(
         payment_method: payment_method,
         order: order
@@ -102,6 +113,8 @@ module SolidusStripe
           capture_method: payment_method.auto_capture? ? 'automatic' : 'manual',
           setup_future_usage: payment_method.preferred_setup_future_usage.presence,
           customer: stripe_customer_id,
+          payment_method: payment.source.stripe_payment_method_id,
+          payment_method_types: [payment.source.stripe_payment_method.type],
           metadata: { solidus_order_number: order.number },
           **stripe_intent_options,
         })

data/app/subscribers/solidus_stripe/webhook/charge_subscriber.rb

@@ -16,12 +16,12 @@ module SolidusStripe
       # @param event [SolidusStripe::Webhook::Event]
       # @see SolidusStripe::RefundsSynchronizer
       def sync_refunds(event)
-        payment_method = event.spree_payment_method
-        payment_intent_id = event.data.object.payment_intent
+        payment_method = event.payment_method
+        stripe_payment_intent_id = event.data.object.payment_intent
 
         RefundsSynchronizer
           .new(payment_method)
-          .call(payment_intent_id)
+          .call(stripe_payment_intent_id)
       end
     end
   end

data/app/subscribers/solidus_stripe/webhook/payment_intent_subscriber.rb

@@ -79,8 +79,8 @@ module SolidusStripe
       private
 
       def extract_payment_from_event(event)
-        payment_intent_id = event.data.object.id
-        Spree::Payment.find_by!(response_code: payment_intent_id)
+        stripe_payment_intent_id = event.data.object.id
+        Spree::Payment.find_by!(response_code: stripe_payment_intent_id)
       end
 
       def complete_payment(payment)
@@ -95,17 +95,17 @@ module SolidusStripe
 
       def sync_refunds(event)
         event.data.object.to_hash => {
-          id: payment_intent_id,
+          id: stripe_payment_intent_id,
           amount: stripe_amount,
           amount_received: stripe_amount_received,
           currency:
         }
         return if stripe_amount == stripe_amount_received
 
-        payment_method = event.spree_payment_method
+        payment_method = event.payment_method
         RefundsSynchronizer
           .new(payment_method)
-          .call(payment_intent_id)
+          .call(stripe_payment_intent_id)
       end
     end
   end

data/app/views/spree/admin/payments/source_forms/existing_payment/_stripe.html.erb

@@ -9,6 +9,11 @@
 
 <div>
   <label>
-    <%= render "#{partial_base}/#{payment_type}", stripe_payment_method: stripe_payment_method %>
+    <%= render(
+      "#{partial_base}/#{payment_type}",
+      stripe_payment_method: stripe_payment_method,
+      partial_base: partial_base,
+      payment_type: payment_type
+    ) %>
   </label>
 </div>

data/db/migrate/20230306105520_create_solidus_stripe_payment_intents.rb

@@ -1,10 +1,14 @@
 class CreateSolidusStripePaymentIntents < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_stripe_payment_intents do |t|
-      t.string :stripe_payment_intent_id
-      t.references :order, null: false, foreign_key: { to_table: :spree_orders }
+      t.string :stripe_intent_id
+      t.integer :order_id, null: false, index: true
+      t.integer :payment_method_id, null: false, index: true
 
       t.timestamps
+
+      t.foreign_key :spree_orders, column: :order_id
+      t.foreign_key :spree_payment_methods, column: :payment_method_id
     end
   end
 end

data/db/migrate/20230308122414_create_solidus_stripe_slug_entries.rb

@@ -0,0 +1,12 @@
+class CreateSolidusStripeSlugEntries < ActiveRecord::Migration[5.2]
+  def change
+    create_table :solidus_stripe_slug_entries do |t|
+      t.integer :payment_method_id, null: false, index: true
+      t.string :slug, null: false, index: { unique: true }
+
+      t.timestamps
+
+      t.foreign_key :spree_payment_methods, column: :payment_method_id
+    end
+  end
+end

data/db/migrate/20230313150008_create_solidus_stripe_customers.rb

@@ -1,15 +1,14 @@
 class CreateSolidusStripeCustomers < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_stripe_customers do |t|
-      t.references :payment_method, null: false, foreign_key: { to_table: :spree_payment_methods }
-
+      t.integer :payment_method_id, null: false
       t.string :source_type
       t.integer :source_id
-
       t.string :stripe_id, index: true
 
       t.timestamps
 
+      t.foreign_key :spree_payment_methods, column: :payment_method_id
       t.index [:payment_method_id, :source_type, :source_id], unique: true, name: :payment_method_and_source
     end
   end

data/lib/generators/solidus_stripe/install/templates/app/javascript/controllers/solidus_stripe_payment_controller.js

@@ -5,7 +5,7 @@ export default class extends Controller {
   static values = {
     clientSecret: String,
     publishableKey: String,
-    paymentElementOptions: Object,
+    options: Object,
 
     // For now we don't have a controller to interact with
     // and we can't use outlets, so we fallback on acquiring selectors.
@@ -71,8 +71,8 @@ export default class extends Controller {
   }
 
   setupPaymentElement() {
-    this.elements = this.stripe.elements(this.paymentElementOptionsValue)
-    this.paymentElement = this.elements.create("payment", { layout: "tabs" })
+    this.elements = this.stripe.elements(this.optionsValue.elementsInitialization)
+    this.paymentElement = this.elements.create("payment", this.optionsValue.paymentElementCreation)
     this.paymentElementTarget.innerHTML = "" // Remove child nodes used for loading
     this.paymentElement.mount(this.paymentElementTarget)
   }

data/lib/generators/solidus_stripe/install/templates/app/views/checkouts/existing_payment/_stripe.html.erb

@@ -11,6 +11,11 @@
 
 <div>
   <label>
-    <%= render "#{partial_base}/#{payment_type}", stripe_payment_method: stripe_payment_method %>
+    <%= render(
+      "#{partial_base}/#{payment_type}",
+      stripe_payment_method: stripe_payment_method,
+      partial_base: partial_base,
+      payment_type: payment_type,
+    ) %>
   </label>
 </div>