pay 2.6.7 → 2.7.0

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(processor_id)
+        ::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
 
@@ -23,20 +24,26 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
-      def cancel
-        subscription = processor_subscription
-        subscription.cancel_at_period_end = true
-        subscription.save
+      def subscription(**options)
+        ::Stripe::Subscription.retrieve(options.merge(id: processor_id))
+      end
 
-        new_ends_at = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
-        pay_subscription.update(ends_at: new_ends_at)
+      def cancel
+        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
+
+      def change_quantity(quantity)
+        ::Stripe::Subscription.update(processor_id, quantity: quantity)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -58,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.7"
+  VERSION = "2.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.7.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-07 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,6 +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/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
@@ -148,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
@@ -171,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
@@ -188,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
@@ -200,20 +208,6 @@ files:
 - lib/pay/stripe/webhooks/subscription_deleted.rb
 - lib/pay/stripe/webhooks/subscription_renewing.rb
 - lib/pay/stripe/webhooks/subscription_updated.rb
-- lib/pay/stripe_marketplace/billable.rb
-- lib/pay/stripe_marketplace/charge.rb
-- lib/pay/stripe_marketplace/error.rb
-- lib/pay/stripe_marketplace/subscription.rb
-- lib/pay/stripe_marketplace/webhooks/charge_refunded.rb
-- lib/pay/stripe_marketplace/webhooks/charge_succeeded.rb
-- lib/pay/stripe_marketplace/webhooks/customer_deleted.rb
-- lib/pay/stripe_marketplace/webhooks/customer_updated.rb
-- lib/pay/stripe_marketplace/webhooks/payment_action_required.rb
-- lib/pay/stripe_marketplace/webhooks/payment_method_updated.rb
-- lib/pay/stripe_marketplace/webhooks/subscription_created.rb
-- lib/pay/stripe_marketplace/webhooks/subscription_deleted.rb
-- lib/pay/stripe_marketplace/webhooks/subscription_renewing.rb
-- lib/pay/stripe_marketplace/webhooks/subscription_updated.rb
 - lib/pay/version.rb
 - lib/pay/webhooks.rb
 - lib/pay/webhooks/delegator.rb
@@ -236,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

data/lib/pay/stripe_marketplace/billable.rb

@@ -1,246 +0,0 @@
-module Pay
-  module StripeMarketplace
-    class Billable
-      include Rails.application.routes.url_helpers
-
-      attr_reader :billable
-
-      delegate :processor_id,
-        :processor_id?,
-        :email,
-        :customer_name,
-        :card_token,
-        to: :billable
-
-      class << self
-        def default_url_options
-          Rails.application.config.action_mailer.default_url_options || {}
-        end
-      end
-
-      def initialize(billable)
-        @billable = billable
-      end
-
-      # Handles Billable#customer
-      #
-      # Returns Stripe::Customer
-      def customer
-        if processor_id?
-          ::Stripe::Customer.retrieve(processor_id)
-        else
-          stripe_customer = ::Stripe::Customer.create(email: email, name: customer_name)
-          billable.update(processor: :stripe, processor_id: stripe_customer.id)
-
-          # 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.invoice_settings.default_payment_method = payment_method.id
-            stripe_customer.save
-
-            update_card_on_file ::Stripe::PaymentMethod.retrieve(card_token).card
-          end
-
-          stripe_customer
-        end
-      rescue ::Stripe::StripeError => e
-        raise Pay::Stripe::Error, e
-      end
-
-      # Handles Billable#charge
-      #
-      # Returns Pay::Charge
-      def charge(amount, options = {})
-        stripe_customer = customer
-        args = {
-          amount: amount,
-          confirm: true,
-          confirmation_method: :automatic,
-          currency: "usd",
-          customer: stripe_customer.id,
-          payment_method: stripe_customer.invoice_settings.default_payment_method
-        }.merge(options)
-
-        payment_intent = ::Stripe::PaymentIntent.create(args)
-        Pay::Payment.new(payment_intent).validate
-
-        # Create a new charge object
-        save_pay_charge(payment_intent.charges.first)
-      rescue ::Stripe::StripeError => e
-        raise Pay::Stripe::Error, e
-      end
-
-      # Handles Billable#subscribe
-      #
-      # Returns Pay::Subscription
-      def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
-        quantity = options.delete(:quantity) || 1
-        opts = {
-          expand: ["pending_setup_intent", "latest_invoice.payment_intent"],
-          items: [plan: plan, quantity: quantity],
-          off_session: true
-        }.merge(options)
-
-        # Inherit trial from plan unless trial override was specified
-        opts[:trial_from_plan] = true unless opts[:trial_period_days]
-
-        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)
-
-        # 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 Pay::Stripe::Error, e
-      end
-
-      # Handles Billable#update_card
-      #
-      # Returns true if successful
-      def update_card(payment_method_id)
-        stripe_customer = customer
-
-        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})
-
-        update_card_on_file(payment_method.card)
-        true
-      rescue ::Stripe::StripeError => e
-        raise Pay::Stripe::Error, e
-      end
-
-      def update_email!
-        ::Stripe::Customer.update(processor_id, {email: email, name: customer_name})
-      end
-
-      def processor_subscription(subscription_id, options = {})
-        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id))
-      end
-
-      def invoice!(options = {})
-        return unless processor_id?
-        ::Stripe::Invoice.create(options.merge(customer: processor_id)).pay
-      end
-
-      def upcoming_invoice
-        ::Stripe::Invoice.upcoming(customer: processor_id)
-      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
-        else
-          billable.update(card_type: nil, card_last4: nil)
-        end
-      end
-
-      def create_setup_intent
-        ::Stripe::SetupIntent.create(customer: processor_id, usage: :off_session)
-      end
-
-      def 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_card_on_file(card)
-        billable.update!(
-          card_type: card.brand.capitalize,
-          card_last4: card.last4,
-          card_exp_month: card.exp_month,
-          card_exp_year: card.exp_year
-        )
-
-        billable.card_token = nil
-      end
-
-      def save_pay_charge(object)
-        charge = billable.charges.find_or_initialize_by(processor: :stripe, processor_id: object.id)
-
-        charge.update(
-          amount: object.amount,
-          card_last4: object.payment_method_details.card.last4,
-          card_type: object.payment_method_details.card.brand,
-          card_exp_month: object.payment_method_details.card.exp_month,
-          card_exp_year: object.payment_method_details.card.exp_year,
-          created_at: Time.zone.at(object.created)
-        )
-
-        charge
-      end
-
-      # https://stripe.com/docs/api/checkout/sessions/create
-      #
-      # checkout(mode: "payment")
-      # checkout(mode: "setup")
-      # checkout(mode: "subscription")
-      #
-      # checkout(line_items: "price_12345", quantity: 2)
-      # checkout(line_items [{ price: "price_123" }, { price: "price_456" }])
-      # checkout(line_items, "price_12345", allow_promotion_codes: true)
-      #
-      def checkout(**options)
-        args = {
-          customer: processor_id,
-          payment_method_types: ["card"],
-          mode: "payment",
-          # These placeholder URLs will be replaced in a following step.
-          success_url: root_url,
-          cancel_url: root_url
-        }
-
-        # Line items are optional
-        if (line_items = options.delete(:line_items))
-          args[:line_items] = Array.wrap(line_items).map { |item|
-            if item.is_a? Hash
-              item
-            else
-              {price: item, quantity: options.fetch(:quantity, 1)}
-            end
-          }
-        end
-
-        ::Stripe::Checkout::Session.create(args.merge(options))
-      end
-
-      # https://stripe.com/docs/api/checkout/sessions/create
-      #
-      # checkout_charge(amount: 15_00, name: "T-shirt", quantity: 2)
-      #
-      def checkout_charge(amount:, name:, quantity: 1, **options)
-        checkout(
-          line_items: {
-            price_data: {
-              currency: options[:currency] || "usd",
-              product_data: {name: name},
-              unit_amount: amount
-            },
-            quantity: quantity
-          },
-          **options
-        )
-      end
-
-      def billing_portal(**options)
-        args = {
-          customer: processor_id,
-          return_url: options[:return_url] || root_url
-        }
-        ::Stripe::BillingPortal::Session.create(args.merge(options))
-      end
-    end
-  end
-end