pay 1.0.2 → 2.0.0

data/lib/pay/braintree/subscription.rb

@@ -10,12 +10,12 @@ module Pay
 
         if on_trial?
           gateway.subscription.cancel(processor_subscription.id)
-          update(ends_at: trial_ends_at)
+          update(status: :canceled, ends_at: trial_ends_at)
         else
           gateway.subscription.update(subscription.id, {
-            number_of_billing_cycles: subscription.current_billing_cycle
+            number_of_billing_cycles: subscription.current_billing_cycle,
           })
-          update(ends_at: subscription.billing_period_end_date)
+          update(status: :canceled, ends_at: subscription.billing_period_end_date.to_date)
         end
       rescue ::Braintree::BraintreeError => e
         raise Error, e.message
@@ -23,13 +23,13 @@ module Pay
 
       def braintree_cancel_now!
         gateway.subscription.cancel(processor_subscription.id)
-        update(ends_at: Time.zone.now)
+        update(status: :canceled, ends_at: Time.zone.now)
       rescue ::Braintree::BraintreeError => e
         raise Error, e.message
       end
 
       def braintree_resume
-        if cancelled? && on_trial?
+        if canceled? && on_trial?
           duration = trial_ends_at.to_date - Date.today
 
           owner.subscribe(
@@ -45,9 +45,11 @@ module Pay
 
           gateway.subscription.update(subscription.id, {
             never_expires: true,
-            number_of_billing_cycles: nil
+            number_of_billing_cycles: nil,
           })
         end
+
+        update(status: :active)
       rescue ::Braintree::BraintreeError => e
         raise Error, e.message
       end
@@ -58,8 +60,8 @@ module Pay
           return
         end
 
-        if !active?
-          owner.subscribe(name, plan, processor, trial_period: false)
+        unless active?
+          owner.subscribe(name: name, plan: plan, trial_period: false)
           return
         end
 
@@ -79,11 +81,11 @@ module Pay
           number_of_billing_cycles: nil,
           options: {
             prorate_charges: prorate?,
-          }
+          },
         })
 
         if result.success?
-          update(processor_plan: braintree_plan.id, ends_at: nil)
+          update(status: :active, processor_plan: braintree_plan.id, ends_at: nil)
         else
           raise Error, "Braintree failed to swap plans: #{result.message}"
         end
@@ -93,81 +95,81 @@ module Pay
 
       private
 
-        def gateway
-          Pay.braintree_gateway
-        end
+      def gateway
+        Pay.braintree_gateway
+      end
 
-        def would_change_billing_frequency?(plan)
-          plan.billing_frequency != find_braintree_plan(processor_plan).billing_frequency
-        end
+      def would_change_billing_frequency?(plan)
+        plan.billing_frequency != find_braintree_plan(processor_plan).billing_frequency
+      end
 
-        def find_braintree_plan(id)
-          @braintree_plans ||= gateway.plan.all
-          @braintree_plans.find{ |p| p.id == id }
-        end
+      def find_braintree_plan(id)
+        @braintree_plans ||= gateway.plan.all
+        @braintree_plans.find { |p| p.id == id }
+      end
 
-        # Helper methods for swapping plans
-        def switching_to_monthly_plan?(current_plan, plan)
-          current_plan.billing_frequency == 12 && plan.billing_frequency == 1
-        end
+      # Helper methods for swapping plans
+      def switching_to_monthly_plan?(current_plan, plan)
+        current_plan.billing_frequency == 12 && plan.billing_frequency == 1
+      end
 
-        def discount_for_switching_to_monthly(current_plan, plan)
-          cycles = (money_remaining_on_yearly_plan(current_plan) / plan.price).floor
-          OpenStruct.new(
-            amount: plan.price,
-            number_of_billing_cycles: cycles
-          )
-        end
+      def discount_for_switching_to_monthly(current_plan, plan)
+        cycles = (money_remaining_on_yearly_plan(current_plan) / plan.price).floor
+        OpenStruct.new(
+          amount: plan.price,
+          number_of_billing_cycles: cycles
+        )
+      end
 
-        def money_remaining_on_yearly_plan(current_plan)
-          end_date = processor_subscription.billing_period_end_date.to_date
-          (current_plan.price / 365) * (end_date - Date.today)
-        end
+      def money_remaining_on_yearly_plan(current_plan)
+        end_date = processor_subscription.billing_period_end_date.to_date
+        (current_plan.price / 365) * (end_date - Date.today)
+      end
 
-        def discount_for_switching_to_yearly
-          amount = 0
+      def discount_for_switching_to_yearly
+        amount = 0
 
-          processor_subscription.discounts.each do |discount|
-            if discount.id == 'plan-credit'
-              amount += discount.amount * discount.number_of_billing_cycles
-            end
+        processor_subscription.discounts.each do |discount|
+          if discount.id == "plan-credit"
+            amount += discount.amount * discount.number_of_billing_cycles
           end
-
-          OpenStruct.new(
-            amount: amount,
-            number_of_billing_cycles: 1
-          )
         end
 
-        def swap_across_frequencies(plan)
-          current_plan = find_braintree_plan(processor_plan)
-
-          discount = if switching_to_monthly_plan?(current_plan, plan)
-                       discount_for_switching_to_monthly(current_plan, plan)
-                     else
-                       discount_for_switching_to_yearly
-                     end
-
-          options = {}
-
-          if discount.amount > 0 && discount.number_of_billing_cycles > 0
-            options = {
-              discounts: {
-                add: [
-                  {
-                    inherited_from_id: 'plan-credit',
-                    amount: discount.amount,
-                    number_of_billing_cycles: discount.number_of_billing_cycles
-                  }
-                ]
-              }
-            }
-          end
+        OpenStruct.new(
+          amount: amount,
+          number_of_billing_cycles: 1
+        )
+      end
 
-          cancel_now!
+      def swap_across_frequencies(plan)
+        current_plan = find_braintree_plan(processor_plan)
 
-          owner.subscribe(options.merge(name: name, plan: plan.id))
+        discount = if switching_to_monthly_plan?(current_plan, plan)
+          discount_for_switching_to_monthly(current_plan, plan)
+        else
+          discount_for_switching_to_yearly
         end
+
+        options = {}
+
+        if discount.amount > 0 && discount.number_of_billing_cycles > 0
+          options = {
+            discounts: {
+              add: [
+                {
+                  inherited_from_id: "plan-credit",
+                  amount: discount.amount,
+                  number_of_billing_cycles: discount.number_of_billing_cycles,
+                },
+              ],
+            },
+          }
+        end
+
+        cancel_now!
+
+        owner.subscribe(options.merge(name: name, plan: plan.id))
+      end
     end
   end
 end

data/lib/pay/braintree.rb

@@ -1,7 +1,7 @@
-require 'pay/env'
-require 'pay/braintree/billable'
-require 'pay/braintree/charge'
-require 'pay/braintree/subscription'
+require "pay/env"
+require "pay/braintree/billable"
+require "pay/braintree/charge"
+require "pay/braintree/subscription"
 
 module Pay
   module Braintree
@@ -13,7 +13,7 @@ module Pay
       Pay.braintree_gateway = ::Braintree::Gateway.new(
         environment: environment.to_sym,
         merchant_id: merchant_id,
-        public_key:  public_key,
+        public_key: public_key,
         private_key: private_key
       )
 
@@ -35,7 +35,7 @@ module Pay
     end
 
     def environment
-      find_value_by_name(:braintree, :environment) || 'sandbox'
+      find_value_by_name(:braintree, :environment) || "sandbox"
     end
   end
 end

data/lib/pay/engine.rb

@@ -2,35 +2,35 @@
 
 # rubocop:disable Lint/HandleExceptions
 begin
-  require 'braintree'
+  require "braintree"
 rescue LoadError
 end
 
 begin
-  require 'stripe'
-  require 'stripe_event'
+  require "stripe"
+  require "stripe_event"
 rescue LoadError
 end
 # rubocop:enable Lint/HandleExceptions
 
 module Pay
   class Engine < ::Rails::Engine
-    engine_name 'pay'
+    engine_name "pay"
 
-    initializer 'pay.processors' do |app|
+    initializer "pay.processors" do |app|
       # Include processor backends
-      require 'pay/stripe'    if defined? ::Stripe
-      require 'pay/braintree' if defined? ::Braintree
+      require "pay/stripe" if defined? ::Stripe
+      require "pay/braintree" if defined? ::Braintree
 
-      if Pay.automount_webhook_routes
+      if Pay.automount_routes
         app.routes.append do
-          mount Pay::Engine, at: Pay.webhooks_path, as: 'pay'
+          mount Pay::Engine, at: Pay.routes_path, as: "pay"
         end
       end
     end
 
     config.to_prepare do
-      Pay::Stripe.setup    if defined? ::Stripe
+      Pay::Stripe.setup if defined? ::Stripe
       Pay::Braintree.setup if defined? ::Braintree
 
       Pay.charge_model.include Pay::Receipts if defined? ::Receipts::Receipt

data/lib/pay/env.rb

@@ -1,6 +1,5 @@
 module Pay
   module Env
-
     private
 
     # Search for environment variables

data/lib/pay/payment.rb

@@ -0,0 +1,52 @@
+module Pay
+  class Payment
+    attr_reader :intent
+
+    delegate :id, :amount, :client_secret, :status, :confirm, to: :intent
+
+    def self.from_id(id)
+      intent = id.start_with?("seti_") ? ::Stripe::SetupIntent.retrieve(id) : ::Stripe::PaymentIntent.retrieve(id)
+      new(intent)
+    end
+
+    def initialize(intent)
+      @intent = intent
+    end
+
+    def requires_payment_method?
+      status == "requires_payment_method"
+    end
+
+    def requires_action?
+      status == "requires_action"
+    end
+
+    def canceled?
+      status == "canceled"
+    end
+
+    def cancelled?
+      canceled?
+    end
+
+    def succeeded?
+      status == "succeeded"
+    end
+
+    def payment_intent?
+      intent.is_a?(::Stripe::PaymentIntent)
+    end
+
+    def setup_intent?
+      intent.is_a?(::Stripe::SetupIntent)
+    end
+
+    def validate
+      if requires_payment_method?
+        raise Pay::InvalidPaymentMethod.new(self)
+      elsif requires_action?
+        raise Pay::ActionRequired.new(self)
+      end
+    end
+  end
+end

data/lib/pay/receipts.rb

@@ -1,7 +1,7 @@
 module Pay
   module Receipts
     def filename
-      "receipt-#{created_at.strftime('%Y-%m-%d')}.pdf"
+      "receipt-#{created_at.strftime("%Y-%m-%d")}.pdf"
     end
 
     def product
@@ -18,9 +18,9 @@ module Pay
         id: id,
         product: product,
         company: {
-          name:    Pay.business_name,
+          name: Pay.business_name,
           address: Pay.business_address,
-          email:   Pay.support_email,
+          email: Pay.support_email,
         },
         line_items: line_items
       )
@@ -28,11 +28,11 @@ module Pay
 
     def line_items
       line_items = [
-        ["Date",           created_at.to_s],
+        ["Date", created_at.to_s],
         ["Account Billed", "#{owner.name} (#{owner.email})"],
-        ["Product",        product],
-        ["Amount",         ActionController::Base.helpers.number_to_currency(amount / 100.0)],
-        ["Charged to",     charged_to],
+        ["Product", product],
+        ["Amount", ActionController::Base.helpers.number_to_currency(amount / 100.0)],
+        ["Charged to", charged_to],
       ]
       line_items << ["Additional Info", owner.extra_billing_info] if owner.extra_billing_info?
       line_items

data/lib/pay/stripe/billable.rb

@@ -14,21 +14,32 @@ module Pay
         raise Error, e.message
       end
 
+      def create_setup_intent
+        ::Stripe::SetupIntent.create(
+          customer: processor_id,
+          usage: :off_session,
+        )
+      end
+
       # Handles Billable#charge
       #
       # Returns Pay::Charge
-      def create_stripe_charge(amount, options={})
+      def create_stripe_charge(amount, options = {})
+        customer = stripe_customer
         args = {
           amount: amount,
-          currency: 'usd',
+          confirm: true,
+          confirmation_method: :automatic,
+          currency: "usd",
           customer: customer.id,
-          description: customer_name,
+          payment_method: customer.invoice_settings.default_payment_method,
         }.merge(options)
 
-        stripe_charge = ::Stripe::Charge.create(args)
+        payment_intent = ::Stripe::PaymentIntent.create(args)
+        Pay::Payment.new(payment_intent).validate
 
-        # Save the charge to the db, returns Charge
-        Pay::Stripe::Webhooks::ChargeSucceeded.new.create_charge(self, stripe_charge)
+        # Create a new charge object
+        Stripe::Webhooks::ChargeSucceeded.new.create_charge(self, payment_intent.charges.first)
       rescue ::Stripe::StripeError => e
         raise Error, e.message
       end
@@ -36,10 +47,28 @@ module Pay
       # Handles Billable#subscribe
       #
       # Returns Pay::Subscription
-      def create_stripe_subscription(name, plan, options={})
-        opts = { plan: plan, trial_from_plan: true }.merge(options)
-        stripe_sub   = customer.subscriptions.create(opts)
-        subscription = create_subscription(stripe_sub, 'stripe', name, plan)
+      def create_stripe_subscription(name, plan, options = {})
+        opts = {
+          expand: ["pending_setup_intent", "latest_invoice.payment_intent"],
+          items: [plan: plan],
+          off_session: true,
+        }.merge(options)
+
+        # Inherit trial from plan unless trial override was specified
+        opts[:trial_from_plan] = true unless opts[:trial_period_days]
+
+        stripe_sub = customer.subscriptions.create(opts)
+        subscription = create_subscription(stripe_sub, "stripe", name, plan, status: stripe_sub.status)
+
+        # 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
       rescue ::Stripe::StripeError => e
         raise Error, e.message
@@ -48,17 +77,15 @@ module Pay
       # Handles Billable#update_card
       #
       # Returns true if successful
-      def update_stripe_card(token)
+      def update_stripe_card(payment_method_id)
         customer = stripe_customer
-        token = ::Stripe::Token.retrieve(token)
 
-        return if token.card.id == customer.default_source
+        return true if payment_method_id == customer.invoice_settings.default_payment_method
 
-        card = customer.sources.create(source: token.id)
-        customer.default_source = card.id
-        customer.save
+        payment_method = ::Stripe::PaymentMethod.attach(payment_method_id, customer: customer.id)
+        ::Stripe::Customer.update(customer.id, invoice_settings: {default_payment_method: payment_method.id})
 
-        update_stripe_card_on_file(card)
+        update_stripe_card_on_file(payment_method.card)
         true
       rescue ::Stripe::StripeError => e
         raise Error, e.message
@@ -71,13 +98,13 @@ module Pay
         customer.save
       end
 
-      def stripe_subscription(subscription_id)
-        ::Stripe::Subscription.retrieve(subscription_id)
+      def stripe_subscription(subscription_id, options = {})
+        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id))
       end
 
-      def stripe_invoice!
+      def stripe_invoice!(options = {})
         return unless processor_id?
-        ::Stripe::Invoice.create(customer: processor_id).pay
+        ::Stripe::Invoice.create(options.merge(customer: processor_id)).pay
       end
 
       def stripe_upcoming_invoice
@@ -87,18 +114,18 @@ module Pay
       # Used by webhooks when the customer or source changes
       def sync_card_from_stripe
         stripe_cust = stripe_customer
-        default_source_id = stripe_cust.default_source
+        default_payment_method_id = stripe_cust.invoice_settings.default_payment_method
 
-        if default_source_id.present?
-          card = stripe_customer.sources.data.find{ |s| s.id == default_source_id }
+        if default_payment_method_id.present?
+          payment_method = ::Stripe::PaymentMethod.retrieve(default_payment_method_id)
           update(
-            card_type:      card.brand,
-            card_last4:     card.last4,
-            card_exp_month: card.exp_month,
-            card_exp_year:  card.exp_year
+            card_type: payment_method.card.brand,
+            card_last4: payment_method.card.last4,
+            card_exp_month: payment_method.card.exp_month,
+            card_exp_year: payment_method.card.exp_year
           )
 
-        # Customer has no default payment source
+        # Customer has no default payment method
         else
           update(card_type: nil, card_last4: nil)
         end
@@ -107,29 +134,33 @@ module Pay
       private
 
       def create_stripe_customer
-        customer = ::Stripe::Customer.create(email: email, source: card_token, description: customer_name)
-        update(processor: 'stripe', processor_id: customer.id)
+        customer = ::Stripe::Customer.create(email: email, description: customer_name)
+        update(processor: "stripe", processor_id: customer.id)
 
         # Update the user's card on file if a token was passed in
-        source = customer.sources.data.first
-        if source.present?
-          update_stripe_card_on_file customer.sources.retrieve(source.id)
+        if card_token.present?
+          ::Stripe::PaymentMethod.attach(card_token, {customer: customer.id})
+          customer.invoice_settings.default_payment_method = card_token
+          customer.save
+
+          update_stripe_card_on_file ::Stripe::PaymentMethod.retrieve(card_token).card
         end
 
         customer
       end
 
       def stripe_trial_end_date(stripe_sub)
+        # Times in Stripe are returned in UTC
         stripe_sub.trial_end.present? ? Time.at(stripe_sub.trial_end) : nil
       end
 
       # Save the card to the database as the user's current card
       def update_stripe_card_on_file(card)
         update!(
-          card_type:      card.brand,
-          card_last4:     card.last4,
+          card_type: card.brand.capitalize,
+          card_last4: card.last4,
           card_exp_month: card.exp_month,
-          card_exp_year:  card.exp_year
+          card_exp_year: card.exp_year
         )
 
         self.card_token = nil

data/lib/pay/stripe/charge.rb

@@ -1,6 +1,5 @@
 module Pay
   module Stripe
-
     module Charge
       extend ActiveSupport::Concern
 
@@ -25,6 +24,5 @@ module Pay
         raise Error, e.message
       end
     end
-
   end
 end

data/lib/pay/stripe/subscription.rb

@@ -10,15 +10,15 @@ module Pay
         subscription.cancel_at_period_end = true
         subscription.save
 
-        new_ends_at  = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
-        update(ends_at: new_ends_at)
+        new_ends_at = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
+        update(ends_at: new_ends_at, status: :canceled)
       rescue ::Stripe::StripeError => e
         raise Error, e.message
       end
 
       def stripe_cancel_now!
-        subscription = processor_subscription.delete
-        update(ends_at: Time.zone.now)
+        processor_subscription.delete
+        update(ends_at: Time.zone.now, status: :canceled)
       rescue ::Stripe::StripeError => e
         raise Error, e.message
       end
@@ -26,7 +26,7 @@ module Pay
       def stripe_resume
         subscription = processor_subscription
         subscription.plan = processor_plan
-        subscription.trial_end = on_trial? ? trial_ends_at.to_i : 'now'
+        subscription.trial_end = on_trial? ? trial_ends_at.to_i : "now"
         subscription.cancel_at_period_end = false
         subscription.save
       rescue ::Stripe::StripeError => e
@@ -35,9 +35,10 @@ module Pay
 
       def stripe_swap(plan)
         subscription = processor_subscription
+        subscription.cancel_at_period_end = false
         subscription.plan = plan
         subscription.prorate = prorate
-        subscription.trial_end = on_trial? ? trial_ends_at.to_i : 'now'
+        subscription.trial_end = on_trial? ? trial_ends_at.to_i : "now"
         subscription.quantity = quantity if quantity?
         subscription.save
       rescue ::Stripe::StripeError => e

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

@@ -1,7 +1,6 @@
 module Pay
   module Stripe
     module Webhooks
-
       class ChargeRefunded
         def call(event)
           object = event.data.object
@@ -19,7 +18,6 @@ module Pay
           end
         end
       end
-
     end
   end
 end

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

@@ -1,11 +1,10 @@
 module Pay
   module Stripe
     module Webhooks
-
       class ChargeSucceeded
         def call(event)
           object = event.data.object
-          user   = Pay.user_model.find_by(
+          user = Pay.user_model.find_by(
             processor: :stripe,
             processor_id: object.customer
           )
@@ -20,17 +19,17 @@ module Pay
 
         def create_charge(user, object)
           charge = user.charges.find_or_initialize_by(
-            processor:      :stripe,
-            processor_id:   object.id,
+            processor: :stripe,
+            processor_id: object.id,
           )
 
           charge.update(
-            amount:         object.amount,
-            card_last4:     object.source.last4,
-            card_type:      object.source.brand,
-            card_exp_month: object.source.exp_month,
-            card_exp_year:  object.source.exp_year,
-            created_at:     Time.zone.at(object.created)
+            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