pay 6.2.3 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b66c0598271a99f2293bf71a7c44e8877a98d45e06540597ae81c3de9e2d53
-  data.tar.gz: c95b9e20ad640bc614fb293f708034e4ca4339868abf89def91eb245ce3c3f21
+  metadata.gz: aeee41b07bfa798c33c4d05b73c7035905f562d45cec48564d543e371ff53a7e
+  data.tar.gz: 7b7b1695db44d1f3e00637431f91be10e12c54541921f4b555d83253b981dc04
 SHA512:
-  metadata.gz: 8b72f9b22b361d10f9693009f48395474f3b93b46e9031faaa3e109eeb16f2a3e2645cd54084d948f04a5d249cc07568b351ad40e25cb3a2b23c4a82a44c0a60
-  data.tar.gz: 0a2135703836be6edfcd5994035d8c7b57d866365b381b66646b03347134b3a87b8506aa19981966124611aaf2cf2b6889c9f3fad415a7344737a28097dcc77c
+  metadata.gz: ee0f52b211a5894d00d7226d486ccdbce5ca8f18a66a1fa1fcd7c37344bd842f0672cf4c4070d7ee12684b8c64801fcd8c8674fa22d17f7204e95609f3b5cfa0
+  data.tar.gz: 4dcf8f4142c67ae179749e955baff64b454c2fc2eba3664727fd41572d22b0e6c1913cac9d5bc2c063e4c484ade0663b401b6d44d283a203c65145f678d28e77

data/app/mailers/pay/user_mailer.rb

@@ -28,6 +28,10 @@ module Pay
       mail mail_arguments
     end
 
+    def payment_failed
+      mail mail_arguments
+    end
+
     private
 
     def mail_arguments

data/app/models/pay/charge.rb

@@ -50,7 +50,7 @@ module Pay
         customer.processor == processor_name
       end
 
-      scope processor_name, -> { where(processor: processor_name) }
+      scope processor_name, -> { joins(:customer).where(pay_customers: {processor: processor_name}) }
     end
 
     delegate :capture, :credit_note!, :credit_notes, to: :payment_processor

data/app/models/pay/customer.rb

@@ -46,7 +46,7 @@ module Pay
     end
 
     def subscription(name: Pay.default_product_name)
-      subscriptions.order(id: :desc).for_name(name).first
+      subscriptions.order(created_at: :desc).for_name(name).first
     end
 
     def subscribed?(name: Pay.default_product_name, processor_plan: nil)
@@ -93,9 +93,10 @@ module Pay
       subscription.trial_ends_at == subscription.ends_at
     end
 
-    # Attempts to pay all past_due subscriptions
-    def retry_past_due_subscriptions!
-      subscriptions.past_due.each(&:retry_failed_payment)
+    # Attempts to pay all past_due subscription invoices to bring them back to active state
+    # Pass in `statuses: []` if you would like to only include specific subscription statuses
+    def retry_past_due_subscriptions!(status: [:past_due])
+      subscriptions.where(status: Array.wrap(status)).each(&:retry_failed_payments)
     end
   end
 end

data/app/models/pay/subscription.rb

@@ -17,6 +17,7 @@ module Pay
     scope :active_or_paused, -> { active.or(paused) }
     scope :incomplete, -> { where(status: :incomplete) }
     scope :past_due, -> { where(status: :past_due) }
+    scope :unpaid, -> { where(status: :unpaid) }
     scope :metered, -> { where(metered: true) }
     scope :with_active_customer, -> { joins(:customer).merge(Customer.active) }
     scope :with_deleted_customer, -> { joins(:customer).merge(Customer.deleted) }
@@ -131,6 +132,10 @@ module Pay
       status == "past_due"
     end
 
+    def unpaid?
+      status == "unpaid"
+    end
+
     def incomplete?
       status == "incomplete"
     end

data/app/views/pay/user_mailer/payment_action_required.html.erb

@@ -1,6 +1,5 @@
 <h3>Extra confirmation is needed to process your payment</h3>
 <p>Your <%= Pay.application_name %> subscription requires confirmation to process your payment to continue access.</p>
-
-<p><%= link_to "Click here to confirm your payment", pay.payment_url(params[:payment_intent_id]) %>. If you have any questions, please hit reply and let us know.</p>
-
+<p><%= link_to "Confirm your payment", pay.payment_url(params[:payment_intent_id]) %></p>
+<p>If you have any questions, please hit reply and let us know.</p>
 <p>— The <%= Pay.application_name %> Team</p>

data/app/views/pay/user_mailer/payment_failed.html.erb

@@ -0,0 +1,5 @@
+<h3>Your payment was declined</h3>
+<p>We were unable to charge your payment method for your <%= Pay.application_name %> subscription. Please update your billing information.</p>
+<p><%= link_to "Update billing information", root_url %></p>
+<p>Let us know if you have any questions.</p>
+<p>— The <%= Pay.application_name %> Team</p>

data/app/views/pay/user_mailer/subscription_renewing.html.erb

@@ -1,6 +1,4 @@
 <h3>Your upcoming <%= Pay.application_name %> subscription renewal</h3>
-<p>This is just a friendly reminder that your <%= link_to Pay.application_name, root_url %> subscription will renew automatically on <%= l params[:date].to_date, format: :long %>.</p>
-
+<p>This is a friendly reminder that your <%= link_to Pay.application_name, root_url %> subscription will renew automatically on <%= l params[:date].to_date, format: :long %>.</p>
 <p>You may <%= link_to "manage your subscription", root_url %> via your account. If you have any questions, please hit reply and let us know.</p>
-
 <p>— The <%= Pay.application_name %> Team</p>

data/app/views/pay/user_mailer/subscription_trial_ended.html.erb

@@ -1,6 +1,4 @@
 <h3>Your <%= Pay.application_name %> trial has ended</h3>
 <p>This is just a friendly reminder that your <%= link_to Pay.application_name, root_url %> trial has ended.</p>
-
 <p>You may <%= link_to "manage your subscription", root_url %> via your account. If you have any questions, please hit reply and let us know.</p>
-
 <p>— The <%= Pay.application_name %> Team</p>

data/app/views/pay/user_mailer/subscription_trial_will_end.html.erb

@@ -1,6 +1,4 @@
 <h3>Your <%= Pay.application_name %> trial is ending soon</h3>
 <p>This is just a friendly reminder that your <%= link_to Pay.application_name, root_url %> trial will be ending soon.</p>
-
 <p>You may <%= link_to "manage your subscription", root_url %> via your account. If you have any questions, please hit reply and let us know.</p>
-
 <p>— The <%= Pay.application_name %> Team</p>

data/config/locales/en.yml

@@ -56,6 +56,8 @@ en:
         subject: "[%{application}] Your upcoming subscription renewal"
       payment_action_required:
         subject: "[%{application}] Confirm your payment"
+      payment_failed:
+        subject: "[%{application}] Action Required – Your payment failed"
       subscription_trial_will_end:
         subject: "[%{application}] Your trial is ending soon"
       subscription_trial_ended:

data/lib/pay/braintree/billable.rb

@@ -174,12 +174,17 @@ module Pay
         attrs[:metadata] = transaction.custom_fields
         attrs[:currency] = transaction.currency_iso_code
         attrs[:application_fee_amount] = transaction.service_fee_amount
+        attrs[:created_at] = transaction.created_at
 
         # Associate charge with subscription if we can
         if transaction.subscription_id
           pay_subscription = pay_customer.subscriptions.find_by(processor_id: transaction.subscription_id)
-          attrs[:subscription] = pay_subscription
-          attrs[:metadata] = pay_subscription.metadata
+          pay_subscription ||= Pay::Braintree::Subscription.sync(transaction.subscription_id)
+
+          if pay_subscription
+            attrs[:subscription] = pay_subscription
+            attrs[:metadata] = pay_subscription.metadata
+          end
         end
 
         charge = pay_customer.charges.find_or_initialize_by(processor_id: transaction.id)

data/lib/pay/braintree/subscription.rb

@@ -28,6 +28,9 @@ module Pay
         pay_customer = Pay::Customer.find_by(processor: :braintree, processor_id: payment_method.customer_id)
         return unless pay_customer
 
+        # Sync the PaymentMethod since we've got it
+        pay_customer.save_payment_method(payment_method, default: payment_method.default?)
+
         attributes = {
           created_at: object.created_at,
           current_period_end: object.billing_period_end_date,

data/lib/pay/stripe/subscription.rb

@@ -301,13 +301,26 @@ module Pay
       end
 
       # Retries the latest invoice for a Past Due subscription and attempts to pay it
-      def retry_failed_payment
-        payment_intent = ::Stripe::PaymentIntent.confirm(subscription.latest_invoice.payment_intent.id)
+      def retry_failed_payment(payment_intent_id: nil)
+        payment_intent_id ||= subscription.latest_invoice.payment_intent.id
+        payment_intent = ::Stripe::PaymentIntent.retrieve({id: payment_intent_id}, stripe_options)
+
+        payment_intent = if payment_intent.status == "requires_payment_method"
+          ::Stripe::PaymentIntent.confirm(payment_intent_id, {payment_method: pay_subscription.customer.default_payment_method.processor_id}, stripe_options)
+        else
+          ::Stripe::PaymentIntent.confirm(payment_intent_id, stripe_options)
+        end
         Pay::Payment.new(payment_intent).validate
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
+      def pay_open_invoices
+        ::Stripe::Invoice.list({subscription: processor_id, status: :open}, stripe_options).auto_paging_each do |invoice|
+          retry_failed_payment(payment_intent_id: invoice.payment_intent)
+        end
+      end
+
       private
 
       # Options for Stripe requests

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

@@ -0,0 +1,24 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentFailed
+        def call(event)
+          # Event is of type "invoice" see:
+          # https://stripe.com/docs/api/invoices/object
+
+          object = event.data.object
+
+          pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, object.subscription)
+          return if pay_subscription.nil?
+
+          if Pay.send_email?(:payment_failed, pay_subscription)
+            Pay.mailer.with(
+              pay_customer: pay_subscription.customer,
+              stripe_invoice: object
+            ).payment_failed.deliver_now
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pay/stripe.rb

@@ -16,6 +16,7 @@ module Pay
       autoload :CustomerDeleted, "pay/stripe/webhooks/customer_deleted"
       autoload :CustomerUpdated, "pay/stripe/webhooks/customer_updated"
       autoload :PaymentActionRequired, "pay/stripe/webhooks/payment_action_required"
+      autoload :PaymentFailed, "pay/stripe/webhooks/payment_failed"
       autoload :PaymentIntentSucceeded, "pay/stripe/webhooks/payment_intent_succeeded"
       autoload :PaymentMethodAttached, "pay/stripe/webhooks/payment_method_attached"
       autoload :PaymentMethodDetached, "pay/stripe/webhooks/payment_method_detached"
@@ -78,6 +79,9 @@ module Pay
         # Payment action is required to process an invoice
         events.subscribe "stripe.invoice.payment_action_required", Pay::Stripe::Webhooks::PaymentActionRequired.new
 
+        # If an invoice payment fails, we want to notify the user via email to update their payment details
+        events.subscribe "stripe.invoice.payment_failed", Pay::Stripe::Webhooks::PaymentFailed.new
+
         # If a subscription is manually created on Stripe, we want to sync
         events.subscribe "stripe.customer.subscription.created", Pay::Stripe::Webhooks::SubscriptionCreated.new
 

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.2.3"
+  VERSION = "6.3.0"
 end

data/lib/pay.rb

@@ -59,6 +59,7 @@ module Pay
   mattr_accessor :emails
   @@emails = ActiveSupport::OrderedOptions.new
   @@emails.payment_action_required = true
+  @@emails.payment_failed = true
   @@emails.receipt = true
   @@emails.refund = true
   # This only applies to Stripe, therefor we supply the second argument of price

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.3.0
 platform: ruby
 authors:
 - Jason Charnes
 - Chris Oliver
+- Collin Jilbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,66 +26,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: standardrb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Stripe, Paddle, and Braintree payments for Ruby on Rails apps
 email:
 - jason@thecharnes.com
 - excid3@gmail.com
+- cjilbert504@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -116,6 +62,7 @@ files:
 - app/views/pay/payments/show.html.erb
 - app/views/pay/stripe/_checkout_button.html.erb
 - app/views/pay/user_mailer/payment_action_required.html.erb
+- app/views/pay/user_mailer/payment_failed.html.erb
 - app/views/pay/user_mailer/receipt.html.erb
 - app/views/pay/user_mailer/refund.html.erb
 - app/views/pay/user_mailer/subscription_renewing.html.erb
@@ -187,6 +134,7 @@ files:
 - lib/pay/stripe/webhooks/customer_deleted.rb
 - lib/pay/stripe/webhooks/customer_updated.rb
 - lib/pay/stripe/webhooks/payment_action_required.rb
+- lib/pay/stripe/webhooks/payment_failed.rb
 - lib/pay/stripe/webhooks/payment_intent_succeeded.rb
 - lib/pay/stripe/webhooks/payment_method_attached.rb
 - lib/pay/stripe/webhooks/payment_method_detached.rb
@@ -220,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails