pay 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d696d24ee2bb2b4827f6d6e31db738752ebb2eadca4ea0e79144518fc9375be9
-  data.tar.gz: 8aad550b117bee7e28c9231832f4f344c37054db4f1a7d0176f034c780d0abed
+  metadata.gz: a90781f9b476b2396d1ab4ea8d1a6317b46ac6289f5c4afef96dc991af035fd0
+  data.tar.gz: 8d20e7c6edcb13eb62d5ad398c4ab12a353e3be784c7651d795efd9feeb18402
 SHA512:
-  metadata.gz: 5dc610b8d7b67ed4073fea783b290d3cd6ada3f4df1ed7bac26a0c4770f4a5ab854bf492fe6541f14b069ae61b10369024689a9f832d625ba2201a14deb24fc1
-  data.tar.gz: 3801e3d1da5a833869ed46d28e04d633df5e1b55e51900bcae1a8b437663b93ee1b5ab45698cb54e00a145fb1752cb4c195ec877070b367b79d8c3b03ce81e8d
+  metadata.gz: 11f281fe1df7c9eabfef2d4a0242257001115b3f7eaaa5571d73cbdacb1810891a0a57ab24a23caa01458de399093b3c82a3c251237e9d3d13f993e670f06b04
+  data.tar.gz: 11d760da77af12107686c4e91fcbec0f7bf4aa91e99d41281f1510bedabc00406146ade7656477ffa5ee4dda4e7b07af55a9dd0ae7675d1e780e8f4f121d6cc5

data/README.md

@@ -2,7 +2,7 @@
 
 ## 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) 
+[![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">
 
@@ -51,61 +51,49 @@ And then execute:
 bundle
 ```
 
-Make sure you've configured your ActionMailer default_url_options so Pay can generate links to for features like Stripe Checkout.
+Next, we need to add migrations to your application, run the following migration:
 
-```ruby
-# config/application.rb
-config.action_mailer.default_url_options = { host: "example.com" }
-```
-
-#### Migrations
-
-To add the migrations to your application, run the following migration:
+````bash
+bin/rails pay:install:migrations
+````
 
-`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.
+>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.
 
 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`
+```bash
+bin/rails g pay:billable User
+```
 
 This will generate a migration to add Pay fields to our User model and automatically includes the `Pay::Billable` module in our `User` model. Repeat this for all the models you want to make payments in your app.
 
-Finally, run the migrations
-
-`rake db:migrate`
+**Note:** An `email` attribute or method on your `Billable` model is required.
 
-####  Getting NoMethodError?
+To sync customer names, your `Billable` model should respond to the `first_name` and `last_name` methods. Pay will sync these over to your Customer objects in Stripe and Braintree.
 
-`NoMethodError (undefined method 'stripe_customer' for #<User:0x00007fbc34b9bf20>)`
+Finally, run the migrations
 
-Fully restart your Rails application `bin/spring stop && rails s`
+```bash
+rake db:migrate
+```
 
-## Usage
+> If you run into `NoMethodError (undefined method 'stripe_customer' for #<User:0x00007fbc34b9bf20>)`, fully restart your Rails application `bin/spring stop && rails s`
 
-The `Pay::Billable` module should be included in the models you want to make payments and subscriptions.
+Lastly, make sure you've configured your ActionMailer default_url_options so Pay can generate links to for features like Stripe Checkout.
 
 ```ruby
-# app/models/user.rb
-class User < ActiveRecord::Base
-  include Pay::Billable
-end
+# config/application.rb
+config.action_mailer.default_url_options = { host: "example.com" }
 ```
 
-An `email` attribute or method on your `Billable` model is required.
-
-To sync over customer names, your `Billable` model should respond to the `first_name` and `last_name` methods. Pay will sync these over to your Customer objects in Stripe and Braintree.
-
 ## Configuration
 
 Need to make some changes to how Pay is used? You can create an initializer `config/initializers/pay.rb`
 
 ```ruby
 Pay.setup do |config|
-  config.chargeable_class = 'Pay::Charge'
-  config.chargeable_table = 'pay_charges'
+  # config.chargeable_class = 'Pay::Charge'
+  # config.chargeable_table = 'pay_charges'
 
   # For use in the receipt/refund/renewal mailers
   config.business_name = "Business Name"
@@ -139,29 +127,59 @@ end
 
 ### Credentials
 
-You'll need to add your private Stripe API key to your Rails secrets `config/secrets.yml`, credentials `rails credentials:edit`
+Pay automatically looks up credentials for each payment provider. We recommend storing them in the Rails credentials.
+
+##### Rails Credentials & Secrets
+
+You'll need to add your API keys to your Rails credentials. You can do this by running:
+
+```bash
+rails credentials:edit --environment=development
+```
+
+They should be formatted like the following:
+
+```yaml
+stripe:
+  private_key: xxxx
+  public_key: yyyy
+  signing_secret: zzzz
+braintree:
+  private_key: xxxx
+  public_key: yyyy
+  merchant_id: aaaa
+  environment: sandbox
+paddle:
+  vendor_id: xxxx
+  vendor_auth_code: yyyy
+  public_key_base64: MII...==
+  environment: sandbox
+```
+
+You can also nest these credentials under the Rails environment if using a shared credentials file or secrets.
 
 ```yaml
 development:
   stripe:
     private_key: xxxx
-    public_key: yyyy
-    signing_secret: zzzz
-  braintree:
-    private_key: xxxx
-    public_key: yyyy
-    merchant_id: aaaa
-    environment: sandbox
-  paddle:
-    vendor_id: xxxx
-    vendor_auth_code: yyyy
-    public_key_base64: MII...==
-    environment: sandbox
+# ...
 ```
 
-For Stripe, you can also use the `STRIPE_PUBLIC_KEY`, `STRIPE_PRIVATE_KEY` and `STRIPE_SIGNING_SECRET` environment variables.
-For Braintree, you can also use `BRAINTREE_MERCHANT_ID`, `BRAINTREE_PUBLIC_KEY`, `BRAINTREE_PRIVATE_KEY`, and `BRAINTREE_ENVIRONMENT` environment variables.
-For Paddle, you can also use `PADDLE_VENDOR_ID`, `PADDLE_VENDOR_AUTH_CODE`, `PADDLE_PUBLIC_KEY_BASE64` and `PADDLE_ENVIRONMENT` environment variables.
+##### Environment Variables
+
+Pay will also check environment variables for API keys:
+
+* `STRIPE_PUBLIC_KEY`
+* `STRIPE_PRIVATE_KEY`
+* `STRIPE_SIGNING_SECRET`
+* `BRAINTREE_MERCHANT_ID`
+* `BRAINTREE_PUBLIC_KEY`
+* `BRAINTREE_PRIVATE_KEY`
+* `BRAINTREE_ENVIRONMENT`
+* `PADDLE_VENDOR_ID`
+* `PADDLE_VENDOR_AUTH_CODE`
+* `PADDLE_PUBLIC_KEY_BASE64`
+* `PADDLE_ENVIRONMENT`
 
 ### Generators
 
@@ -179,11 +197,13 @@ bin/rails generate pay:email_views
 
 ### Emails
 
-Emails can be enabled/disabled using the `send_emails` configuration option (enabled per default). When enabled, the following emails will be sent:
+Emails can be enabled/disabled using the `send_emails` configuration option (enabled by default).
+
+When enabled, the following emails will be sent when:
 
-- When a charge succeeded
-- When a charge was refunded
-- When a subscription is about to renew
+- A charge succeeded
+- A charge was refunded
+- A subscription is about to renew
 
 
 ## Billable API

data/db/migrate/20200603134434_add_data_to_pay_models.rb

@@ -1,15 +1,6 @@
 class AddDataToPayModels < ActiveRecord::Migration[4.2]
   def change
-    add_column :pay_subscriptions, :data, data_column_type
-    add_column :pay_charges, :data, data_column_type
-  end
-
-  def data_column_type
-    case Pay::Adapter.current_adapter
-    when "postgresql"
-      :jsonb
-    else
-      :json
-    end
+    add_column :pay_subscriptions, :data, Pay::Adapter.json_column_type
+    add_column :pay_charges, :data, Pay::Adapter.json_column_type
   end
 end

data/db/migrate/20210309004259_add_data_to_pay_billable.rb

@@ -4,16 +4,7 @@ class AddDataToPayBillable < ActiveRecord::Migration[4.2]
     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
+      add_column model.table_name, :pay_data, Pay::Adapter.json_column_type
     end
   end
 end

data/lib/generators/active_record/billable_generator.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "rails/generators/active_record"
+require "generators/pay/orm_helpers"
+
+module ActiveRecord
+  module Generators
+    class BillableGenerator < ActiveRecord::Generators::Base
+      include Pay::Generators::OrmHelpers
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_pay_billable_migration
+        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
+          migration_template "billable_migration.rb", "#{migration_path}/add_pay_billable_to_#{table_name}.rb", migration_version: migration_version
+        else
+          say "#{model_path} does not exist.", :red
+          say "⚠️  Make sure the #{name} model exists before running this generator."
+        end
+      end
+
+      # If the file already contains the contents, the user will receive this warning:
+      #
+      #   File unchanged! The supplied flag value not found!
+      #
+      # This can be ignored as it just means the contents already exist and the file is unchanged.
+      # Thor will be updated to improve this message: https://github.com/rails/thor/issues/706
+      def inject_pay_billable_content
+        return unless model_exists?
+
+        content = model_contents
+        class_path = (namespaced? ? class_name.to_s.split("::") : [class_name])
+        indent_depth = class_path.size - 1
+        content = content.split("\n").map { |line| "  " * indent_depth + line }.join("\n") << "\n"
+        inject_into_class(model_path, class_path.last, content)
+      end
+
+      private
+
+      def model_contents
+        "  include Pay::Billable"
+      end
+    end
+  end
+end

data/lib/generators/active_record/merchant_generator.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "rails/generators/active_record"
+require "generators/pay/orm_helpers"
+
+module ActiveRecord
+  module Generators
+    class MerchantGenerator < ActiveRecord::Generators::Base
+      include Pay::Generators::OrmHelpers
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_pay_merchant_migration
+        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
+          migration_template "merchant_migration.rb", "#{migration_path}/add_pay_merchant_to_#{table_name}.rb", migration_version: migration_version
+        else
+          say "#{model_path} does not exist.", :red
+          say "⚠️  Make sure the #{name} model exists before running this generator."
+        end
+      end
+
+      # If the file already contains the contents, the user will receive this warning:
+      #
+      #   File unchanged! The supplied flag value not found!
+      #
+      # This can be ignored as it just means the contents already exist and the file is unchanged.
+      # Thor will be updated to improve this message: https://github.com/rails/thor/issues/706
+      def inject_pay_merchant_content
+        return unless model_exists?
+
+        content = model_contents
+        class_path = (namespaced? ? class_name.to_s.split("::") : [class_name])
+        indent_depth = class_path.size - 1
+        content = content.split("\n").map { |line| "  " * indent_depth + line }.join("\n") << "\n"
+        inject_into_class(model_path, class_path.last, content)
+      end
+
+      private
+
+      def model_contents
+        "  include Pay::Merchant"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# 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.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/adapter.rb

@@ -9,5 +9,14 @@ module Pay
         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/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/stripe.rb

@@ -10,6 +10,8 @@ module Pay
       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"
@@ -86,6 +88,10 @@ module Pay
 
         # 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

@@ -65,7 +65,8 @@ module Pay
         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
@@ -87,8 +88,11 @@ module Pay
         # Load the Stripe customer to verify it exists and update card if needed
         opts[:customer] = customer.id
 
+        # Create subscription on Stripe
         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)
+
+        # Save Pay::Subscription
+        subscription = Pay::Stripe::Subscription.sync(stripe_sub.id, object: stripe_sub, name: name)
 
         # No trial, card requires SCA
         if subscription.incomplete?
@@ -168,31 +172,6 @@ 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)
-
-        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),
-          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
-
       # https://stripe.com/docs/api/checkout/sessions/create
       #
       # checkout(mode: "payment")

data/lib/pay/stripe/charge.rb

@@ -5,6 +5,35 @@ module Pay
 
       delegate :processor_id, :owner, :stripe_account, to: :pay_charge
 
+      def self.sync(charge_id, object: nil)
+        object ||= ::Stripe::Charge.retrieve(id: charge_id)
+        owner = Pay.find_billable(processor: :stripe, processor_id: object.customer)
+        return unless owner
+
+        attrs = {
+          amount: object.amount,
+          amount_refunded: object.amount_refunded,
+          application_fee_amount: object.application_fee_amount,
+          card_exp_month: object.payment_method_details.card.exp_month,
+          card_exp_year: object.payment_method_details.card.exp_year,
+          card_last4: object.payment_method_details.card.last4,
+          card_type: object.payment_method_details.card.brand,
+          created_at: Time.at(object.created),
+          currency: object.currency,
+          stripe_account: owner.stripe_account
+        }
+
+        # 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
+
+        pay_charge = owner.charges.find_or_initialize_by(processor: :stripe, processor_id: object.id)
+        pay_charge.update(attrs)
+        pay_charge
+      end
+
       def initialize(pay_charge)
         @pay_charge = pay_charge
       end

data/lib/pay/stripe/subscription.rb

@@ -20,6 +20,35 @@ module Pay
         :trial_ends_at,
         to: :pay_subscription
 
+      def self.sync(subscription_id, object: nil, name: Pay.default_product_name)
+        # Skip loading the latest subscription details from the API if we already have it
+        object ||= ::Stripe::Subscription.retrieve(id: subscription_id, expand: ["pending_setup_intent", "latest_invoice.payment_intent"])
+
+        owner = Pay.find_billable(processor: :stripe, processor_id: object.customer)
+        return unless owner
+
+        attributes = {
+          application_fee_percent: object.application_fee_percent,
+          processor_plan: object.plan.id,
+          quantity: object.quantity,
+          name: name,
+          status: object.status,
+          stripe_account: owner.stripe_account,
+          trial_ends_at: (object.trial_end ? Time.at(object.trial_end) : nil)
+        }
+
+        # Subscriptions cancelling in the future
+        attributes[:ends_at] = Time.at(object.current_period_end) if object.cancel_at_period_end
+
+        # Fully cancelled subscription
+        attributes[:ends_at] = Time.at(object.ended_at) if object.ended_at
+
+        # Update or create the subscription
+        pay_subscription = owner.subscriptions.find_or_initialize_by(processor: :stripe, processor_id: object.id)
+        pay_subscription.update(attributes)
+        pay_subscription
+      end
+
       def initialize(pay_subscription)
         @pay_subscription = pay_subscription
       end

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

@@ -3,13 +3,8 @@ module Pay
     module Webhooks
       class ChargeRefunded
         def call(event)
-          object = event.data.object
-          charge = Pay.charge_model.find_by(processor: :stripe, processor_id: object.id)
-
-          return unless charge.present?
-
-          charge.update(amount_refunded: object.amount_refunded)
-          notify_user(charge.owner, charge)
+          pay_charge = Pay::Stripe::Charge.sync(event.data.object.id)
+          notify_user(pay_charge.owner, pay_charge) if pay_charge
         end
 
         def notify_user(billable, charge)

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

@@ -3,14 +3,8 @@ module Pay
     module Webhooks
       class ChargeSucceeded
         def call(event)
-          object = event.data.object
-          billable = Pay.find_billable(processor: :stripe, processor_id: object.customer)
-
-          return unless billable.present?
-          return if billable.charges.where(processor_id: object.id).any?
-
-          charge = Pay::Stripe::Billable.new(billable).save_pay_charge(object)
-          notify_user(billable, charge)
+          pay_charge = Pay::Stripe::Charge.sync(event.data.object.id)
+          notify_user(pay_charge.owner, pay_charge) if pay_charge
         end
 
         def notify_user(billable, charge)

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

@@ -0,0 +1,13 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class CheckoutSessionAsyncPaymentSucceeded
+        def call(event)
+          if event.data.object.subscription
+            Pay::Stripe::Subscription.sync(event.data.object.subscription)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class CheckoutSessionCompleted
+        def call(event)
+          if event.data.object.subscription
+            Pay::Stripe::Subscription.sync(event.data.object.subscription)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,15 +4,9 @@ module Pay
       class PaymentIntentSucceeded
         def call(event)
           object = event.data.object
-          billable = Pay.find_billable(processor: :stripe, processor_id: object.customer)
-
-          return unless billable.present?
-
           object.charges.data.each do |charge|
-            next if billable.charges.where(processor_id: charge.id).any?
-
-            charge = Pay::Stripe::Billable.new(billable).save_pay_charge(charge)
-            notify_user(billable, charge)
+            pay_charge = Pay::Stripe::Charge.sync(charge.id)
+            notify_user(pay_charge.owner, pay_charge) if pay_charge
           end
         end
 

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

@@ -3,42 +3,7 @@ module Pay
     module Webhooks
       class SubscriptionCreated
         def call(event)
-          object = event.data.object
-
-          # We may already have the subscription in the database, so we can update that record
-          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: object.id)
-
-          # Create the subscription in the database if we don't have it already
-          if subscription.nil?
-            # The customer should already be in the database
-            owner = Pay.find_billable(processor: :stripe, processor_id: object.customer)
-
-            if owner.nil?
-              Rails.logger.error("[Pay] Unable to find Pay::Billable with processor: :stripe and processor_id: '#{object.customer}'. Searched these models: #{Pay.billable_models.join(", ")}")
-              return
-            end
-
-            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.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
-          subscription.ends_at = if object.cancel_at_period_end && subscription.on_trial?
-            subscription.trial_ends_at
-
-          # User wasn't on trial, so subscription ends at period end
-          elsif object.cancel_at_period_end
-            Time.at(object.current_period_end)
-
-            # Subscription isn't marked to cancel at period end
-          end
-
-          subscription.save!
+          Pay::Stripe::Subscription.sync(event.data.object.id)
         end
       end
     end

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

@@ -3,15 +3,7 @@ module Pay
     module Webhooks
       class SubscriptionDeleted
         def call(event)
-          object = event.data.object
-          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: object.id)
-
-          # We couldn't find the subscription for some reason, maybe it's from another service
-          return if subscription.nil?
-
-          # User canceled subscriptions have an ends_at
-          # Automatically canceled subscriptions need this value set
-          subscription.update!(ends_at: Time.at(object.ended_at)) if subscription.ends_at.blank? && object.ended_at.present?
+          Pay::Stripe::Subscription.sync(event.data.object.id)
         end
       end
     end

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

@@ -5,12 +5,10 @@ module Pay
         def call(event)
           # Event is of type "invoice" see:
           # https://stripe.com/docs/api/invoices/object
-          subscription = Pay.subscription_model.find_by(
-            processor: :stripe,
-            processor_id: event.data.object.subscription
-          )
-          date = Time.zone.at(event.data.object.next_payment_attempt)
-          notify_user(subscription.owner, subscription, date) if subscription.present?
+          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: event.data.object.subscription)
+          return unless subscription
+
+          notify_user(subscription.owner, subscription, Time.zone.at(event.data.object.next_payment_attempt))
         end
 
         def notify_user(billable, subscription, date)

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

@@ -3,35 +3,7 @@ module Pay
     module Webhooks
       class SubscriptionUpdated
         def call(event)
-          object = event.data.object
-          subscription = Pay.subscription_model.find_by(processor: :stripe, processor_id: object.id)
-
-          return if subscription.nil?
-
-          # Delete any subscription attempts that have expired
-          if object.status == "incomplete_expired"
-            subscription.destroy
-            return
-          end
-
-          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
-          subscription.ends_at = if object.cancel_at_period_end && subscription.on_trial?
-            subscription.trial_ends_at
-
-          # User wasn't on trial, so subscription ends at period end
-          elsif object.cancel_at_period_end
-            Time.at(object.current_period_end)
-
-            # Subscription isn't marked to cancel at period end
-          end
-
-          subscription.save!
+          Pay::Stripe::Subscription.sync(event.data.object.id)
         end
       end
     end

data/lib/pay/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,11 +145,14 @@ files:
 - 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/active_record/billable_generator.rb
+- lib/generators/active_record/merchant_generator.rb
+- lib/generators/active_record/templates/billable_migration.rb
+- lib/generators/active_record/templates/merchant_migration.rb
+- lib/generators/pay/billable_generator.rb
 - lib/generators/pay/email_views_generator.rb
+- lib/generators/pay/merchant_generator.rb
 - lib/generators/pay/orm_helpers.rb
-- lib/generators/pay/pay_generator.rb
 - lib/generators/pay/views_generator.rb
 - lib/pay.rb
 - lib/pay/adapter.rb
@@ -199,6 +202,8 @@ files:
 - 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/checkout_session_async_payment_succeeded.rb
+- lib/pay/stripe/webhooks/checkout_session_completed.rb
 - lib/pay/stripe/webhooks/customer_deleted.rb
 - lib/pay/stripe/webhooks/customer_updated.rb
 - lib/pay/stripe/webhooks/payment_action_required.rb

data/lib/generators/active_record/pay_generator.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/active_record"
-require "generators/pay/orm_helpers"
-
-module ActiveRecord
-  module Generators
-    class PayGenerator < ActiveRecord::Generators::Base
-      include Pay::Generators::OrmHelpers
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_pay_billable_migration
-        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "migration.rb", "#{migration_path}/add_pay_billable_to_#{table_name}.rb", migration_version: migration_version
-        end
-        # TODO: Throw error here that model should already exist if it doesn't
-      end
-
-      def inject_pay_billable_content
-        content = model_contents
-
-        class_path = if namespaced?
-          class_name.to_s.split("::")
-        else
-          [class_name]
-        end
-
-        indent_depth = class_path.size - 1
-        content = content.split("\n").map { |line| "  " * indent_depth + line }.join("\n") << "\n"
-
-        inject_into_class(model_path, class_path.last, content) if model_exists?
-      end
-
-      def migration_data
-        <<RUBY
-      t.string :processor
-      t.string :processor_id
-      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
-RUBY
-      end
-
-      def rails5_and_up?
-        Rails::VERSION::MAJOR >= 5
-      end
-
-      def migration_version
-        if rails5_and_up?
-          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        end
-      end
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class AddPayBillableTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
-  def change
-    change_table :<%= table_name %>, bulk: true do |t|
-<%= migration_data -%>
-    end
-  end
-end