pay 2.7.0 → 2.7.2

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/payment_method_attached.rb

@@ -0,0 +1,17 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentMethodAttached
+        def call(event)
+          object = event.data.object
+          pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
+
+          # Couldn't find user, we can skip
+          return unless pay_customer.present?
+
+          Pay::Stripe::Billable.new(pay_customer).sync_payment_method(payment_method_id: object.id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentMethodAutomaticallyUpdated
+        def call(event)
+          object = event.data.object
+          pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
+
+          # Couldn't find user, we can skip
+          return unless pay_customer.present?
+
+          Pay::Stripe::Billable.new(pay_customer).sync_payment_method(payment_method_id: object.id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentMethodDetached
+        def call(event)
+          object = event.data.object
+          pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
+
+          # Couldn't find user, we can skip
+          return unless pay_customer.present?
+
+          Pay::Stripe::Billable.new(pay_customer).sync_payment_method(payment_method_id: object.id)
+        end
+      end
+    end
+  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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.2
 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-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,6 @@ 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
@@ -145,11 +144,15 @@ 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
+- db/migrate/20210714175351_add_uniqueness_to_pay_models.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,10 +202,15 @@ 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
 - lib/pay/stripe/webhooks/payment_intent_succeeded.rb
+- lib/pay/stripe/webhooks/payment_method_attached.rb
+- lib/pay/stripe/webhooks/payment_method_automatically_updated.rb
+- lib/pay/stripe/webhooks/payment_method_detached.rb
 - lib/pay/stripe/webhooks/payment_method_updated.rb
 - lib/pay/stripe/webhooks/subscription_created.rb
 - lib/pay/stripe/webhooks/subscription_deleted.rb

data/app/models/pay.rb

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

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