pay 2.6.10 → 2.7.2

data/lib/generators/active_record/templates/billable_migration.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddPayBillableTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
+  def change
+    change_table :<%= table_name %>, bulk: true do |t|
+      t.string :processor
+      t.string :processor_id
+      t.public_send(Pay::Adapter.json_column_type, :pay_data)
+      t.datetime :trial_ends_at
+      t.string :card_type
+      t.string :card_last4
+      t.string :card_exp_month
+      t.string :card_exp_year
+      t.text :extra_billing_info
+    end
+  end
+end

data/lib/generators/active_record/templates/merchant_migration.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddPayMerchantTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_column table_name, :merchant_processor, :string
+
+    # We may already have the pay_data column if a Pay::Billable object is also a Pay::Merchant
+    unless ActiveRecord::Base.connection.column_exists?(table_name, :pay_data)
+      add_column :<%= table_name %>, :pay_data, Pay::Adapter.json_column_type
+    end
+  end
+end

data/lib/generators/pay/{pay_generator.rb → billable_generator.rb}

@@ -4,13 +4,12 @@ require "rails/generators/named_base"
 
 module Pay
   module Generators
-    class PayGenerator < Rails::Generators::NamedBase
+    class BillableGenerator < Rails::Generators::NamedBase
       include Rails::Generators::ResourceHelpers
 
-      namespace "pay"
       source_root File.expand_path("../templates", __FILE__)
 
-      desc "Generates a migration to add Billable fields to a model."
+      desc "Generates a migration to add Pay::Billable fields to a model."
 
       hook_for :orm
     end

data/lib/generators/pay/merchant_generator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "rails/generators/named_base"
+
+module Pay
+  module Generators
+    class MerchantGenerator < Rails::Generators::NamedBase
+      include Rails::Generators::ResourceHelpers
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      desc "Generates a migration to add Pay::Merchant fields to a model."
+
+      hook_for :orm
+    end
+  end
+end

data/lib/generators/pay/orm_helpers.rb

@@ -3,12 +3,6 @@
 module Pay
   module Generators
     module OrmHelpers
-      def model_contents
-        <<-CONTENT
-  include Pay::Billable
-        CONTENT
-      end
-
       private
 
       def model_exists?
@@ -30,6 +24,16 @@ module Pay
       def model_path
         @model_path ||= File.join("app", "models", "#{file_path}.rb")
       end
+
+      def migration_version
+        if rails5_and_up?
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
+
+      def rails5_and_up?
+        Rails::VERSION::MAJOR >= 5
+      end
     end
   end
 end

data/lib/pay.rb

@@ -1,10 +1,12 @@
 require "pay/version"
 require "pay/engine"
 require "pay/errors"
+require "pay/adapter"
 
 module Pay
   autoload :Billable, "pay/billable"
   autoload :Env, "pay/env"
+  autoload :Merchant, "pay/merchant"
   autoload :Payment, "pay/payment"
   autoload :Receipts, "pay/receipts"
 
@@ -66,6 +68,26 @@ module Pay
     Pay::Billable.includers
   end
 
+  def self.merchant_models
+    Pay::Merchant.includers
+  end
+
+  def self.find_merchant(account_key, account_value)
+    merchant_models.each do |model|
+      case Pay::Adapter.current_adapter
+      when "postgresql"
+        return model.find_by("pay_data @> ?", {account_key.to_sym => account_value}.to_json)
+      when "mysql2"
+        return model.find_by("JSON_CONTAINS(pay_data, ?)", {account_key.to_sym => account_value}.to_json)
+      when "sqlite3"
+        return model.find_by("json_extract(pay_data, ?) =?", "$.#{account_key}", account_value)
+      else
+        model.find_by(pay_data: {account_key.to_sym => account_value})
+      end
+    end
+    nil
+  end
+
   def self.find_billable(processor:, processor_id:)
     billable_models.each do |model|
       if (record = model.find_by(processor: processor, processor_id: processor_id))

data/lib/pay/adapter.rb

@@ -0,0 +1,22 @@
+module Pay
+  module Adapter
+    extend ActiveSupport::Concern
+
+    def self.current_adapter
+      if ActiveRecord::Base.respond_to?(:connection_db_config)
+        ActiveRecord::Base.connection_db_config.adapter
+      else
+        ActiveRecord::Base.connection_config[:adapter]
+      end
+    end
+
+    def self.json_column_type
+      case current_adapter
+      when "postgresql"
+        :jsonb
+      else
+        :json
+      end
+    end
+  end
+end

data/lib/pay/billable.rb

@@ -26,6 +26,10 @@ module Pay
       attribute :card_token, :string
       attribute :pay_fake_processor_allowed, :boolean, default: false
 
+      # Account(s) for marketplace payments
+      store_accessor :pay_data, :stripe_account
+      store_accessor :pay_data, :braintree_account
+
       validate :pay_fake_processor_is_allowed, if: :processor_changed?
     end
 

data/lib/pay/braintree/billable.rb

@@ -151,9 +151,16 @@ module Pay
         attrs = card_details_for_braintree_transaction(transaction)
         attrs[:amount] = transaction.amount.to_f * 100
 
+        # Associate charge with subscription if we can
+        if transaction.subscription_id
+          attrs[:subscription] = Pay::Subscription.find_by(processor: :braintree, processor_id: transaction.subscription_id)
+        end
+
         charge = billable.charges.find_or_initialize_by(
           processor: :braintree,
-          processor_id: transaction.id
+          processor_id: transaction.id,
+          currency: transaction.currency_iso_code,
+          application_fee_amount: transaction.service_fee_amount
         )
         charge.update(attrs)
         charge

data/lib/pay/braintree/subscription.rb

@@ -23,6 +23,10 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
+      def subscription(**options)
+        gateway.subscription.find(processor_id)
+      end
+
       def cancel
         subscription = processor_subscription
 
@@ -88,6 +92,8 @@ module Pay
       end
 
       def swap(plan)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         if on_grace_period? && processor_plan == plan
           resume
           return

data/lib/pay/env.rb

@@ -17,6 +17,14 @@ module Pay
         secrets&.dig(env, scope, name) ||
         credentials&.dig(scope, name) ||
         secrets&.dig(scope, name)
+    rescue ActiveSupport::MessageEncryptor::InvalidMessage
+      Rails.logger.error <<~MESSAGE
+        Rails was unable to decrypt credentials. Pay checks the Rails credentials to look for API keys for payment processors.
+
+        Make sure to set the `RAILS_MASTER_KEY` env variable or in the .key file. To learn more, run "bin/rails credentials:help"
+
+        If you're not using Rails credentials, you can delete `config/credentials.yml.enc` and `config/credentials/`.
+      MESSAGE
     end
 
     def env

data/lib/pay/fake_processor/subscription.rb

@@ -19,6 +19,10 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
+      def subscription(**options)
+        pay_subscription
+      end
+
       def cancel
         pay_subscription.update(ends_at: Time.current.end_of_month)
       end
@@ -48,6 +52,8 @@ module Pay
       end
 
       def swap(plan)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         pay_subscription.update(processor_plan: plan)
       end
     end

data/lib/pay/merchant.rb

@@ -0,0 +1,37 @@
+module Pay
+  module Merchant
+    extend ActiveSupport::Concern
+
+    # Keep track of which Merchant models we have
+    class << self
+      attr_reader :includers
+    end
+
+    def self.included(base = nil, &block)
+      @includers ||= []
+      @includers << base if base
+      super
+    end
+
+    included do
+      store_accessor :pay_data, :stripe_connect_account_id
+      store_accessor :pay_data, :onboarding_complete
+    end
+
+    def merchant
+      @merchant ||= merchant_processor_for(merchant_processor).new(self)
+    end
+
+    def merchant_processor_for(name)
+      "Pay::#{name.to_s.classify}::Merchant".constantize
+    end
+
+    def stripe_connect_account_id?
+      !!stripe_connect_account_id
+    end
+
+    def onboarding_complete?
+      !!onboarding_complete
+    end
+  end
+end

data/lib/pay/paddle/subscription.rb

@@ -24,6 +24,13 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
+      def subscription(**options)
+        hash = PaddlePay::Subscription::User.list({subscription_id: processor_id}, options).try(:first)
+        OpenStruct.new(hash)
+      rescue ::PaddlePay::PaddlePayError => e
+        raise Pay::Paddle::Error, e
+      end
+
       def cancel
         subscription = processor_subscription
         PaddlePay::Subscription::User.cancel(processor_id)
@@ -72,6 +79,8 @@ module Pay
       end
 
       def swap(plan)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         attributes = {plan_id: plan, prorate: prorate}
         attributes[:quantity] = quantity if quantity?
         PaddlePay::Subscription::User.update(processor_id, attributes)

data/lib/pay/paddle/webhooks/subscription_payment_succeeded.rb

@@ -30,8 +30,10 @@ module Pay
           params = {
             amount: Integer(event["sale_gross"].to_f * 100),
             card_type: event["payment_method"],
+            created_at: Time.zone.parse(event["event_time"]),
+            currency: event["currency"],
             paddle_receipt_url: event["receipt_url"],
-            created_at: Time.zone.parse(event["event_time"])
+            subscription: Pay::Subscription.find_by(processor: :paddle, processor_id: event["subscription_id"])
           }
 
           payment_information = Pay::Paddle::Billable.new(user).payment_information(event["subscription_id"])

data/lib/pay/stripe.rb

@@ -4,10 +4,14 @@ module Pay
     autoload :Charge, "pay/stripe/charge"
     autoload :Subscription, "pay/stripe/subscription"
     autoload :Error, "pay/stripe/error"
+    autoload :Merchant, "pay/stripe/merchant"
 
     module Webhooks
+      autoload :AccountUpdated, "pay/stripe/webhooks/account_updated"
       autoload :ChargeRefunded, "pay/stripe/webhooks/charge_refunded"
       autoload :ChargeSucceeded, "pay/stripe/webhooks/charge_succeeded"
+      autoload :CheckoutSessionCompleted, "pay/stripe/webhooks/checkout_session_completed"
+      autoload :CheckoutSessionAsyncPaymentSucceeded, "pay/stripe/webhooks/checkout_session_async_payment_succeeded"
       autoload :CustomerDeleted, "pay/stripe/webhooks/customer_deleted"
       autoload :CustomerUpdated, "pay/stripe/webhooks/customer_updated"
       autoload :PaymentActionRequired, "pay/stripe/webhooks/payment_action_required"
@@ -81,6 +85,13 @@ module Pay
         events.subscribe "stripe.payment_method.updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
         events.subscribe "stripe.payment_method.card_automatically_updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
         events.subscribe "stripe.payment_method.detached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
+
+        # If an account is updated in stripe, we should update it as well
+        events.subscribe "stripe.account.updated", Pay::Stripe::Webhooks::AccountUpdated.new
+
+        # Handle subscriptions in Stripe Checkout Sessions
+        events.subscribe "stripe.checkout.session.completed", Pay::Stripe::Webhooks::CheckoutSessionCompleted.new
+        events.subscribe "stripe.checkout.session.async_payment_succeeded", Pay::Stripe::Webhooks::CheckoutSessionAsyncPaymentSucceeded.new
       end
     end
   end

data/lib/pay/stripe/billable.rb

@@ -10,6 +10,7 @@ module Pay
         :email,
         :customer_name,
         :card_token,
+        :stripe_account,
         to: :billable
 
       class << self
@@ -27,17 +28,17 @@ module Pay
       # Returns Stripe::Customer
       def customer
         stripe_customer = if processor_id?
-          ::Stripe::Customer.retrieve(processor_id)
+          ::Stripe::Customer.retrieve(processor_id, stripe_options)
         else
-          sc = ::Stripe::Customer.create(email: email, name: customer_name)
-          billable.update(processor: :stripe, processor_id: sc.id)
+          sc = ::Stripe::Customer.create({email: email, name: customer_name}, stripe_options)
+          billable.update(processor: :stripe, processor_id: sc.id, stripe_account: stripe_account)
           sc
         end
 
         # Update the user's card on file if a token was passed in
         if card_token.present?
-          payment_method = ::Stripe::PaymentMethod.attach(card_token, customer: stripe_customer.id)
-          stripe_customer = ::Stripe::Customer.update(stripe_customer.id, invoice_settings: {default_payment_method: payment_method.id})
+          payment_method = ::Stripe::PaymentMethod.attach(card_token, {customer: stripe_customer.id}, stripe_options)
+          stripe_customer = ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, stripe_options)
           update_card_on_file(payment_method.card)
         end
 
@@ -60,11 +61,12 @@ module Pay
           payment_method: stripe_customer.invoice_settings.default_payment_method
         }.merge(options)
 
-        payment_intent = ::Stripe::PaymentIntent.create(args)
+        payment_intent = ::Stripe::PaymentIntent.create(args, stripe_options)
         Pay::Payment.new(payment_intent).validate
 
         # Create a new charge object
-        save_pay_charge(payment_intent.charges.first)
+        charge = payment_intent.charges.first
+        Pay::Stripe::Charge.sync(charge.id, object: charge)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -86,16 +88,15 @@ module Pay
         # Load the Stripe customer to verify it exists and update card if needed
         opts[:customer] = customer.id
 
-        stripe_sub = ::Stripe::Subscription.create(opts)
-        subscription = billable.create_pay_subscription(stripe_sub, "stripe", name, plan, status: stripe_sub.status, quantity: quantity)
+        # Create subscription on Stripe
+        stripe_sub = ::Stripe::Subscription.create(opts, stripe_options)
+
+        # Save Pay::Subscription
+        subscription = Pay::Stripe::Subscription.sync(stripe_sub.id, object: stripe_sub, name: name)
 
         # No trial, card requires SCA
         if subscription.incomplete?
           Pay::Payment.new(stripe_sub.latest_invoice.payment_intent).validate
-
-        # Trial, card requires SCA
-        elsif subscription.on_trial? && stripe_sub.pending_setup_intent
-          Pay::Payment.new(stripe_sub.pending_setup_intent).validate
         end
 
         subscription
@@ -111,8 +112,8 @@ module Pay
 
         return true if payment_method_id == stripe_customer.invoice_settings.default_payment_method
 
-        payment_method = ::Stripe::PaymentMethod.attach(payment_method_id, customer: stripe_customer.id)
-        ::Stripe::Customer.update(stripe_customer.id, invoice_settings: {default_payment_method: payment_method.id})
+        payment_method = ::Stripe::PaymentMethod.attach(payment_method_id, {customer: stripe_customer.id}, stripe_options)
+        ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, stripe_options)
 
         update_card_on_file(payment_method.card)
         true
@@ -121,33 +122,33 @@ module Pay
       end
 
       def update_email!
-        ::Stripe::Customer.update(processor_id, {email: email, name: customer_name})
+        ::Stripe::Customer.update(processor_id, {email: email, name: customer_name}, stripe_options)
       end
 
       def processor_subscription(subscription_id, options = {})
-        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id))
+        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id), stripe_options)
       end
 
       def invoice!(options = {})
         return unless processor_id?
-        ::Stripe::Invoice.create(options.merge(customer: processor_id)).pay
+        ::Stripe::Invoice.create(options.merge(customer: processor_id), stripe_options).pay
       end
 
       def upcoming_invoice
-        ::Stripe::Invoice.upcoming(customer: processor_id)
+        ::Stripe::Invoice.upcoming({customer: processor_id}, stripe_options)
       end
 
       # Used by webhooks when the customer or source changes
       def sync_card_from_stripe
         if (payment_method_id = customer.invoice_settings.default_payment_method)
-          update_card_on_file ::Stripe::PaymentMethod.retrieve(payment_method_id).card
+          update_card_on_file ::Stripe::PaymentMethod.retrieve(payment_method_id, stripe_options).card
         else
           billable.update(card_type: nil, card_last4: nil)
         end
       end
 
       def create_setup_intent
-        ::Stripe::SetupIntent.create(customer: processor_id, usage: :off_session)
+        ::Stripe::SetupIntent.create({customer: processor_id, usage: :off_session}, stripe_options)
       end
 
       def trial_end_date(stripe_sub)
@@ -167,19 +168,14 @@ module Pay
         billable.card_token = nil
       end
 
-      def save_pay_charge(object)
-        charge = billable.charges.find_or_initialize_by(processor: :stripe, processor_id: object.id)
-
-        charge.update(
-          amount: object.amount,
-          card_last4: object.payment_method_details.card.last4,
-          card_type: object.payment_method_details.card.brand,
-          card_exp_month: object.payment_method_details.card.exp_month,
-          card_exp_year: object.payment_method_details.card.exp_year,
-          created_at: Time.zone.at(object.created)
-        )
-
-        charge
+      # Syncs a customer's subscriptions from Stripe to the database
+      def sync_subscriptions
+        subscriptions = ::Stripe::Subscription.list({customer: customer}, stripe_options)
+        subscriptions.map do |subscription|
+          Pay::Stripe::Subscription.sync(subscription.id)
+        end
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
       end
 
       # https://stripe.com/docs/api/checkout/sessions/create
@@ -213,7 +209,7 @@ module Pay
           }
         end
 
-        ::Stripe::Checkout::Session.create(args.merge(options))
+        ::Stripe::Checkout::Session.create(args.merge(options), stripe_options)
       end
 
       # https://stripe.com/docs/api/checkout/sessions/create
@@ -240,7 +236,14 @@ module Pay
           customer: processor_id,
           return_url: options.delete(:return_url) || root_url
         }
-        ::Stripe::BillingPortal::Session.create(args.merge(options))
+        ::Stripe::BillingPortal::Session.create(args.merge(options), stripe_options)
+      end
+
+      private
+
+      # Options for Stripe requests
+      def stripe_options
+        {stripe_account: stripe_account}.compact
       end
     end
   end