pay 11.7.2 → 11.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c2ba6d976f257c274ab9d25a84e91e13a8917be7b39100f47e9b33430cee814
-  data.tar.gz: 6a44d98ade15ef41f4a12764db46798f33840d027198db190ae49ef32264fcd8
+  metadata.gz: 0d074d1f459f7129fb3f7e308075e87054d667f177453a89a08f3b243a4a029a
+  data.tar.gz: b6d3340eb343e55a964f925357076b76f751a2e1bae87fa262221682869cb9a7
 SHA512:
-  metadata.gz: 57ff1cc4b2ff4400f6146dc9c0957254fcb918008f48394d28145eff032db91a3a308471f404beaa4512418b911405f7b553061b59ff7649b9bb07285e167558
-  data.tar.gz: 222dd985ce44ab7218077e599670a55b35d4dd8ad0ed77efa907a731e382ec0c4f7931e9f82f7dd9650395e70df927b29da5c8e75b4c9825723be5ebd435c5d8
+  metadata.gz: c5b8ad8fad63c66e64d5c4f03f06dd52b06e981342a1388a8b2ec405dd8438f3ba7cbc1256db54658d8e051e84370fb91806a8b3b916674d532c5ed048d5791f
+  data.tar.gz: cb8f4b0b6ec9450846a947876ac11da6b44d7bab9c595253179df16f50244d76413d491f2fc4ba25248b6101112ba5ba9ef406e1e95c8b6b418c792ed157442e

data/README.md

@@ -50,6 +50,7 @@ Want to add a new payment provider? Contributions are welcome.
   * [Lemon Squeezy](docs/lemon_squeezy/1_overview.md)
   * [Fake Processor](docs/fake_processor/1_overview.md)
   * [Asaas (Community)](https://github.com/PedroAugustoRamalhoDuarte/pay-asaas)
+  * [Square (Community)](https://github.com/Willardgmoore/pay-square)
 * **Marketplaces**
   * [Stripe Connect](docs/marketplaces/stripe_connect.md)
 * **Contributing**

data/app/controllers/pay/payments_controller.rb

@@ -4,8 +4,9 @@ module Pay
 
     before_action :set_redirect_to
 
+    # Intents on a Stripe Connect account are linked with ?stripe_account=acct_123
     def show
-      @payment = Payment.from_id(params[:id])
+      @payment = Payment.from_id(params[:id], stripe_account: params[:stripe_account].presence)
     rescue ::Stripe::StripeError => e
       redirect_to root_path, alert: e.message
     end

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

@@ -27,6 +27,9 @@ module Pay
           return
         end
 
+        # Requests for the rest of the sync should go to the same Stripe Connect account as the customer
+        stripe_account ||= pay_customer.stripe_account
+
         payment_method = object.payment_method_details.try(object.payment_method_details.type)
         attrs = {
           object: object.to_hash,
@@ -42,7 +45,7 @@ module Pay
           last4: payment_method.try(:last4).to_s,
           metadata: object.metadata,
           payment_method_type: object.payment_method_details.type,
-          stripe_account: pay_customer.stripe_account,
+          stripe_account: stripe_account,
           stripe_receipt_url: object.receipt_url
         }
 
@@ -72,7 +75,7 @@ module Pay
           raise
         else
           try += 1
-          sleep 0.15**try
+          sleep 0.15 * try
           retry
         end
       end
@@ -124,7 +127,7 @@ module Pay
         raise Pay::Stripe::Error, "no payment_intent on charge" unless payment_intent.present?
         payment_intent_id = payment_intent.is_a?(::Stripe::PaymentIntent) ? payment_intent.id : payment_intent
         ::Stripe::PaymentIntent.capture(payment_intent_id, options, stripe_options)
-        self.class.sync(processor_id)
+        self.class.sync(processor_id, stripe_account: stripe_account)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -144,6 +147,10 @@ module Pay
         ::Stripe::Charge.construct_from(object)
       end
 
+      def sync!(**options)
+        super(**options.with_defaults(stripe_account: stripe_account))
+      end
+
       private
 
       # Options for Stripe requests

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

@@ -50,7 +50,7 @@ module Pay
         Pay::Payment.new(payment_intent).validate
 
         charge = payment_intent.latest_charge
-        Pay::Stripe::Charge.sync(charge.id, object: charge)
+        Pay::Stripe::Charge.sync(charge.id, object: charge, stripe_account: stripe_account)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -73,7 +73,7 @@ module Pay
         # No trial, payment method requires SCA
         if options[:payment_behavior].to_s != "default_incomplete" && subscription.incomplete?
           payment_intent_id = stripe_sub.latest_invoice.payments.first.payment.payment_intent
-          Pay::Payment.from_id(payment_intent_id).validate
+          Pay::Payment.from_id(payment_intent_id, stripe_account: stripe_account).validate
         end
 
         subscription
@@ -151,7 +151,7 @@ module Pay
       def sync_subscriptions(**options)
         subscriptions = ::Stripe::Subscription.list(options.with_defaults(customer: processor_id), stripe_options)
         subscriptions.map do |subscription|
-          Pay::Stripe::Subscription.sync(subscription.id)
+          Pay::Stripe::Subscription.sync(subscription.id, stripe_account: stripe_account)
         end
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
@@ -251,7 +251,7 @@ module Pay
         ::Stripe::Billing::MeterEvent.create({
           event_name: event_name,
           payload: {stripe_customer_id: processor_id}.merge(payload)
-        }.merge(options))
+        }.merge(options), stripe_options)
       end
 
       private

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

@@ -28,7 +28,7 @@ module Pay
 
       # A single-use login link for Express accounts to access their Stripe dashboard
       def login_link(**options)
-        ::Stripe::Account.create_login_link(processor_id)
+        ::Stripe::Account.create_login_link(processor_id, options)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end

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

@@ -6,7 +6,7 @@ module Pay
         payment_intent = ::Stripe::PaymentIntent.retrieve({id: id, expand: ["payment_method"]}, {stripe_account: stripe_account}.compact)
         payment_method = payment_intent.payment_method
         return unless payment_method
-        Pay::Stripe::PaymentMethod.sync(payment_method.id, object: payment_method)
+        Pay::Stripe::PaymentMethod.sync(payment_method.id, object: payment_method, stripe_account: stripe_account)
       end
 
       # Syncs a SetupIntent's payment method to the database
@@ -14,7 +14,7 @@ module Pay
         setup_intent = ::Stripe::SetupIntent.retrieve({id: id, expand: ["payment_method"]}, {stripe_account: stripe_account}.compact)
         payment_method = setup_intent.payment_method
         return unless payment_method
-        Pay::Stripe::PaymentMethod.sync(payment_method.id, object: payment_method)
+        Pay::Stripe::PaymentMethod.sync(payment_method.id, object: payment_method, stripe_account: stripe_account)
       end
 
       # Syncs PaymentMethod objects from Stripe
@@ -31,6 +31,9 @@ module Pay
           return
         end
 
+        # Record the same Stripe Connect account as the customer when one wasn't given
+        stripe_account ||= pay_customer.stripe_account
+
         default_payment_method_id = pay_customer.api_record.invoice_settings&.default_payment_method
         default = (id == default_payment_method_id)
 
@@ -45,7 +48,7 @@ module Pay
           raise
         else
           try += 1
-          sleep 0.15**try
+          sleep 0.15 * try
           retry
         end
       end

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

@@ -5,7 +5,7 @@ module Pay
 
       def self.sync_from_checkout_session(session_id, stripe_account: nil)
         checkout_session = ::Stripe::Checkout::Session.retrieve({id: session_id}, {stripe_account: stripe_account}.compact)
-        sync(checkout_session.subscription)
+        sync(checkout_session.subscription, stripe_account: stripe_account)
       end
 
       def self.sync(subscription_id, object: nil, name: nil, stripe_account: nil, try: 0, retries: 1)
@@ -22,6 +22,9 @@ module Pay
           return
         end
 
+        # Requests for the rest of the sync should go to the same Stripe Connect account as the customer
+        stripe_account ||= pay_customer.stripe_account
+
         attributes = {
           object: object.to_hash,
           application_fee_percent: object.application_fee_percent,
@@ -29,7 +32,7 @@ module Pay
           processor_plan: object.items.first.price.id,
           quantity: object.items.first.try(:quantity) || 0,
           status: object.status,
-          stripe_account: pay_customer.stripe_account,
+          stripe_account: stripe_account,
           metadata: object.metadata,
           metered: false,
           pause_behavior: object.pause_collection&.behavior,
@@ -70,10 +73,10 @@ module Pay
         # Sync payment method if directly attached to subscription
         if object.default_payment_method
           if object.default_payment_method.is_a? String
-            Pay::Stripe::PaymentMethod.sync(object.default_payment_method)
+            Pay::Stripe::PaymentMethod.sync(object.default_payment_method, stripe_account: stripe_account)
             attributes[:payment_method_id] = object.default_payment_method
           else
-            Pay::Stripe::PaymentMethod.sync(object.default_payment_method.id, object: object.default_payment_method)
+            Pay::Stripe::PaymentMethod.sync(object.default_payment_method.id, object: object.default_payment_method, stripe_account: stripe_account)
             attributes[:payment_method_id] = object.default_payment_method.id
           end
         end
@@ -106,9 +109,9 @@ module Pay
 
             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)
+              Pay::Stripe::Charge.sync_payment_intent(invoice_payment.payment.payment_intent, stripe_account: stripe_account)
             when "charge"
-              Pay::Stripe::Charge.sync(invoice_payment.payment.charge, stripe_account: pay_subscription.stripe_account)
+              Pay::Stripe::Charge.sync(invoice_payment.payment.charge, stripe_account: stripe_account)
             end
           end
         end
@@ -144,6 +147,10 @@ module Pay
         ::Stripe::Subscription.construct_from(object)
       end
 
+      def sync!(**options)
+        super(**options.with_defaults(stripe_account: stripe_account))
+      end
+
       def api_record(**options)
         @api_record ||= ::Stripe::Subscription.retrieve(options.with_defaults(id: processor_id).merge(expand_options), {stripe_account: stripe_account}.compact)
       end
@@ -198,16 +205,12 @@ module Pay
 
       # This updates a SubscriptionItem's quantity in Stripe
       #
-      # For a subscription with a single item, we can update the subscription directly if no SubscriptionItem ID is available
-      # Otherwise a SubscriptionItem ID is required so Stripe knows which entry to update
+      # Defaults to the first SubscriptionItem. Pass subscription_item_id: to update a different one
+      # (Stripe no longer accepts a top-level quantity on the subscription itself)
       def change_quantity(quantity, **options)
-        subscription_item_id = options.delete(:subscription_item_id) || subscription_items&.first&.id
-        if subscription_item_id
-          ::Stripe::SubscriptionItem.update(subscription_item_id, options.merge(quantity: quantity), stripe_options)
-          @api_record = nil
-        else
-          @api_record = ::Stripe::Subscription.update(processor_id, options.merge(quantity: quantity).merge(expand_options), stripe_options)
-        end
+        subscription_item_id = options.delete(:subscription_item_id) || subscription_items.first.id
+        ::Stripe::SubscriptionItem.update(subscription_item_id, options.merge(quantity: quantity), stripe_options)
+        @api_record = nil
         update(quantity: quantity)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
@@ -285,7 +288,7 @@ module Pay
           }.merge(expand_options),
             stripe_options)
         end
-        update(ends_at: nil, status: :active)
+        update(ends_at: nil, status: @api_record.status)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -309,7 +312,7 @@ module Pay
 
         # Validate that swap was successful and handle SCA if needed
         if (payment_intent_id = @api_record.latest_invoice.payments.first&.payment&.payment_intent)
-          Pay::Payment.from_id(payment_intent_id).validate
+          Pay::Payment.from_id(payment_intent_id, stripe_account: stripe_account).validate
         end
 
         sync!(object: @api_record)
@@ -338,7 +341,10 @@ module Pay
         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: customer.default_payment_method.processor_id}, stripe_options)
+          payment_method = customer.default_payment_method
+          raise Pay::Stripe::Error, "no default payment method to retry the payment with" if payment_method.nil?
+
+          ::Stripe::PaymentIntent.confirm(payment_intent_id, {payment_method: payment_method.processor_id}, stripe_options)
         else
           ::Stripe::PaymentIntent.confirm(payment_intent_id, stripe_options)
         end
@@ -348,14 +354,21 @@ module Pay
       end
 
       # Looks up open invoices for a subscription and attempts to pay them
+      #
+      # Invoices no longer expose a `payment_intent` directly, so the PaymentIntent is looked up through the invoice's payments
       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)
+        ::Stripe::Invoice.list({subscription: processor_id, status: :open, expand: ["data.payments"]}, stripe_options).auto_paging_each do |invoice|
+          payment_intent_id = invoice.payments.first&.payment&.payment_intent
+          retry_failed_payment(payment_intent_id: payment_intent_id) if payment_intent_id
         end
       end
 
+      # Returns the Stripe::PaymentIntent for the latest invoice, if there is one
       def latest_payment
-        api_record(expand: ["latest_invoice.payment_intent"]).latest_invoice.payment_intent
+        payment_intent_id = api_record.latest_invoice&.payments&.first&.payment&.payment_intent
+        ::Stripe::PaymentIntent.retrieve({id: payment_intent_id}, stripe_options) if payment_intent_id
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
       end
 
       private

data/app/views/pay/payments/show.html.erb

@@ -64,7 +64,7 @@
 </div>
 
 <script type="module">
-  window.stripe = Stripe('<%= Pay::Stripe.public_key %>')
+  window.stripe = Stripe('<%= Pay::Stripe.public_key %>', <%= {stripeAccount: @payment.stripe_account}.compact.to_json.html_safe %>)
 
   import { Application, Controller } from 'https://unpkg.com/@hotwired/stimulus/dist/stimulus.js'
   const application = Application.start()

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

@@ -1,5 +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 "Confirm your payment", pay.payment_url(params[:payment_intent_id]) %></p>
+<p><%= link_to "Confirm your payment", pay.payment_url(params[:payment_intent_id], stripe_account: params[:stripe_account]) %></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_action_required.text.erb

@@ -2,7 +2,7 @@ Extra confirmation is needed to process your payment
 
 Your <%= Pay.application_name %> subscription requires confirmation to process your payment to continue access.
 
-Confirm your payment: <%= pay.payment_url(params[:payment_intent_id]) %>
+Confirm your payment: <%= pay.payment_url(params[:payment_intent_id], stripe_account: params[:stripe_account]) %>
 
 If you have any questions, please hit reply and let us know.
 

data/lib/pay/payment.rb

@@ -1,16 +1,20 @@
 module Pay
   class Payment
-    attr_reader :intent
+    # The Stripe Connect account the intent lives on, if any. Needed to look the intent up again
+    # and to initialize Stripe.js on the SCA confirmation page.
+    attr_reader :intent, :stripe_account
 
     delegate :id, :amount, :client_secret, :currency, :customer, :status, :confirm, to: :intent
 
-    def self.from_id(id)
-      intent = id.start_with?("seti_") ? ::Stripe::SetupIntent.retrieve(id) : ::Stripe::PaymentIntent.retrieve(id)
-      new(intent)
+    def self.from_id(id, stripe_account: nil)
+      options = {stripe_account: stripe_account}.compact
+      intent = id.start_with?("seti_") ? ::Stripe::SetupIntent.retrieve(id, options) : ::Stripe::PaymentIntent.retrieve(id, options)
+      new(intent, stripe_account: stripe_account)
     end
 
-    def initialize(intent)
+    def initialize(intent, stripe_account: nil)
       @intent = intent
+      @stripe_account = stripe_account
     end
 
     def requires_payment_method?

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

@@ -3,7 +3,7 @@ module Pay
     module Webhooks
       class CheckoutSessionCompleted
         def call(event)
-          locate_owner(event.data.object)
+          locate_owner(event.data.object, stripe_account: event.try(:account))
 
           # By the time CheckoutSessionCompleted is fired, we probably missed the original events
           # Instead, we can sync the payment intent or subscription during this event to ensure they're in the database
@@ -18,11 +18,15 @@ module Pay
           end
         end
 
-        def locate_owner(object)
-          return if object.client_reference_id.nil?
+        # Associates the Stripe customer from the session with the record referenced by client_reference_id
+        #
+        # Sessions in payment or setup mode don't always create a Stripe customer (for example Payment Links with
+        # customer_creation: if_required), so skip those rather than clearing an existing processor_id
+        def locate_owner(object, stripe_account: nil)
+          return if object.client_reference_id.nil? || object.customer.nil?
 
           owner = Pay::Stripe.find_by_client_reference_id(object.client_reference_id)
-          owner&.add_payment_processor(:stripe, processor_id: object.customer)
+          owner&.add_payment_processor(:stripe, processor_id: object.customer, stripe_account: stripe_account)
         end
       end
     end

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

@@ -19,10 +19,13 @@ module Pay
           return unless subscription
 
           # Grab the local latest_invoice from the subscription stripe_object
+          # It may be an expanded object, a bare ID, or nil for a subscription that hasn't been invoiced yet
           latest_invoice = subscription.stripe_object.try(:latest_invoice)
+          latest_invoice_id = latest_invoice.try(:id) || latest_invoice
+          return if latest_invoice_id.blank?
 
           # Compare the local invoice id to the event invoice id and sync if they are the same
-          if latest_invoice.id.to_s == invoice.id.to_s
+          if latest_invoice_id.to_s == invoice.id.to_s
             Pay::Stripe::Subscription.sync(subscription_id, stripe_account: event.try(:account))
           end
         rescue ::Stripe::StripeError => e

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

@@ -13,13 +13,14 @@ module Pay
           pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, subscription_id)
           return if pay_subscription.nil? || pay_subscription.status == "incomplete"
 
-          invoice_payment = ::Stripe::InvoicePayment.list({invoice: invoice.id, status: :open}).first
+          invoice_payment = ::Stripe::InvoicePayment.list({invoice: invoice.id, status: :open}, {stripe_account: event.try(:account)}.compact).first
 
           if invoice_payment && Pay.send_email?(:payment_action_required, pay_subscription)
             Pay.mailer.with(
               pay_customer: pay_subscription.customer,
               pay_subscription: pay_subscription,
-              payment_intent_id: invoice_payment.payment.payment_intent
+              payment_intent_id: invoice_payment.payment.payment_intent,
+              stripe_account: event.try(:account)
             ).payment_action_required.deliver_later
           end
         end

data/lib/pay/stripe.rb

@@ -180,7 +180,7 @@ module Pay
         raise
       else
         try += 1
-        sleep 0.15**try
+        sleep 0.15 * try
         retry
       end
     end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.7.2"
+  VERSION = "11.8.0"
 end

metadata

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