pay 11.1.0 → 11.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82dd9dc3193e898e2fd8538148e9ff886b852506d80c768a26616921049fbd65
-  data.tar.gz: 1b85c150235a1ae4531592b6d6c5cf577e126e693c1ce516ea2b01d8199f5276
+  metadata.gz: 65a518434cfa0042025a7d66ccaef83ab3057315d349988f3a6030ec58b55112
+  data.tar.gz: f92aada3064d15eb96d94cbb21dc3fce497176b4c09f514b0b7ed3f87c17fff2
 SHA512:
-  metadata.gz: c0b450e4daa02317f33e74bc627728643157361f5d51d5748e37c5a372d94dabb41b28306b569f4e9c2fa4a0ca04e437f18e15007cac6ec3eb23a8a9ca190609
-  data.tar.gz: 1964aabb5533aba8a248164ef01b7203bf450fed5dab23859c14a1cbbdf9f90a67ac29beeb8840decd0ec4e70bd4da0d252e668b1d5b6bcbb63b3214ad16d38b
+  metadata.gz: c1861d93f6e98f1d2c4e48a0449d55b1099c20a5c61191b9d6ee1398ed169c0b0ee514d3d45d2079b4e196c043bce5d4e25eb8d28c40831b0237bf950e4be27a
+  data.tar.gz: 8aa5427869f976334156b802d5ef6320c151860510f78b0855a1c335b7152b5dce3b604e9545e08474770d2e8a8b257bea40c5d27286ae7fe5fe784f2275177d

data/app/models/pay/stripe/charge.rb

@@ -47,13 +47,15 @@ module Pay
         }
 
         # Associate charge with subscription if we can
-        invoice_payments = ::Stripe::InvoicePayment.list({payment: {type: :payment_intent, payment_intent: object.payment_intent}, status: :paid, expand: ["data.invoice.total_discount_amounts.discount"]}, {stripe_account: stripe_account}.compact)
-        if invoice_payments.any? && (invoice = invoice_payments.first.invoice)
-          attrs[:stripe_invoice] = invoice.to_hash
-          attrs[:subtotal] = invoice.subtotal
-          attrs[:tax] = invoice.total - invoice.total_excluding_tax.to_i
-          if (subscription = invoice.parent.try(:subscription_details).try(:subscription))
-            attrs[:subscription] = pay_customer.subscriptions.find_by(processor_id: subscription)
+        if object.payment_intent.present?
+          invoice_payments = ::Stripe::InvoicePayment.list({payment: {type: :payment_intent, payment_intent: object.payment_intent}, status: :paid, expand: ["data.invoice.total_discount_amounts.discount"]}, {stripe_account: stripe_account}.compact)
+          if invoice_payments.any? && (invoice = invoice_payments.first.invoice)
+            attrs[:stripe_invoice] = invoice.to_hash
+            attrs[:subtotal] = invoice.subtotal
+            attrs[:tax] = invoice.total - invoice.total_excluding_tax.to_i
+            if (subscription = invoice.parent.try(:subscription_details).try(:subscription))
+              attrs[:subscription] = pay_customer.subscriptions.find_by(processor_id: subscription)
+            end
           end
         end
 
@@ -65,11 +67,13 @@ module Pay
           create!(attrs.merge(customer: pay_customer, processor_id: object.id))
         end
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
-        try += 1
-        raise unless try <= retries
-
-        sleep 0.1
-        retry
+        if try > retries
+          raise
+        else
+          try += 1
+          sleep 0.15**try
+          retry
+        end
       end
 
       def api_record

data/app/models/pay/stripe/payment_method.rb

@@ -41,12 +41,12 @@ module Pay
         pay_payment_method.update!(attributes)
         pay_payment_method
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
-        try += 1
-        if try <= retries
-          sleep 0.1
-          retry
-        else
+        if try > retries
           raise
+        else
+          try += 1
+          sleep 0.15**try
+          retry
         end
       end
 

data/app/models/pay/stripe/subscription.rb

@@ -103,7 +103,13 @@ module Pay
         if (invoice = object.try(:latest_invoice))
           Array(invoice.try(:payments)).each do |invoice_payment|
             next unless invoice_payment.status == "paid"
-            Pay::Stripe::Charge.sync_payment_intent(invoice_payment.payment.payment_intent, stripe_account: pay_subscription.stripe_account)
+
+            case invoice_payment.payment.type
+            when "payment_intent"
+              Pay::Stripe::Charge.sync_payment_intent(invoice_payment.payment.payment_intent, stripe_account: pay_subscription.stripe_account)
+            when "charge"
+              Pay::Stripe::Charge.sync(invoice_payment.payment.charge, stripe_account: pay_subscription.stripe_account)
+            end
           end
         end
 

data/lib/pay/stripe.rb

@@ -142,16 +142,25 @@ module Pay
       nil
     end
 
-    def self.sync_checkout_session(session_id, stripe_account: nil)
+    # Subscriptions aren't always immediately associated, so we want to retry by default
+    def self.sync_checkout_session(session_id, stripe_account: nil, try: 0, retries: 5)
       checkout_session = ::Stripe::Checkout::Session.retrieve({id: session_id, expand: ["payment_intent.latest_charge"]}, {stripe_account: stripe_account}.compact)
       case checkout_session.mode
       when "payment"
         if (id = checkout_session.payment_intent.try(:latest_charge)&.id)
-          Pay::Stripe::Charge.sync(id, stripe_account: stripe_account)
+          Pay::Stripe::Charge.sync(id, stripe_account: stripe_account, retries: 5)
         end
       when "subscription"
         Pay::Stripe::Subscription.sync(checkout_session.subscription, stripe_account: stripe_account)
       end
+    rescue ::Stripe::InvalidRequestError
+      if try > retries
+        raise
+      else
+        try += 1
+        sleep 0.15**try
+        retry
+      end
     end
   end
 end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.1.0"
+  VERSION = "11.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 11.1.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Payments engine for Ruby on Rails
 test_files: []