pay 2.6.11 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c258d50a32d486777f2439f2fd2cd75e6cac1adba558afe630b9eda760c87717
-  data.tar.gz: 1f079e5382a0f8c3cda2e7b70b56c36162bc32926dae8b9c5226ed1c2e508160
+  metadata.gz: d696d24ee2bb2b4827f6d6e31db738752ebb2eadca4ea0e79144518fc9375be9
+  data.tar.gz: 8aad550b117bee7e28c9231832f4f344c37054db4f1a7d0176f034c780d0abed
 SHA512:
-  metadata.gz: ad9e9b98b5ed50f2e0f6599742b70f3c274afdc994949b445d921a5ae4451fbbaf2afcbad47e8d7d2a2c1b382fbb3ab3f97a85b2640048b937fab4d8dca10920
-  data.tar.gz: 21eaa1e667271af7f64e3e1f4544c8f1f6e11e32d3dec80e9e70b05159ac0a4ae9dba390b1e4f1a6cac6b8223df547ec8bc87bb7505425a365fe7a06b713c3ea
+  metadata.gz: 5dc610b8d7b67ed4073fea783b290d3cd6ada3f4df1ed7bac26a0c4770f4a5ab854bf492fe6541f14b069ae61b10369024689a9f832d625ba2201a14deb24fc1
+  data.tar.gz: 3801e3d1da5a833869ed46d28e04d633df5e1b55e51900bcae1a8b437663b93ee1b5ab45698cb54e00a145fb1752cb4c195ec877070b367b79d8c3b03ce81e8d

data/README.md

@@ -64,6 +64,9 @@ To add the migrations to your application, run the following migration:
 
 `bin/rails pay:install:migrations`
 
+>If your models rely on non integer ids (uuids for example) you will need to alter the `create_pay_subscriptions` and `create_pay_charges` migrations to ensure the `owner_id` column's type matches the model's id's format.
+> As commented in the migrations adding a type parameter to the `t.references :owner` line will ensure the `owner_id` column is of the correct type.
+
 We also need to run migrations to add Pay to the User, Account, Team, etc models that we want to make payments in our app.
 
 `bin/rails g pay User`

data/app/models/pay.rb

@@ -0,0 +1,5 @@
+module Pay
+  def self.table_name_prefix
+    "pay_"
+  end
+end

data/app/models/pay/charge.rb

@@ -7,6 +7,7 @@ module Pay
 
     # Associations
     belongs_to :owner, polymorphic: true
+    belongs_to :subscription, optional: true, class_name: "Pay::Subscription", foreign_key: :pay_subscription_id
 
     # Scopes
     scope :sorted, -> { order(created_at: :desc) }
@@ -19,6 +20,7 @@ module Pay
     validates :card_type, presence: true
 
     store_accessor :data, :paddle_receipt_url
+    store_accessor :data, :stripe_account
 
     # Helpers for payment processors
     %w[braintree stripe paddle fake_processor].each do |processor_name|

data/app/models/pay/subscription.rb

@@ -9,6 +9,7 @@ module Pay
 
     # Associations
     belongs_to :owner, polymorphic: true
+    has_many :charges, class_name: "Pay::Charge", foreign_key: :pay_subscription_id
 
     # Validations
     validates :name, presence: true
@@ -31,6 +32,7 @@ module Pay
     store_accessor :data, :paddle_update_url
     store_accessor :data, :paddle_cancel_url
     store_accessor :data, :paddle_paused_from
+    store_accessor :data, :stripe_account
 
     attribute :prorate, :boolean, default: true
 

data/db/migrate/20200603134434_add_data_to_pay_models.rb

@@ -5,18 +5,11 @@ class AddDataToPayModels < ActiveRecord::Migration[4.2]
   end
 
   def data_column_type
-    default_hash = ActiveRecord::Base.configurations.default_hash
-
-    # Rails 6.1 uses a symbol key instead of a string
-    adapter = default_hash.dig(:adapter) || default_hash.dig("adapter")
-
-    case adapter
-    when "mysql2"
-      :json
+    case Pay::Adapter.current_adapter
     when "postgresql"
       :jsonb
     else
-      :text
+      :json
     end
   end
 end

data/db/migrate/20210309004259_add_data_to_pay_billable.rb

@@ -0,0 +1,19 @@
+class AddDataToPayBillable < ActiveRecord::Migration[4.2]
+  def change
+    # Load all the billable models
+    Rails.application.eager_load!
+
+    Pay.billable_models.each do |model|
+      add_column model.table_name, :pay_data, data_column_type
+    end
+  end
+
+  def data_column_type
+    case Pay::Adapter.current_adapter
+    when "postgresql"
+      :jsonb
+    else
+      :json
+    end
+  end
+end

data/db/migrate/{20210423235138_add_currency_to_pay_charges.rb → 20210406215234_add_currency_to_pay_charges.rb}

@@ -1,4 +1,4 @@
-class AddCurrencyToPayCharges < ActiveRecord::Migration[6.1]
+class AddCurrencyToPayCharges < ActiveRecord::Migration[4.2]
   def change
     add_column :pay_charges, :currency, :string
   end

data/db/migrate/20210406215506_add_application_fee_to_pay_models.rb

@@ -0,0 +1,7 @@
+class AddApplicationFeeToPayModels < ActiveRecord::Migration[4.2]
+  def change
+    add_column :pay_charges, :application_fee_amount, :integer
+    add_column :pay_subscriptions, :application_fee_percent, :decimal, precision: 8, scale: 2
+    add_column :pay_charges, :pay_subscription_id, :integer
+  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,13 @@
+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
+  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/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/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,8 +4,10 @@ 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 :CustomerDeleted, "pay/stripe/webhooks/customer_deleted"
@@ -81,6 +83,9 @@ 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
       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_account: stripe_account})
         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_account: stripe_account})
+          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_account: stripe_account})
+          stripe_customer = ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, {stripe_account: stripe_account})
           update_card_on_file(payment_method.card)
         end
 
@@ -60,7 +61,7 @@ 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_account: stripe_account})
         Pay::Payment.new(payment_intent).validate
 
         # Create a new charge object
@@ -86,8 +87,8 @@ 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)
+        stripe_sub = ::Stripe::Subscription.create(opts, {stripe_account: stripe_account})
+        subscription = billable.create_pay_subscription(stripe_sub, "stripe", name, plan, status: stripe_sub.status, quantity: quantity, stripe_account: stripe_account, application_fee_percent: stripe_sub.application_fee_percent)
 
         # No trial, card requires SCA
         if subscription.incomplete?
@@ -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_account: stripe_account})
+        ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, {stripe_account: stripe_account})
 
         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_account: stripe_account})
       end
 
       def processor_subscription(subscription_id, options = {})
-        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id))
+        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id), {stripe_account: stripe_account})
       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_account: stripe_account}).pay
       end
 
       def upcoming_invoice
-        ::Stripe::Invoice.upcoming(customer: processor_id)
+        ::Stripe::Invoice.upcoming({customer: processor_id}, {stripe_account: stripe_account})
       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_account: stripe_account}).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_account: stripe_account})
       end
 
       def trial_end_date(stripe_sub)
@@ -170,15 +171,25 @@ module Pay
       def save_pay_charge(object)
         charge = billable.charges.find_or_initialize_by(processor: :stripe, processor_id: object.id)
 
-        charge.update(
+        attrs = {
           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)
-        )
+          created_at: Time.zone.at(object.created),
+          currency: object.currency,
+          stripe_account: stripe_account,
+          application_fee_amount: object.application_fee_amount
+        }
+
+        # Associate charge with subscription if we can
+        if object.invoice
+          invoice = (object.invoice.is_a?(::Stripe::Invoice) ? object.invoice : ::Stripe::Invoice.retrieve(object.invoice))
+          attrs[:subscription] = Pay::Subscription.find_by(processor: :stripe, processor_id: invoice.subscription)
+        end
 
+        charge.update(attrs)
         charge
       end
 
@@ -213,7 +224,7 @@ module Pay
           }
         end
 
-        ::Stripe::Checkout::Session.create(args.merge(options))
+        ::Stripe::Checkout::Session.create(args.merge(options), {stripe_account: stripe_account})
       end
 
       # https://stripe.com/docs/api/checkout/sessions/create
@@ -240,7 +251,7 @@ 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_account: stripe_account})
       end
     end
   end

data/lib/pay/stripe/charge.rb

@@ -3,20 +3,25 @@ module Pay
     class Charge
       attr_reader :pay_charge
 
-      delegate :processor_id, :owner, to: :pay_charge
+      delegate :processor_id, :owner, :stripe_account, to: :pay_charge
 
       def initialize(pay_charge)
         @pay_charge = pay_charge
       end
 
       def charge
-        ::Stripe::Charge.retrieve(id: processor_id, expand: ["customer", "invoice.subscription"])
+        ::Stripe::Charge.retrieve({id: processor_id, expand: ["customer", "invoice.subscription"]}, {stripe_account: stripe_account})
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
-      def refund!(amount_to_refund)
-        ::Stripe::Refund.create(charge: processor_id, amount: amount_to_refund)
+      # https://stripe.com/docs/api/refunds/create
+      #
+      # refund!
+      # refund!(5_00)
+      # refund!(5_00, refund_application_fee: true)
+      def refund!(amount_to_refund, **options)
+        ::Stripe::Refund.create(options.merge(charge: processor_id, amount: amount_to_refund), {stripe_account: stripe_account})
         pay_charge.update(amount_refunded: amount_to_refund)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e

data/lib/pay/stripe/merchant.rb

@@ -0,0 +1,66 @@
+module Pay
+  module Stripe
+    class Merchant
+      attr_reader :merchant
+
+      delegate :stripe_connect_account_id,
+        to: :merchant
+
+      def initialize(merchant)
+        @merchant = merchant
+      end
+
+      def create_account(**options)
+        defaults = {
+          type: "express",
+          capabilities: {
+            card_payments: {requested: true},
+            transfers: {requested: true}
+          }
+        }
+
+        stripe_account = ::Stripe::Account.create(defaults.merge(options))
+        merchant.update(stripe_connect_account_id: stripe_account.id)
+        stripe_account
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+
+      def account
+        ::Stripe::Account.retrieve(stripe_connect_account_id)
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+
+      def account_link(refresh_url:, return_url:, type: "account_onboarding", **options)
+        ::Stripe::AccountLink.create({
+          account: stripe_connect_account_id,
+          refresh_url: refresh_url,
+          return_url: return_url,
+          type: type
+        })
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+
+      # A single-use login link for Express accounts to access their Stripe dashboard
+      def login_link(**options)
+        ::Stripe::Account.create_login_link(stripe_connect_account_id)
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+
+      # Transfer money from the platform to this connected account
+      # https://stripe.com/docs/connect/charges-transfers#transfer-availability
+      def transfer(amount:, currency: "usd", **options)
+        ::Stripe::Transfer.create({
+          amount: amount,
+          currency: currency,
+          destination: stripe_connect_account_id
+        }.merge(options))
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+    end
+  end
+end

data/lib/pay/stripe/subscription.rb

@@ -16,6 +16,7 @@ module Pay
         :prorate?,
         :quantity,
         :quantity?,
+        :stripe_account,
         :trial_ends_at,
         to: :pay_subscription
 
@@ -28,19 +29,15 @@ module Pay
       end
 
       def cancel
-        subscription = processor_subscription
-        subscription.cancel_at_period_end = true
-        subscription.save
-
-        new_ends_at = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
-        pay_subscription.update(ends_at: new_ends_at)
+        stripe_sub = ::Stripe::Subscription.update(processor_id, {cancel_at_period_end: true}, {stripe_account: stripe_account})
+        pay_subscription.update(ends_at: (on_trial? ? trial_ends_at : Time.at(stripe_sub.current_period_end)))
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
       def cancel_now!
-        processor_subscription.delete
-        pay_subscription.update(ends_at: Time.zone.now, status: :canceled)
+        ::Stripe::Subscription.delete(processor_id, {stripe_account: stripe_account})
+        pay_subscription.update(ends_at: Time.current, status: :canceled)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -68,23 +65,31 @@ module Pay
           raise StandardError, "You can only resume subscriptions within their grace period."
         end
 
-        subscription = processor_subscription
-        subscription.plan = processor_plan
-        subscription.trial_end = on_trial? ? trial_ends_at.to_i : "now"
-        subscription.cancel_at_period_end = false
-        subscription.save
+        ::Stripe::Subscription.update(
+          processor_id,
+          {
+            plan: processor_plan,
+            trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
+            cancel_at_period_end: false
+          },
+          {stripe_account: stripe_account}
+        )
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
       def swap(plan)
-        subscription = processor_subscription
-        subscription.cancel_at_period_end = false
-        subscription.plan = plan
-        subscription.proration_behavior = (prorate ? "create_prorations" : "none")
-        subscription.trial_end = on_trial? ? trial_ends_at.to_i : "now"
-        subscription.quantity = quantity if quantity?
-        subscription.save
+        ::Stripe::Subscription.update(
+          processor_id,
+          {
+            cancel_at_period_end: false,
+            plan: plan,
+            proration_behavior: (prorate ? "create_prorations" : "none"),
+            trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
+            quantity: quantity
+          },
+          {stripe_account: stripe_account}
+        )
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end

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

@@ -0,0 +1,17 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class AccountUpdated
+        def call(event)
+          object = event.data.object
+
+          merchant = Pay.find_merchant("stripe_connect_account_id", object.id)
+
+          return unless merchant.present?
+
+          merchant.update(onboarding_complete: object.charges_enabled)
+        end
+      end
+    end
+  end
+end

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

@@ -21,9 +21,10 @@ module Pay
             subscription = Pay.subscription_model.new(name: Pay.default_product_name, owner: owner, processor: :stripe, processor_id: object.id)
           end
 
+          subscription.application_fee_percent = object.application_fee_percent
+          subscription.processor_plan = object.plan.id
           subscription.quantity = object.quantity
           subscription.status = object.status
-          subscription.processor_plan = object.plan.id
           subscription.trial_ends_at = Time.at(object.trial_end) if object.trial_end.present?
 
           # If user was on trial, their subscription ends at the end of the trial

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

@@ -14,9 +14,10 @@ module Pay
             return
           end
 
-          subscription.status = object.status
-          subscription.quantity = object.quantity
+          subscription.application_fee_percent = object.application_fee_percent
           subscription.processor_plan = object.plan.id
+          subscription.quantity = object.quantity
+          subscription.status = object.status
           subscription.trial_ends_at = Time.at(object.trial_end) if object.trial_end.present?
 
           # If user was on trial, their subscription ends at the end of the trial

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.6.11"
+  VERSION = "2.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.6.11
+  version: 2.7.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,6 +125,7 @@ files:
 - app/jobs/pay/email_sync_job.rb
 - app/mailers/pay/application_mailer.rb
 - app/mailers/pay/user_mailer.rb
+- app/models/pay.rb
 - app/models/pay/application_record.rb
 - app/models/pay/charge.rb
 - app/models/pay/subscription.rb
@@ -141,7 +142,9 @@ files:
 - db/migrate/20170727235816_create_pay_charges.rb
 - db/migrate/20190816015720_add_status_to_pay_subscriptions.rb
 - db/migrate/20200603134434_add_data_to_pay_models.rb
-- db/migrate/20210423235138_add_currency_to_pay_charges.rb
+- db/migrate/20210309004259_add_data_to_pay_billable.rb
+- db/migrate/20210406215234_add_currency_to_pay_charges.rb
+- db/migrate/20210406215506_add_application_fee_to_pay_models.rb
 - lib/generators/active_record/pay_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/pay/email_views_generator.rb
@@ -149,6 +152,7 @@ files:
 - lib/generators/pay/pay_generator.rb
 - lib/generators/pay/views_generator.rb
 - lib/pay.rb
+- lib/pay/adapter.rb
 - lib/pay/billable.rb
 - lib/pay/billable/sync_email.rb
 - lib/pay/braintree.rb
@@ -172,6 +176,7 @@ files:
 - lib/pay/fake_processor/charge.rb
 - lib/pay/fake_processor/error.rb
 - lib/pay/fake_processor/subscription.rb
+- lib/pay/merchant.rb
 - lib/pay/paddle.rb
 - lib/pay/paddle/billable.rb
 - lib/pay/paddle/charge.rb
@@ -189,7 +194,9 @@ files:
 - lib/pay/stripe/billable.rb
 - lib/pay/stripe/charge.rb
 - lib/pay/stripe/error.rb
+- lib/pay/stripe/merchant.rb
 - lib/pay/stripe/subscription.rb
+- lib/pay/stripe/webhooks/account_updated.rb
 - lib/pay/stripe/webhooks/charge_refunded.rb
 - lib/pay/stripe/webhooks/charge_succeeded.rb
 - lib/pay/stripe/webhooks/customer_deleted.rb
@@ -223,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails