spree_stripe 1.7.0 → 1.8.0

data/app/views/spree/checkout/payment/_spree_stripe.html.erb

@@ -1,66 +1,66 @@
-<div
-  data-controller="checkout-stripe"
-  data-checkout-stripe-payment-intent-value="<%= current_stripe_payment_intent.to_json %>"
-  data-checkout-stripe-return-url-value="<%= spree.stripe_payment_intent_url(current_stripe_payment_intent) %>"
-  data-checkout-stripe-api-key-value="<%= current_stripe_gateway.try(:preferred_publishable_key) %>"
-  data-checkout-stripe-order-token-value="<%= @order.token %>"
-  data-checkout-stripe-order-email-value="<%= @order.email %>"
-  data-checkout-stripe-color-primary-value="<%= hex_color_to_rgb(theme_setting(:primary_color)) %>"
-  data-checkout-stripe-color-text-value="<%= hex_color_to_rgb(theme_setting(:text_color)) %>"
-  data-checkout-stripe-payment-intent-path-value="<%= spree.api_v2_storefront_stripe_payment_intent_path(current_stripe_payment_intent.id) %>"
-  data-checkout-stripe-checkout-path-value="<%= spree.api_v2_storefront_checkout_path %>"
-  data-checkout-stripe-checkout-validate-order-for-payment-path-value="<%= spree.validate_order_for_payment_api_v2_storefront_checkout_path %>"
->
-  <% payment_sources = checkout_payment_sources(payment_method) %>
+<% if current_stripe_gateway.present? && current_stripe_payment_session.present? %>
+  <div
+    data-controller="checkout-stripe"
+    data-checkout-stripe-api-key-value="<%= current_stripe_gateway.try(:preferred_publishable_key) %>"
+    data-checkout-stripe-client-secret-value="<%= current_stripe_payment_session.client_secret %>"
+    data-checkout-stripe-cart-id-value="<%= stripe_cart_prefixed_id(@order) %>"
+    data-checkout-stripe-cart-token-value="<%= @order.token %>"
+    data-checkout-stripe-spree-api-key-value="<%= current_store_publishable_api_key %>"
+    data-checkout-stripe-order-email-value="<%= @order.email %>"
+    data-checkout-stripe-return-url-value="<%= spree.stripe_confirm_payment_url(@order.prefixed_id, session: current_stripe_payment_session.prefixed_id) %>"
+    data-checkout-stripe-color-primary-value="<%= hex_color_to_rgb(theme_setting(:primary_color)) %>"
+    data-checkout-stripe-color-text-value="<%= hex_color_to_rgb(theme_setting(:text_color)) %>"
+  >
+    <% payment_sources = checkout_payment_sources(payment_method) %>
 
-  <% if payment_sources.any? %>
-    <div id="existing_cards">
-      <div class="form-group">
-        <ul class="list-group mb-5 border rounded-md" data-controller="reveal">
-          <% payment_sources.each_with_index do |card, index| %>
-            <li class="p-0 m-0 border-b" id="<%= spree_dom_id(card) %>">
-              <div class="custom-control custom-radio px-5 py-4 flex items-center">
-                <label class="flex flex-row items-center cursor-pointer">
-                  <%= radio_button_tag "order[existing_card]", card.gateway_payment_profile_id, index == 0, { data: {action: "checkout-stripe#initializeStripe reveal#hide", checkout_stripe_target: index == 0 ? "defaultCard" : nil}, class: "mr-5" } %>
-                  <div class="flex space-x-4 items-center">
-                    <%= payment_method_icon_tag(card.cc_type) %>
-                    <span>****<%= card.last_digits %></span>
-                    <span><%= card.month.to_s.rjust(2, '0') %>/<%= card.year %></span>
+    <% if payment_sources.any? %>
+      <div id="existing_cards">
+        <div class="form-group">
+          <ul class="list-group mb-5 border rounded-md" data-controller="reveal">
+            <% payment_sources.each_with_index do |card, index| %>
+              <li class="p-0 m-0 border-b" id="<%= spree_dom_id(card) %>">
+                <div class="custom-control custom-radio px-5 py-4 flex items-center">
+                  <label class="flex flex-row items-center cursor-pointer">
+                    <%= radio_button_tag "order[existing_card]", card.gateway_payment_profile_id, index == 0, { data: { action: "checkout-stripe#initializeStripe reveal#hide", checkout_stripe_target: index == 0 ? "defaultCard" : nil }, class: "mr-5" } %>
+                    <div class="flex space-x-4 items-center">
+                      <%= payment_method_icon_tag(card.cc_type) %>
+                      <span>****<%= card.last_digits %></span>
+                      <span><%= card.month.to_s.rjust(2, '0') %>/<%= card.year %></span>
+                    </div>
+                  </label>
+                </div>
+              </li>
+            <% end %>
+            <li>
+              <div class="custom-control custom-radio px-5 py-4 flex items-center w-full">
+                <label class="flex flex-row items-center w-full pr-8">
+                  <%= radio_button_tag "order[existing_card]", nil, false, { data: { action: "checkout-stripe#initializeStripe reveal#show" }, class: "mr-5" } %>
+                  <div class="w-full flex flex-col items-start space-y-4 justify-center">
+                    <span class="cursor-pointer">
+                      <%= Spree.t(:add_new_credit_card) %>
+                    </span>
+                    <!-- Display a payment form -->
+                    <div data-checkout-stripe-target="paymentElement" data-reveal-target="item" class="w-full hidden">
+                      <!--Stripe.js injects the Payment Element-->
+                    </div>
                   </div>
                 </label>
               </div>
             </li>
-          <% end %>
-          <li>
-            <div class="custom-control custom-radio px-5 py-4 flex items-center w-full">
-              <label class="flex flex-row items-center w-full pr-8">
-                <%= radio_button_tag "order[existing_card]", nil, false, {  data: {action: "checkout-stripe#initializeStripe reveal#show"}, class: "mr-5" } %>
-                <div class="w-full flex flex-col items-start space-y-4 justify-center">
-                  <span class="cursor-pointer">
-                    <%= Spree.t(:add_new_credit_card) %>
-                  </span>
-                  <!-- Display a payment form -->
-                  <div data-checkout-stripe-target="paymentElement" data-reveal-target="item" class="w-full hidden">
-                    <!--Stripe.js injects the Payment Element-->
-                  </div>
-                </div>
-              </label>
-            </div>
-          </li>
-        </ul>
+          </ul>
+        </div>
+      </div>
+    <% else %>
+      <div data-checkout-stripe-target="paymentElement" class="w-full"></div>
+    <% end %>
+    <div data-checkout-stripe-target="loading" class="p-6">
+      <div class="mx-auto flex justify-center lg:w-1/4">
+        <svg class="animate-spin h-5 w-5 mr-4 text-primary" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+          <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+          <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+        </svg>
+        <%= Spree.t(:loading) %>...
       </div>
-    </div>
-  <% else %>
-    <div data-checkout-stripe-target="paymentElement" class="w-full"></div>
-  <% end %>
-  <div data-checkout-stripe-target="messageContainer" class="hidden text-danger"></div>
-  <div data-checkout-stripe-target="loading" class="p-6">
-    <div class="mx-auto flex justify-center lg:w-1/4">
-      <svg class="animate-spin h-5 w-5 mr-4 text-primary" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-        <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-        <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-      </svg>
-      <%= Spree.t(:loading) %>...
     </div>
   </div>
-</div>
+<% end %>

data/app/views/spree_stripe/_quick_checkout.html.erb

@@ -1,29 +1,23 @@
-<% if quick_checkout_enabled?(@order) && current_stripe_gateway.present? && current_stripe_payment_intent.present? %>
+<% if quick_checkout_enabled?(@order) && current_stripe_gateway.present? %>
   <div id="quick-checkout" class="<%= defined?(container_class) ? container_class : nil %>">
     <%= tag.div class: 'w-full', data: {
         controller: 'checkout-stripe-button',
         checkout_stripe_button_target: 'container',
         checkout_stripe_button_api_key_value: current_stripe_gateway.try(:preferred_publishable_key),
-        checkout_stripe_button_order_token_value: @order.token,
-        checkout_stripe_button_client_secret_value: current_stripe_payment_intent.client_secret,
+        checkout_stripe_button_spree_api_key_value: current_store_publishable_api_key,
+        checkout_stripe_button_payment_method_id_value: current_stripe_gateway.prefixed_id,
+        checkout_stripe_button_cart_id_value: stripe_cart_prefixed_id(@order),
+        checkout_stripe_button_cart_token_value: @order.token,
+        checkout_stripe_button_confirm_payment_url_value: spree.stripe_confirm_payment_url(@order.prefixed_id),
         checkout_stripe_button_currency_value: @order.currency.downcase,
-        checkout_stripe_button_amount_value: @order.display_total_minus_store_credits.cents,
-        checkout_stripe_button_available_countries_value: available_countries_iso.as_json,
-        checkout_stripe_button_gift_card_code_value: @order.respond_to?(:gift_card) ? @order.gift_card&.code : nil,
-        checkout_stripe_button_gift_card_amount_value: @order.respond_to?(:gift_card_total) ? @order.gift_card_total : nil,
+        checkout_stripe_button_amount_value: Spree::Money.new(@order.total_minus_store_credits, currency: @order.currency).cents,
         checkout_stripe_button_border_radius_value: theme_setting(:button_border_radius),
         checkout_stripe_button_height_value: defined?(height) ? height : nil,
         checkout_stripe_button_theme_value: defined?(theme) ? theme : nil,
         checkout_stripe_button_max_rows_value: defined?(max_rows) ? max_rows : nil,
         checkout_stripe_button_max_columns_value: defined?(max_columns) ? max_columns : nil,
         checkout_stripe_button_button_width_value: defined?(button_width) ? button_width : nil,
-        checkout_stripe_button_checkout_path_value: spree.api_v2_storefront_checkout_path,
-        checkout_stripe_button_checkout_advance_path_value: spree.advance_api_v2_storefront_checkout_path,
-        checkout_stripe_button_checkout_select_shipping_method_path_value: spree.select_shipping_method_api_v2_storefront_checkout_path,
-        checkout_stripe_button_checkout_validate_gift_card_data_path_value: respond_to?(:validate_gift_card_data_api_v2_storefront_checkout_path) ? spree.validate_gift_card_data_api_v2_storefront_checkout_path : nil,
-        checkout_stripe_button_checkout_validate_order_for_payment_path_value: spree.validate_order_for_payment_api_v2_storefront_checkout_path,
-        checkout_stripe_button_return_url_value: spree.stripe_payment_intent_url(current_stripe_payment_intent),
-        checkout_stripe_button_shipping_required_value: @order.respond_to?(:quick_checkout_require_address?) ? @order.quick_checkout_require_address? : true,
+        checkout_stripe_button_shipping_required_value: @order.quick_checkout_require_address?,
         checkout_stripe_button_phone_required_value: Spree::Config[:address_requires_phone]
       } do %>
       <div id="payment-request-button"></div>
@@ -37,4 +31,4 @@
       </div>
     <% end %>
   </div>
-<% end%>
+<% end %>

data/config/locales/en.yml

@@ -3,11 +3,6 @@ en:
   spree:
     bank_transfer: Bank Transfer
     stripe:
-      payment_intent_errors:
-        canceled: Payment intent canceled
-        processing: Payment intent processing
-        requires_action: Payment intent requires action
-        requires_capture: Payment intent requires capture
-        requires_confirmation: Payment intent requires confirmation
-        requires_payment_method: Payment intent requires payment method
-        succeeded: Payment intent succeeded
+      payment_could_not_be_processed: Your payment could not be processed. Please try again.
+      payment_session_errors:
+        zero_amount: Payment session amount must be greater than zero

data/config/routes.rb

@@ -1,30 +1,11 @@
 Spree::Core::Engine.add_routes do
-  # Stripe payment intents
-  get '/stripe/payment_intents/:id', to: '/spree_stripe/payment_intents#show',
-                                     as: :stripe_payment_intent,
-                                     controller: '/spree_stripe/payment_intents'
+  # Stripe redirects here after payment confirmation. It completes the session + order server-side.
+  # Used by Rails storefront
+  get '/stripe/confirm_payment/:id', to: '/spree_stripe/confirm_payments#show', as: :stripe_confirm_payment
 
   # Apple Pay domain verification certificate for Apple Pay
   get '/.well-known/apple-developer-merchantid-domain-association' => '/spree_stripe/apple_pay_domain_verification#show'
 
   # Stripe webhooks
   mount StripeEvent::Engine, at: '/stripe'
-
-  # Storefront API (only when spree_legacy_api_v2 gem is available)
-  if defined?(SpreeLegacyApiV2::Engine)
-    namespace :api, defaults: { format: 'json' } do
-      namespace :v2 do
-        namespace :storefront do
-          namespace :stripe do
-            resources :setup_intents, only: %i[create]
-            resources :payment_intents, only: %i[show create update] do
-              member do
-                patch :confirm
-              end
-            end
-          end
-        end
-      end
-    end
-  end
 end

data/db/migrate/20250310152812_setup_spree_stripe_models.rb

@@ -1,22 +1,5 @@
 class SetupSpreeStripeModels < ActiveRecord::Migration[7.2]
   def change
-    create_table :spree_stripe_payment_intents do |t|
-      t.decimal :amount, precision: 10, scale: 2, default: '0.0', null: false
-      t.bigint :order_id, null: false
-      t.bigint :payment_method_id, null: false
-      t.string :stripe_id, null: false
-      t.string :client_secret, null: false
-      t.string :customer_id
-      t.string :ephemeral_key_secret
-      t.string :stripe_payment_method_id
-
-      t.timestamps
-
-      t.index ['order_id', 'stripe_id'], name: 'index_spree_stripe_payment_intents_on_order_id_and_stripe_id', unique: true
-      t.index ['order_id'], name: 'index_spree_stripe_payment_intents_on_order_id'
-      t.index ['payment_method_id'], name: 'index_spree_stripe_payment_intents_on_payment_method_id'
-    end
-
     create_table :spree_stripe_webhook_keys do |t|
       t.string :stripe_id, null: false
       t.string :signing_secret, null: false

data/lib/spree_stripe/configuration.rb

@@ -6,7 +6,6 @@ module SpreeStripe
       payment_intent.succeeded
       setup_intent.succeeded
     ]
-    preference :use_legacy_payment_intents, :boolean, default: false
     preference :use_legacy_webhook_handlers, :boolean, default: false
   end
 end

data/lib/spree_stripe/engine.rb

@@ -7,12 +7,6 @@ module SpreeStripe
     # Add app/subscribers to autoload paths
     config.paths.add 'app/subscribers', eager_load: true
 
-    # Only load API controllers and serializers when spree_legacy_api_v2 gem is available
-    if defined?(SpreeLegacyApiV2::Engine)
-      config.autoload_paths << root.join('lib', 'spree_api_v2')
-      config.eager_load_paths << root.join('lib', 'spree_api_v2')
-    end
-
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec
@@ -40,7 +34,6 @@ module SpreeStripe
 
     def self.activate
       glob_paths = [File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')]
-      glob_paths << File.join(File.dirname(__FILE__), '../../lib/spree_api_v2/**/*_decorator*.rb') if defined?(SpreeLegacyApiV2::Engine)
 
       glob_paths.each do |glob_path|
         Dir.glob(glob_path) do |c|

data/lib/spree_stripe/version.rb

@@ -1,5 +1,5 @@
 module SpreeStripe
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.8.0'.freeze
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_stripe
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Vendo Connect Inc., Vendo Sp. z o.o.
@@ -85,20 +85,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jsonapi-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: spree_dev_tools
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +153,7 @@ files:
 - app/assets/images/payment_icons/link.svg
 - app/assets/images/payment_icons/sepadebit.svg
 - app/controllers/spree_stripe/apple_pay_domain_verification_controller.rb
-- app/controllers/spree_stripe/payment_intents_controller.rb
+- app/controllers/spree_stripe/confirm_payments_controller.rb
 - app/controllers/spree_stripe/store_controller_decorator.rb
 - app/controllers/stripe_event/webhook_controller_decorator.rb
 - app/helpers/spree_stripe/base_helper.rb
@@ -178,7 +164,6 @@ files:
 - app/jobs/spree_stripe/attach_customer_to_credit_card_job.rb
 - app/jobs/spree_stripe/base_job.rb
 - app/jobs/spree_stripe/complete_order_from_session_job.rb
-- app/jobs/spree_stripe/complete_order_job.rb
 - app/jobs/spree_stripe/create_tax_transaction_job.rb
 - app/jobs/spree_stripe/create_webhook_endpoint_job.rb
 - app/jobs/spree_stripe/register_domain_job.rb
@@ -196,7 +181,6 @@ files:
 - app/models/spree_stripe/gateway_customer_decorator.rb
 - app/models/spree_stripe/order_decorator.rb
 - app/models/spree_stripe/payment_decorator.rb
-- app/models/spree_stripe/payment_intent.rb
 - app/models/spree_stripe/payment_method_decorator.rb
 - app/models/spree_stripe/payment_methods_webhook_key.rb
 - app/models/spree_stripe/payment_source_decorator.rb
@@ -220,8 +204,7 @@ files:
 - app/services/spree_stripe/complete_order.rb
 - app/services/spree_stripe/create_gateway_webhooks.rb
 - app/services/spree_stripe/create_payment.rb
-- app/services/spree_stripe/create_payment_intent.rb
-- app/services/spree_stripe/create_setup_intent.rb
+- app/services/spree_stripe/create_payment_session.rb
 - app/services/spree_stripe/create_source.rb
 - app/services/spree_stripe/register_domain.rb
 - app/services/spree_stripe/update_customer.rb
@@ -245,27 +228,6 @@ files:
 - config/routes.rb
 - db/migrate/20250310152812_setup_spree_stripe_models.rb
 - lib/generators/spree_stripe/install/install_generator.rb
-- lib/spree_api_v2/spree/api/v2/platform/affirm_serializer.rb
-- lib/spree_api_v2/spree/api/v2/platform/after_pay_serializer.rb
-- lib/spree_api_v2/spree/api/v2/platform/alipay_serializer.rb
-- lib/spree_api_v2/spree/api/v2/platform/ideal_serializer.rb
-- lib/spree_api_v2/spree/api/v2/platform/klarna_serializer.rb
-- lib/spree_api_v2/spree/api/v2/platform/link_serializer.rb
-- lib/spree_api_v2/spree/api/v2/platform/przelewy24_serializer.rb
-- lib/spree_api_v2/spree/api/v2/platform/sepa_debit_serializer.rb
-- lib/spree_api_v2/spree/api/v2/storefront/stripe/base_controller.rb
-- lib/spree_api_v2/spree/api/v2/storefront/stripe/payment_intents_controller.rb
-- lib/spree_api_v2/spree/api/v2/storefront/stripe/setup_intents_controller.rb
-- lib/spree_api_v2/spree/v2/storefront/affirm_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/after_pay_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/alipay_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/ideal_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/klarna_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/link_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/payment_intent_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/przelewy24_serializer.rb
-- lib/spree_api_v2/spree/v2/storefront/sepa_debit_serializer.rb
-- lib/spree_api_v2/spree_stripe/v2/storefront/payment_method_serializer_decorator.rb
 - lib/spree_stripe.rb
 - lib/spree_stripe/configuration.rb
 - lib/spree_stripe/engine.rb
@@ -276,7 +238,6 @@ files:
 - lib/spree_stripe/testing_support/factories/ideal_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/klarna_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/link_payment_source_factory.rb
-- lib/spree_stripe/testing_support/factories/payment_intent_factory.rb
 - lib/spree_stripe/testing_support/factories/przelewy24_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/sepa_debit_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/stripe_payment_session_factory.rb
@@ -288,9 +249,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_stripe/issues
-  changelog_uri: https://github.com/spree/spree_stripe/releases/tag/v1.7.0
+  changelog_uri: https://github.com/spree/spree_stripe/releases/tag/v1.8.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_stripe/tree/v1.7.0
+  source_code_uri: https://github.com/spree/spree_stripe/tree/v1.8.0
 rdoc_options: []
 require_paths:
 - lib

data/app/controllers/spree_stripe/payment_intents_controller.rb

@@ -1,61 +0,0 @@
-# this is the endpoint that Stripe JS SDK will redirect customer to after payment
-# it will handle the payment intent status and process the payment
-module SpreeStripe
-  class PaymentIntentsController < defined?(Spree::StoreController) ? Spree::StoreController : Spree::BaseController
-    include Spree::CheckoutAnalyticsHelper if defined?(Spree::CheckoutAnalyticsHelper)
-
-    # GET /spree/payment_intents/:id
-    def show
-      # fetch the payment intent active record
-      @payment_intent_record = SpreeStripe::PaymentIntent.find(params[:id])
-
-      # fetch the stripe payment intent
-      @stripe_payment_intent = @payment_intent_record.stripe_payment_intent
-
-      @order = @payment_intent_record.order
-
-      # if somehow order was canceled, we need to redirect the customer to the cart
-      # this is a rare case, but we need to handle it
-      if @order.canceled?
-        flash[:error] = Spree.t(:order_canceled)
-        redirect_to spree.cart_path, status: :see_other
-      # if the order is already completed (race condition)
-      # we need to redirect the customer to the complete checkout page
-      # but we need to make sure not to set the session flag to indicate that the order was placed now
-      # because we don't know if the order was actually placed or not
-      elsif @order.completed?
-        redirect_to spree.checkout_complete_path(@order.token), status: :see_other
-      # if the payment intent is successful, we need to process the payment and complete the order
-      elsif @payment_intent_record.accepted?
-        @order = SpreeStripe::CompleteOrder.new(payment_intent: @payment_intent_record).call
-
-        # set the session flag to indicate that the order was placed now
-        track_checkout_completed if @order.completed? && defined?(track_checkout_completed)
-
-        # redirect the customer to the complete checkout page
-        redirect_to spree.checkout_complete_path(@order.token), status: :see_other
-      else
-        handle_failure(Spree.t("stripe.payment_intent_errors.#{@stripe_payment_intent.status}"))
-      end
-    rescue Spree::Core::GatewayError => e
-      handle_failure(e.message)
-    end
-
-    private
-
-    def handle_failure(error_message)
-      flash[:error] = error_message
-
-      Rails.logger.error("Payment failed for order #{@order.id}: #{@stripe_payment_intent.status}")
-
-      # remove the payment intent record, so after returning to the checkout page, the customer can try again with a new payment intent
-      @payment_intent_record.destroy!
-
-      # this should be a rare race condition, but we need to handle it
-      payment = @order.payments.valid.find_by(response_code: @stripe_payment_intent.id)
-      payment.void! if payment.present?
-
-      redirect_to spree.checkout_path(@order.token), status: :see_other
-    end
-  end
-end

data/app/jobs/spree_stripe/complete_order_job.rb

@@ -1,8 +0,0 @@
-module SpreeStripe
-  class CompleteOrderJob < BaseJob
-    def perform(payment_intent_id)
-      payment_intent = SpreeStripe::PaymentIntent.find(payment_intent_id)
-      SpreeStripe::CompleteOrder.new(payment_intent: payment_intent).call
-    end
-  end
-end

data/app/models/spree_stripe/payment_intent.rb

@@ -1,81 +0,0 @@
-module SpreeStripe
-  class PaymentIntent < Base
-    #
-    # Associations
-    #
-    belongs_to :order, class_name: 'Spree::Order', foreign_key: 'order_id'
-    belongs_to :payment_method, class_name: 'Spree::PaymentMethod', foreign_key: 'payment_method_id'
-    has_one :payment, class_name: 'Spree::Payment', foreign_key: 'response_code', primary_key: 'stripe_id'
-
-    #
-    # Validations
-    #
-    validates :order, :payment_method, :client_secret, presence: true
-    validates :stripe_id, presence: true, uniqueness: { scope: :order_id }
-    validates :amount, presence: true, numericality: { greater_than: 0 }
-
-    #
-    # Callbacks
-    #
-    before_validation :set_amount_from_order
-    after_update :update_stripe_payment_intent, if: :amount_or_stripe_payment_method_id_changed?
-
-    #
-    # Delegations
-    #
-    delegate :api_options, to: :payment_method
-    delegate :store, :currency, to: :order
-
-    def accepted?
-      payment_method.payment_intent_accepted?(stripe_payment_intent)
-    end
-
-    def successful?
-      stripe_payment_intent.status == 'succeeded'
-    end
-
-    def charge_not_required?
-      payment_method.payment_intent_charge_not_required?(stripe_payment_intent)
-    end
-
-    def stripe_payment_intent
-      @stripe_payment_intent ||= payment_method.retrieve_payment_intent(stripe_id)
-    end
-
-    def stripe_charge
-      @stripe_charge ||= begin
-        latest_charge = stripe_payment_intent.latest_charge
-        latest_charge.present? ? payment_method.retrieve_charge(latest_charge) : nil
-      end
-    end
-
-    # here we create a payment if it doesn't exist
-    # or we find it by the stripe_payment_intent_id
-    def find_or_create_payment!
-      return unless persisted?
-      return payment if payment.present?
-
-      SpreeStripe::CreatePayment.new(order: order, payment_intent: self, gateway: payment_method, amount: amount).call
-    end
-
-    def set_amount_from_order
-      self.amount = order&.total_minus_store_credits if order.present? && (amount.nil? || amount.zero?)
-    end
-
-    def update_stripe_payment_intent
-      payment_method.update_payment_intent(stripe_id, amount_in_cents, order, stripe_payment_method_id)
-    end
-
-    def amount_or_stripe_payment_method_id_changed?
-      amount_previously_changed? || stripe_payment_method_id_previously_changed?
-    end
-
-    def amount_in_cents
-      @amount_in_cents ||= money.cents
-    end
-
-    def money
-      @money ||= Spree::Money.new(amount, currency: currency)
-    end
-  end
-end

data/app/services/spree_stripe/create_payment_intent.rb

@@ -1,40 +0,0 @@
-module SpreeStripe
-  class CreatePaymentIntent
-    def call(order, gateway, stripe_payment_method_id: nil, off_session: false)
-      total = order.total_minus_store_credits
-      amount = Spree::Money.new(total).cents
-
-      return nil if amount.zero?
-
-      # lookup in database for existing payment intent
-      payment_intent = SpreeStripe::PaymentIntent.find_by(order: order, payment_method: gateway)
-
-      return payment_intent if payment_intent.present?
-
-      # response is a Spree::PaymentResponse object
-      response = gateway.create_payment_intent(
-        amount,
-        order,
-        payment_method_id: stripe_payment_method_id,
-        off_session: off_session
-      )
-
-      # we should only create a customer if the order was placed by a user
-      customer = gateway.fetch_or_create_customer(user: order.user) if order.user.present?
-      ephemeral_key_response = gateway.create_ephemeral_key(customer.profile_id) if customer.present?
-      ephemeral_key_secret = ephemeral_key_response&.params['secret'] if ephemeral_key_response.present?
-
-      # persist the payment intent
-      SpreeStripe::PaymentIntent.create!(
-        order: order,
-        payment_method: gateway,
-        amount: total,
-        stripe_id: response.authorization,
-        client_secret: response.params['client_secret'],
-        customer_id: customer&.profile_id,
-        stripe_payment_method_id: stripe_payment_method_id,
-        ephemeral_key_secret: ephemeral_key_secret
-      )
-    end
-  end
-end

data/app/services/spree_stripe/create_setup_intent.rb

@@ -1,20 +0,0 @@
-module SpreeStripe
-  class CreateSetupIntent
-    prepend Spree::ServiceModule::Base
-
-    def call(gateway:, user:)
-      customer = gateway.fetch_or_create_customer(user: user)
-
-      ephemeral_key_response = gateway.create_ephemeral_key(customer.profile_id)
-      setup_intent = gateway.create_setup_intent(customer.profile_id)
-
-      success(
-        {
-          customer_id: customer.profile_id,
-          ephemeral_key_secret: ephemeral_key_response.params['secret'],
-          setup_intent_client_secret: setup_intent.params['client_secret']
-        }
-      )
-    end
-  end
-end

data/lib/spree_api_v2/spree/api/v2/platform/affirm_serializer.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Platform
-        class AffirmSerializer < PaymentSourceSerializer; end
-      end
-    end
-  end
-end

data/lib/spree_api_v2/spree/api/v2/platform/after_pay_serializer.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Platform
-        class AfterPaySerializer < PaymentSourceSerializer; end
-      end
-    end
-  end
-end

data/lib/spree_api_v2/spree/api/v2/platform/alipay_serializer.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Platform
-        class AlipaySerializer < PaymentSourceSerializer; end
-      end
-    end
-  end
-end