pay 8.2.2 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fabadba6082c91114d763242a738a19dab355dde46f6079a4ae474b9ba64c538
-  data.tar.gz: 4348766c53d5630613dacf04a61d1f49714076f91de1e0594625cf088072b61f
+  metadata.gz: 6e2755f5ff01aedf32875c2ee941d4e92efe0c044ed7b6eeb601e6d0e17d1d51
+  data.tar.gz: ec10df5f7c8a4d52a55f8fc533fe42bc33a773dc226a348dfee0b80be37c1536
 SHA512:
-  metadata.gz: 8886673e5e4a1ee8d478c9214861e1b8ba2032d3f54b50664ece5cebd7d1545ef8945f167d87455ffaf739a6b758b016d297069889bb7b47efaf47028928e09a
-  data.tar.gz: b91bd40b0de1d41b191faa0f2fccacb3de48fc2b3fa83698df75897b93de065b11a132d9958e1f31572d2cf4c57e372aa2d7033844226c5f71eeef8dfe49f68e
+  metadata.gz: bbd81b0e97724c907bb691dc7576b9e458d467064219311feb2e6a0628c31e02b835f99e83daa92a5718f6189859daaa92851d32fe7395d5b2e140815cbe7d59
+  data.tar.gz: 5f143cde69bdc489d423aa7619770b5d1256303a890ea350e2c40090f29af4c4baea39094a9e2e7c854e80ee12ea3d0c360ded743f15b5432fa5881807fa7074

data/README.md

@@ -2,13 +2,14 @@
 
 # 💳 Pay - Payments engine for Ruby on Rails
 
-[![Build Status](https://github.com/pay-rails/pay/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/pay.svg)](https://badge.fury.io/rb/pay)
-
-<img src="docs/images/stripe_partner_badge.svg" height="26px">
+[![Build Status](https://github.com/pay-rails/pay/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/pay.svg)](https://badge.fury.io/rb/pay) <img src="docs/images/stripe_partner_badge.svg" height="26px">
 
 Pay is a payments engine for Ruby on Rails 6.0 and higher.
 
-⚠️  **Upgrading?** Check the [UPGRADE](UPGRADE.md) guide for required changes and/or migration when upgrading from a previous version of Pay.
+> [!TIP]
+> Check out [Jumpstart](https://jumpstartrails.com) for Rails Starter Kit with Pay already integrated!
+
+**Upgrading?** Check the [UPGRADE](UPGRADE.md) guide for required changes and/or migration when upgrading from a previous version of Pay.
 
 ## 🧑‍💻 Tutorial
 
@@ -48,6 +49,7 @@ Want to add a new payment provider? Contributions are welcome.
   * [Paddle](docs/paddle_billing/1_overview.md)
   * [Lemon Squeezy](docs/lemon_squeezy/1_overview.md)
   * [Fake Processor](docs/fake_processor/1_overview.md)
+  * [Asaas (Community)](https://github.com/PedroAugustoRamalhoDuarte/pay-asaas)
 * **Marketplaces**
   * [Stripe Connect](docs/marketplaces/stripe_connect.md)
 * **Contributing**

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

@@ -147,7 +147,7 @@ module Pay
           end
         end
 
-        charge = charges.find_or_initialize_by(processor_id: transaction.id)
+        charge = Pay::Braintree::Charge.find_or_initialize_by(customer: self, processor_id: transaction.id)
         charge.update!(attrs)
         charge
       end

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

@@ -4,7 +4,7 @@ module Pay
       def self.sync(id, object: nil, try: 0, retries: 1)
         object ||= Pay.braintree_gateway.payment_method.find(id)
 
-        pay_customer = Pay::Customer.find_by(processor: :braintree, processor_id: object.customer_id)
+        pay_customer = Pay::Braintree::Customer.find_by(processor_id: object.customer_id)
         return unless pay_customer
 
         pay_customer.save_payment_method(object, default: object.default?)

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

@@ -31,15 +31,12 @@ module Pay
           attributes[:ends_at] = object.paid_through_date.end_of_day
         end
 
-        pay_subscription = pay_customer.subscriptions.find_by(processor_id: object.id)
-        if pay_subscription
+        if (pay_subscription = find_by(customer: pay_customer, processor_id: object.id))
           pay_subscription.with_lock { pay_subscription.update!(attributes) }
         else
           name ||= Pay.default_product_name
-          pay_subscription = pay_customer.subscriptions.create!(attributes.merge(name: name, processor_id: object.id))
+          create!(attributes.merge(customer: pay_customer, name: name, processor_id: object.id))
         end
-
-        pay_subscription
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
         try += 1
         if try <= retries

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

@@ -1,11 +1,15 @@
 module Pay
   module FakeProcessor
     class Subscription < Pay::Subscription
+      def self.sync(processor_id, **options)
+        # Bypass sync operation for FakeProcessor
+      end
+
       def api_record(**options)
         self
       end
 
-      # With trial, sets end to trial end (mimicing Stripe)
+      # With trial, sets end to trial end (mimicking Stripe)
       # Without trial, sets can ends_at to end of month
       def cancel(**options)
         return if canceled?

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

@@ -22,13 +22,11 @@ module Pay
         }
 
         # Update or create the charge
-        if (pay_charge = pay_customer.charges.find_by(processor_id: processor_id))
-          pay_charge.with_lock do
-            pay_charge.update!(attributes)
-          end
+        if (pay_charge = find_by(customer: pay_customer, processor_id: processor_id))
+          pay_charge.with_lock { pay_charge.update!(attributes) }
           pay_charge
         else
-          pay_customer.charges.create!(attributes.merge(processor_id: processor_id))
+          create!(attributes.merge(customer: pay_customer, processor_id: processor_id))
         end
       end
 

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

@@ -33,13 +33,11 @@ module Pay
         end
 
         # Update or create the subscription
-        if (pay_subscription = pay_customer.subscriptions.find_by(processor_id: object.id))
-          pay_subscription.with_lock do
-            pay_subscription.update!(attributes)
-          end
+        if (pay_subscription = find_by(customer: pay_customer, processor_id: object.id))
+          pay_subscription.with_lock { pay_subscription.update!(attributes) }
           pay_subscription
         else
-          pay_customer.subscriptions.create!(attributes.merge(name: name, processor_id: object.id))
+          create!(attributes.merge(customer: pay_customer, name: name, processor_id: object.id))
         end
       end
 

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

@@ -48,13 +48,11 @@ module Pay
         end
 
         # Update or create the charge
-        if (pay_charge = pay_customer.charges.find_by(processor_id: object.id))
-          pay_charge.with_lock do
-            pay_charge.update!(attrs)
-          end
+        if (pay_charge = find_by(customer: pay_customer, processor_id: object.id))
+          pay_charge.with_lock { pay_charge.update!(attrs) }
           pay_charge
         else
-          pay_customer.charges.create!(attrs.merge(processor_id: object.id))
+          create!(attrs.merge(customer: pay_customer, processor_id: object.id))
         end
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
         try += 1

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

@@ -54,13 +54,11 @@ module Pay
         end
 
         # Update or create the subscription
-        if (pay_subscription = pay_customer.subscriptions.find_by(processor_id: subscription_id))
-          pay_subscription.with_lock do
-            pay_subscription.update!(attributes)
-          end
+        if (pay_subscription = find_by(customer: pay_customer, processor_id: subscription_id))
+          pay_subscription.with_lock { pay_subscription.update!(attributes) }
           pay_subscription
         else
-          pay_customer.subscriptions.create!(attributes.merge(name: name, processor_id: subscription_id))
+          create!(attributes.merge(customer: pay_customer, name: name, processor_id: subscription_id))
         end
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
         try += 1

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

@@ -5,7 +5,7 @@ module Pay
 
       def self.sync(charge_id, object: nil, stripe_account: nil, try: 0, retries: 1)
         # Skip loading the latest charge details from the API if we already have it
-        object ||= ::Stripe::Charge.retrieve({id: charge_id, expand: ["invoice.total_discount_amounts.discount", "invoice.total_tax_amounts.tax_rate", "refunds"]}, {stripe_account: stripe_account}.compact)
+        object ||= ::Stripe::Charge.retrieve({id: charge_id, expand: ["balance_transaction", "invoice.total_discount_amounts.discount", "invoice.total_tax_amounts.tax_rate", "refunds"]}, {stripe_account: stripe_account}.compact)
         if object.customer.blank?
           Rails.logger.debug "Stripe Charge #{object.id} does not have a customer"
           return
@@ -81,13 +81,11 @@ module Pay
         end
 
         # Update or create the charge
-        if (pay_charge = pay_customer.charges.find_by(processor_id: object.id))
-          pay_charge.with_lock do
-            pay_charge.update!(attrs)
-          end
+        if (pay_charge = find_by(customer: pay_customer, processor_id: object.id))
+          pay_charge.with_lock { pay_charge.update!(attrs) }
           pay_charge
         else
-          pay_customer.charges.create!(attrs.merge(processor_id: object.id))
+          create!(attrs.merge(customer: pay_customer, processor_id: object.id))
         end
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
         try += 1

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

@@ -2,15 +2,7 @@ module Pay
   module Stripe
     class Merchant < Pay::Merchant
       def create_account(**options)
-        defaults = {
-          type: "express",
-          capabilities: {
-            card_payments: {requested: true},
-            transfers: {requested: true}
-          }
-        }
-
-        stripe_account = ::Stripe::Account.create(defaults.merge(options))
+        stripe_account = ::Stripe::Account.create(options)
         update(processor_id: stripe_account.id)
         stripe_account
       rescue ::Stripe::StripeError => e

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

@@ -36,8 +36,8 @@ module Pay
 
         attributes = extract_attributes(object).merge(default: default, stripe_account: stripe_account)
 
-        pay_customer.payment_methods.update_all(default: false) if default
-        pay_payment_method = pay_customer.payment_methods.where(processor_id: object.id).first_or_initialize
+        where(customer: pay_customer).update_all(default: false) if default
+        pay_payment_method = where(customer: pay_customer, processor_id: object.id).first_or_initialize
         pay_payment_method.update!(attributes)
         pay_payment_method
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique

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

@@ -81,7 +81,7 @@ module Pay
         end
 
         # Update or create the subscription
-        pay_subscription = pay_customer.subscriptions.find_by(processor_id: object.id)
+        pay_subscription = find_by(customer: pay_customer, processor_id: object.id)
         if pay_subscription
           # If pause behavior is changing to `void`, record the pause start date
           # Any other pause status (or no pause at all) should have nil for start
@@ -95,7 +95,7 @@ module Pay
         else
           # Allow setting the subscription name in metadata, otherwise use the default
           name ||= object.metadata["pay_name"] || Pay.default_product_name
-          pay_subscription = pay_customer.subscriptions.create!(attributes.merge(name: name, processor_id: object.id))
+          pay_subscription = create!(attributes.merge(customer: pay_customer, name: name, processor_id: object.id))
         end
 
         # Cache the Stripe subscription on the Pay::Subscription that we return

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

@@ -8,8 +8,9 @@ module Pay
 
           object = event.data.object
 
+          # 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)
-          return if pay_subscription.nil?
+          return if pay_subscription.nil? || pay_subscription.status == "incomplete"
 
           if Pay.send_email?(:payment_action_required, pay_subscription)
             Pay.mailer.with(

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

@@ -8,8 +8,9 @@ module Pay
 
           object = event.data.object
 
+          # 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)
-          return if pay_subscription.nil?
+          return if pay_subscription.nil? || pay_subscription.status == "incomplete"
 
           if Pay.send_email?(:payment_failed, pay_subscription)
             Pay.mailer.with(

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

@@ -14,11 +14,13 @@ module Pay
           # Stripe subscription items all have the same interval
           price = event.data.object.lines.data.first.price
 
-          if Pay.send_email?(:subscription_renewing, pay_subscription, 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)
             Pay.mailer.with(
               pay_customer: pay_subscription.customer,
               pay_subscription: pay_subscription,
-              date: Time.zone.at(event.data.object.next_payment_attempt)
+              date: Time.zone.at(next_payment_attempt)
             ).subscription_renewing.deliver_later
           end
         end

data/lib/pay/stripe.rb

@@ -65,7 +65,7 @@ module Pay
 
     def self.webhook_receive_test_events
       value = find_value_by_name(:stripe, :webhook_receive_test_events)
-      value.blank? ? true : ActiveModel::Type::Boolean.new.cast(value)
+      value.blank? || ActiveModel::Type::Boolean.new.cast(value)
     end
 
     def self.configure_webhooks

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "8.2.2"
+  VERSION = "9.0.0"
 end

data/lib/pay.rb

@@ -132,13 +132,20 @@ module Pay
     end
   end
 
+  SYNC_HANDLERS = {
+    lemon_squeezy_order_id: ->(param) { Pay::LemonSqueezy.sync_order(param) },
+    paddle_billing_transaction_id: ->(param) { Pay::PaddleBilling.sync_transaction(param) },
+    stripe_checkout_session_id: ->(param) { Pay::Stripe.sync_checkout_session(param) },
+    transaction_id: ->(param) { Pay::PaddleBilling.sync_transaction(param) },
+    session_id: ->(param) { Pay::Stripe.sync_checkout_session(param) }
+  }
+
   def self.sync(params)
-    if (session_id = params[:stripe_checkout_session_id] || params[:session_id])
-      Pay::Stripe.sync_checkout_session(session_id)
-    elsif (transaction_id = params[:paddle_billing_transaction_id] || params[:transaction_id])
-      Pay::PaddleBilling.sync_transaction(transaction_id)
-    elsif (order_id = params[:lemon_squeezy_order_id])
-      Pay::LemonSqueezy.sync_order(order_id)
+    SYNC_HANDLERS.each do |param_name, handler|
+      if (param = params[param_name])
+        return handler.call(param)
+      end
     end
+    nil
   end
 end

data/lib/tasks/pay.rake

@@ -15,10 +15,10 @@ def sync_default_payment_method(pay_customer, retries: 2)
     puts "Syncing Pay::Customer ##{pay_customer.id} attempt #{try + 1}: #{pay_customer.processor.titleize} #{pay_customer.processor_id}"
     case pay_customer.processor
     when "braintree"
-      payment_method = pay_customer.customer.payment_methods.find(&:default?)
+      payment_method = pay_customer.api_record.payment_methods.find(&:default?)
       Pay::Braintree::PaymentMethod.sync(payment_method.token, object: payment_method) if payment_method
     when "stripe"
-      payment_method_id = pay_customer.customer.invoice_settings.default_payment_method
+      payment_method_id = pay_customer.api_record.invoice_settings.default_payment_method
       Pay::Stripe::PaymentMethod.sync(payment_method_id) if payment_method_id
     when "paddle_classic"
       Pay::PaddleClassic::PaymentMethod.sync(pay_customer: pay_customer)

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 8.2.2
+  version: 9.0.0
 platform: ruby
-original_platform: ''
 authors:
 - Jason Charnes
 - Chris Oliver
 - Collin Jilbert
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Payments engine for Ruby on Rails
 test_files: []