pay 10.0.2 → 10.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d100fe3b67eb40c0099ad4875c9aed063da3a57d6ddd84f7d3ccd572d53bbcd
-  data.tar.gz: 8c62540416d2089e12dabb3cb5b2780201088d7c793bad92adfa839e14363c06
+  metadata.gz: a2c55cf9e768d0706c1ea9cb6efa042bd4988655ff64ef8692950b2333352238
+  data.tar.gz: 33eefe08c1f201a4a58bee3d80705a2677aa6a064c4a00a1bf391965819e81be
 SHA512:
-  metadata.gz: 3ab2f514dcb11ffcdfac4dbeef8ef88673c2ba9f63d6fe47927953ce9508dd1eabc337dcc47224264a7a843242af830a921cc090c892860edbf972bca877e388
-  data.tar.gz: 69c039a1ad0732ee7f62113515ee8d1f7d351766a859ccf5a457fb1c8fabde8d06531ea1682f7ff42102cb85956c36971db0aff571b8b30ab4caa47e8e6ca451
+  metadata.gz: b136aa767deaa1ea0c37cc6d7e9e340e588005ba14d5b23c6ff7043e86b408720a9f86efc8e850308c52a665aa8d11182261d63a3c98f326243cffa1f26f9303
+  data.tar.gz: b9b7336acd10e8a956fc3d3911e81bf002d5003cf0f1283c21cee24fd79bef7b43cc331cdc6988ce0551ec8eb5fe99da976741595c939ad7e4a4c27c8d0aad55

data/lib/pay/stripe/webhooks/payment_action_required.rb

@@ -6,16 +6,17 @@ module Pay
           # Event is of type "invoice" see:
           # https://stripe.com/docs/api/invoices/object
 
-          object = event.data.object
+          invoice = event.data.object
+          subscription_id = invoice.parent.try(:subscription_details).try(:subscription)
 
           # Don't send email on incomplete Stripe subscriptions since they're just getting created and the JavaScript will handle SCA
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, object.subscription)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, subscription_id)
           return if pay_subscription.nil? || pay_subscription.status == "incomplete"
 
           if Pay.send_email?(:payment_action_required, pay_subscription)
             Pay.mailer.with(
               pay_customer: pay_subscription.customer,
-              payment_intent_id: event.data.object.payment_intent,
+              payment_intent_id: invoice.payment_intent,
               pay_subscription: pay_subscription
             ).payment_action_required.deliver_later
           end

data/lib/pay/stripe/webhooks/payment_failed.rb

@@ -6,16 +6,17 @@ module Pay
           # Event is of type "invoice" see:
           # https://stripe.com/docs/api/invoices/object
 
-          object = event.data.object
+          invoice = event.data.object
+          subscription_id = invoice.parent.try(:subscription_details).try(:subscription)
 
           # Don't send email on incomplete Stripe subscriptions since they're just getting created and the JavaScript will handle SCA
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, object.subscription)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, subscription_id)
           return if pay_subscription.nil? || pay_subscription.status == "incomplete"
 
           if Pay.send_email?(:payment_failed, pay_subscription)
             Pay.mailer.with(
               pay_customer: pay_subscription.customer,
-              stripe_invoice: object
+              stripe_invoice: invoice
             ).payment_failed.deliver_now
           end
         end

data/lib/pay/stripe/webhooks/subscription_renewing.rb

@@ -6,17 +6,20 @@ module Pay
         # Occurs X number of days before a subscription is scheduled to create an invoice that is automatically charged—where X is determined by your subscriptions settings. Note: The received Invoice object will not have an invoice ID.
 
         def call(event)
+          invoice = event.data.object
+          subscription_id = invoice.parent.try(:subscription_details).try(:subscription)
+
           # Event is of type "invoice" see:
           # https://stripe.com/docs/api/invoices/object
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, event.data.object.subscription)
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, subscription_id)
           return unless pay_subscription
 
           # Stripe subscription items all have the same interval
-          price = event.data.object.lines.data.first.price
+          price = ::Stripe::Price.retrieve(invoice.lines.first.pricing.price_details.price)
 
           # For collection_method=send_invoice, Stripe will send an email and next_payment_attempt will be null
           # https://docs.stripe.com/api/invoices/object#invoice_object-collection_method
-          if Pay.send_email?(:subscription_renewing, pay_subscription, price) && (next_payment_attempt = event.data.object.next_payment_attempt)
+          if Pay.send_email?(:subscription_renewing, pay_subscription, price) && (next_payment_attempt = invoice.next_payment_attempt)
             Pay.mailer.with(
               pay_customer: pay_subscription.customer,
               pay_subscription: pay_subscription,

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "10.0.2"
+  VERSION = "10.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.0.4
 platform: ruby
 authors:
 - Jason Charnes