pay 10.0.1 → 10.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c43263ab73cd849da8c65e8a4f1235aabb28b6f35c56c5441c077838374186
-  data.tar.gz: c0161223fdbd12eee31ef928639bba40e9af1a63e2e6cdeee3e2a69fce106de4
+  metadata.gz: e9a03557a1292cbb8dcd8b3c8b43533b3c2f9a0cfc53481f99976579e1009dba
+  data.tar.gz: f1d085db81f5132db3abb62bf07306ae7c4703343d46a39279fbef9eaf7692f7
 SHA512:
-  metadata.gz: 1fd5fdc16c976d6d33e908210c54de32cdbfcea6e0d641b58eb5f6e52fb5ff217bb59ac6ae3bb7118f8e59f5f6bcc2f2bd88fd61736d01c9fff386ebf24937ef
-  data.tar.gz: ffee6759b0bae293ffadb173158a57bac35e9f10150a38846499e2ffe635380a64606847098303a9422addd23e7e372d08669929b973c4135df2f2f81a3a0d2c
+  metadata.gz: c8af553a1fffd442ed1bc19399b4e19df35404a41af7546a48737d45af2b9cb9aa7906b71ad9c2abd3b119d72048608afe9a4506ba7dc75f606eff89adc803d5
+  data.tar.gz: b1de35982f96be48e20e8d514c0d14ccda50bcc25beb1f5238405931f8a4cc0331edad92160ab664b9a4031b5f9e3533fad3c1d2f529184cebc5bc4311ad19aa

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

@@ -89,7 +89,7 @@ module Pay
 
         response = ::Paddle::Subscription.cancel(
           id: processor_id,
-          effective_from: options.fetch(:effective_from, (paused? ? "immediately" : "next_billing_period"))
+          effective_from: options.fetch(:effective_from, paused? ? "immediately" : "next_billing_period")
         )
         update(
           status: response.status,

data/lib/pay/receipts.rb

@@ -31,7 +31,7 @@ module Pay
         ]
       ]
 
-      if stripe_invoice
+      if try(:stripe_invoice)
         stripe_invoice.lines.auto_paging_each do |line|
           items << [line.description, line.quantity, Pay::Currency.format(line.pricing.unit_amount_decimal, currency: line.currency), Pay::Currency.format(line.amount, currency: line.currency)]
 
@@ -45,21 +45,21 @@ module Pay
       end
 
       # If no subtotal, we will display the total
-      items << [nil, nil, I18n.t("pay.line_items.subtotal"), Pay::Currency.format(stripe_invoice&.subtotal || amount, currency: currency)]
+      items << [nil, nil, I18n.t("pay.line_items.subtotal"), Pay::Currency.format(try(:stripe_invoice)&.subtotal || amount, currency: currency)]
 
       # Discounts on the invoice
-      stripe_invoice&.discounts&.each do |discount_id|
+      try(:stripe_invoice)&.discounts&.each do |discount_id|
         discount = stripe_invoice.total_discount_amounts.find { |d| d.discount.id == discount_id }
         items << [nil, nil, discount_description(discount), Pay::Currency.format(-discount.amount, currency: currency)]
       end
 
       # Total excluding tax
-      if stripe_invoice
+      if try(:stripe_invoice)
         items << [nil, nil, I18n.t("pay.line_items.total"), Pay::Currency.format(stripe_invoice.total_excluding_tax, currency: currency)]
       end
 
       # Tax rates
-      stripe_invoice&.total_taxes&.each do |tax|
+      try(:stripe_invoice)&.total_taxes&.each do |tax|
         next if tax.amount.zero?
         # tax_rate = ::Stripe::TaxRate.retrieve(tax.tax_rate_details.tax_rate)
         items << [nil, nil, I18n.t("pay.line_items.tax"), Pay::Currency.format(tax.amount, currency: currency)]

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.1"
+  VERSION = "10.0.3"
 end

metadata

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