spree_stripe 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd7ae7fd51255dec03bb8bd709ceae4e9440dc8a61d64a62086fc91950937af0
-  data.tar.gz: 7f0c2798878679d21e6337269912e5a5be047c57348255b4536cf2f4de23ed87
+  metadata.gz: e1a013ff3e943f895d8f34b27fc940e3bda74c516c93c693c91b58edd711875f
+  data.tar.gz: 55f83e434625c4bfdb0753707a81d1d3ae919d951c822aa14f022bf045688dd6
 SHA512:
-  metadata.gz: edb953569b6fdab13d67ef13128f9edd29e2ce85a5a06f5ae7d1a4a2019dcf8a47aa313452474388ae983e2ccaacbbd8f9003dd8070ba34215fc5464a522fd1f
-  data.tar.gz: 77c47bb3f2d62f3ef0b6cbc48430dc834d6921c1a495aa293b7f3f8c82f25f17703c3a2cc0c3e7522d59e3008fedd5781bb3e9aeafb0d2183e0cf15d6e43cd8e
+  metadata.gz: '08d258ce2f9bd61bfc583a7da0f6047c1a8149c99cf9789dcf6da5a4cb468d92bac7bbce35884f89e07fa26e52a9abedb468ba108333bda5f13fb125cc9d9679'
+  data.tar.gz: 67058d4b5bcc5a317d2b2bbd9d37ae99595bfd01215071e79cfc038c9c55a16cad288fa1da75a25a9439eb85e4f872f15b6208af44dcdcebc3d0e5321799765b

data/app/models/spree_stripe/gateway/payment_sessions.rb

@@ -3,6 +3,11 @@ module SpreeStripe
     module PaymentSessions
       extend ActiveSupport::Concern
 
+      # Intent states where nothing has been confirmed yet, so the intent can
+      # safely be handed to another checkout window. Anything further along
+      # means money is already moving and a second intent would double-charge.
+      REUSABLE_INTENT_STATUSES = %w[requires_payment_method requires_confirmation].freeze
+
       def session_required?
         true
       end
@@ -11,12 +16,20 @@ module SpreeStripe
         Spree::PaymentSessions::Stripe
       end
 
+      # Returns the order's reusable pending session (its amount and payment
+      # method brought up to date) or creates a new one. An order gets at most
+      # one unconfirmed Stripe intent at a time: a second checkout window
+      # confirms the same intent — which Stripe rejects once the first one
+      # succeeds — instead of charging a second one.
       def create_payment_session(order:, amount: nil, external_data: {})
         total = amount.presence || order.total_minus_store_credits
         amount_in_cents = Spree::Money.new(total, currency: order.currency).cents
 
         raise Spree::Core::GatewayError, I18n.t('spree.stripe.payment_session_errors.zero_amount') if amount_in_cents.zero?
 
+        reused_session = reuse_payment_session(order, total, external_data)
+        return reused_session if reused_session.present?
+
         customer = fetch_or_create_customer(order: order)
         stripe_pm_id = external_data[:stripe_payment_method_id] || external_data['stripe_payment_method_id']
 
@@ -109,6 +122,26 @@ module SpreeStripe
 
       private
 
+      def reuse_payment_session(order, amount, external_data)
+        session = order.payment_sessions.where(payment_method: self, status: 'pending').not_expired.order(:created_at).last
+        return if session.blank?
+
+        intent = retrieve_payment_intent(session.external_id)
+
+        if intent.status == 'canceled'
+          session.cancel if session.can_cancel?
+          return
+        end
+
+        unless intent.status.in?(REUSABLE_INTENT_STATUSES)
+          raise Spree::Core::GatewayError, I18n.t('spree.stripe.payment_session_errors.payment_in_progress')
+        end
+
+        update_payment_session(payment_session: session, amount: amount, external_data: external_data)
+
+        session
+      end
+
       def payment_intent_successful?(stripe_pi)
         stripe_pi.status == 'succeeded'
       end

data/config/locales/en.yml

@@ -5,4 +5,5 @@ en:
     stripe:
       payment_could_not_be_processed: Your payment could not be processed. Please try again.
       payment_session_errors:
+        payment_in_progress: A payment for this order is already in progress. Please wait for it to finish before trying again.
         zero_amount: Payment session amount must be greater than zero

data/lib/spree_stripe/version.rb

@@ -1,5 +1,5 @@
 module SpreeStripe
-  VERSION = '1.8.1'.freeze
+  VERSION = '1.8.2'.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.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Vendo Connect Inc., Vendo Sp. z o.o.
@@ -250,9 +250,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.8.1
+  changelog_uri: https://github.com/spree/spree_stripe/releases/tag/v1.8.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_stripe/tree/v1.8.1
+  source_code_uri: https://github.com/spree/spree_stripe/tree/v1.8.2
 rdoc_options: []
 require_paths:
 - lib