pay 11.2.3 → 11.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71299748a825cda0c189c61f051f666840c413df3e33e177d126dffa9feaa2fe
-  data.tar.gz: 3d6ad655b364d9fea688fbeae0e1f013bd6966e796559ec4cf1e2d5cb181dda0
+  metadata.gz: ebe9b67692268353c8f1f898d83ed6836cc22e82f040b7465d32d81fc8dc2540
+  data.tar.gz: 7b1f8b4b41cd8bdb7947573c10fdd718d3fc9241819e08d9d91365429bf3b85d
 SHA512:
-  metadata.gz: 530ea9ae04118c33c7aa91e17bb945cb752b22d175b3bdc32eef915e7e304f97f2017409eb53c3adb4ebeb319abf5e9c698ffa618167065d230c548d64ac23df
-  data.tar.gz: a39c4b305ce5083fcf44fdd8813de11292938bd2439a6288039d0f737e6f134b0ed869c61a06b99d1db4b105207e017de805c5a6cc86cbf9c2230add37dc69da
+  metadata.gz: f9b0bb4400a27d811f692152b7300490d2ad1db8d941586d13f8c825971ce2c7bf1f0a49934ab32e0d791453cb6228896658e9df14395cd69ef41635f7a4a391
+  data.tar.gz: 8933680fcf6be0cec427990d3a3a3e7701c26edb81a839c116d3194f68308cfbd7ad18e2e62cd421b3e4b4e94c296ece51763bf70aa530ad64b627ed27fb271e

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

@@ -48,8 +48,9 @@ module Pay
 
         # Associate charge with subscription if we can
         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)
+          invoice_payments = ::Stripe::InvoicePayment.list({payment: {type: :payment_intent, payment_intent: object.payment_intent}, status: :paid}, {stripe_account: stripe_account}.compact)
+          if invoice_payments.any?
+            invoice = ::Stripe::Invoice.retrieve({id: invoice_payments.first.invoice, expand: ["total_discount_amounts.discount.source.coupon"]}, {stripe_account: stripe_account}.compact)
             attrs[:stripe_invoice] = invoice.to_hash
             attrs[:subtotal] = invoice.subtotal
             attrs[:tax] = invoice.total - invoice.total_excluding_tax.to_i

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

@@ -31,7 +31,7 @@ module Pay
           return
         end
 
-        default_payment_method_id = pay_customer.api_record.invoice_settings.default_payment_method
+        default_payment_method_id = pay_customer.api_record.invoice_settings&.default_payment_method
         default = (id == default_payment_method_id)
 
         attributes = extract_attributes(object).merge(default: default, stripe_account: stripe_account)

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

@@ -279,7 +279,6 @@ module Pay
           unpause
         else
           @api_record = ::Stripe::Subscription.update(processor_id, {
-            plan: processor_plan,
             trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
             cancel_at_period_end: false
           }.merge(expand_options),
@@ -300,10 +299,9 @@ module Pay
           processor_id,
           {
             cancel_at_period_end: false,
-            plan: plan,
+            items: [{id: subscription_items.first.id, plan: plan, quantity: quantity}],
             proration_behavior: proration_behavior,
-            trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
-            quantity: quantity
+            trial_end: (on_trial? ? trial_ends_at.to_i : "now")
           }.merge(expand_options).merge(options),
           stripe_options
         )

data/lib/pay/receipts.rb

@@ -70,8 +70,8 @@ module Pay
       items
     end
 
-    def discount_description(discount)
-      coupon = discount.discount.coupon
+    def discount_description(total_discount_amount)
+      coupon = total_discount_amount.discount.try(:source).try(:coupon) || total_discount_amount.discount.try(:coupon)
       name = coupon.name
 
       if (percent = coupon.percent_off)

data/lib/pay/stripe.rb

@@ -27,7 +27,7 @@ module Pay
 
     extend Env
 
-    REQUIRED_VERSION = "~> 15"
+    REQUIRED_VERSION = "~> 17"
 
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.2.3"
+  VERSION = "11.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.2.3
+  version: 11.3.1
 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.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Payments engine for Ruby on Rails
 test_files: []