pay 6.8.1 → 7.0.0

data/lib/pay/paddle_classic.rb

@@ -0,0 +1,82 @@
+module Pay
+  module PaddleClassic
+    autoload :Billable, "pay/paddle_classic/billable"
+    autoload :Charge, "pay/paddle_classic/charge"
+    autoload :Error, "pay/paddle_classic/error"
+    autoload :PaymentMethod, "pay/paddle_classic/payment_method"
+    autoload :Subscription, "pay/paddle_classic/subscription"
+
+    module Webhooks
+      autoload :SignatureVerifier, "pay/paddle_classic/webhooks/signature_verifier"
+      autoload :SubscriptionCreated, "pay/paddle_classic/webhooks/subscription_created"
+      autoload :SubscriptionCancelled, "pay/paddle_classic/webhooks/subscription_cancelled"
+      autoload :SubscriptionPaymentRefunded, "pay/paddle_classic/webhooks/subscription_payment_refunded"
+      autoload :SubscriptionPaymentSucceeded, "pay/paddle_classic/webhooks/subscription_payment_succeeded"
+      autoload :SubscriptionUpdated, "pay/paddle_classic/webhooks/subscription_updated"
+    end
+
+    extend Env
+
+    def self.enabled?
+      return false unless Pay.enabled_processors.include?(:paddle_classic) && defined?(::Paddle)
+
+      Pay::Engine.version_matches?(required: "~> 2.1", current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version ~> 2.1")
+    end
+
+    def self.client
+      @client ||= Paddle::Classic::Client.new(
+        vendor_id: vendor_id,
+        vendor_auth_code: vendor_auth_code,
+        sandbox: environment != "production"
+      )
+    end
+
+    def self.vendor_id
+      find_value_by_name(:paddle_classic, :vendor_id)
+    end
+
+    def self.vendor_auth_code
+      find_value_by_name(:paddle_classic, :vendor_auth_code)
+    end
+
+    def self.environment
+      find_value_by_name(:paddle_classic, :environment) || "production"
+    end
+
+    def self.public_key
+      find_value_by_name(:paddle_classic, :public_key)
+    end
+
+    def self.public_key_file
+      find_value_by_name(:paddle_classic, :public_key_file)
+    end
+
+    def self.public_key_base64
+      find_value_by_name(:paddle_classic, :public_key_base64)
+    end
+
+    def self.passthrough(owner:, **options)
+      options.merge(owner_sgid: owner.to_sgid.to_s).to_json
+    end
+
+    def self.parse_passthrough(passthrough)
+      JSON.parse(passthrough)
+    end
+
+    def self.owner_from_passthrough(passthrough)
+      GlobalID::Locator.locate_signed parse_passthrough(passthrough)["owner_sgid"]
+    rescue JSON::ParserError
+      nil
+    end
+
+    def self.configure_webhooks
+      Pay::Webhooks.configure do |events|
+        events.subscribe "paddle_classic.subscription_created", Pay::PaddleClassic::Webhooks::SubscriptionCreated.new
+        events.subscribe "paddle_classic.subscription_updated", Pay::PaddleClassic::Webhooks::SubscriptionUpdated.new
+        events.subscribe "paddle_classic.subscription_cancelled", Pay::PaddleClassic::Webhooks::SubscriptionCancelled.new
+        events.subscribe "paddle_classic.subscription_payment_succeeded", Pay::PaddleClassic::Webhooks::SubscriptionPaymentSucceeded.new
+        events.subscribe "paddle_classic.subscription_payment_refunded", Pay::PaddleClassic::Webhooks::SubscriptionPaymentRefunded.new
+      end
+    end
+  end
+end

data/lib/pay/receipts.rb

@@ -119,7 +119,7 @@ module Pay
         company: {
           name: Pay.business_name,
           address: Pay.business_address,
-          email: Pay.support_email.address,
+          email: Pay.support_email&.address,
           logo: Pay.business_logo
         },
         line_items: receipt_line_items

data/lib/pay/stripe/billable.rb

@@ -227,12 +227,16 @@ module Pay
           mode: "payment"
         }
 
-        # Embedded checkouts cannot use URLs
-        if options[:ui_mode] != "embedded"
+        # Hosted (the default) checkout sessions require a success_url and cancel_url
+        if ["", "hosted"].include? options[:ui_mode].to_s
           args[:success_url] = merge_session_id_param(options.delete(:success_url) || root_url)
           args[:cancel_url] = merge_session_id_param(options.delete(:cancel_url) || root_url)
         end
 
+        if options[:return_url]
+          args[:return_url] = merge_session_id_param(options.delete(:return_url))
+        end
+
         # Line items are optional
         if (line_items = options.delete(:line_items))
           quantity = options.delete(:quantity) || 1

data/lib/pay/stripe/payment_method.rb

@@ -64,6 +64,7 @@ module Pay
 
         {
           payment_method_type: payment_method.type,
+          email: details.try(:email), # Link
           brand: details.try(:brand)&.capitalize,
           last4: details.try(:last4).to_s,
           exp_month: details.try(:exp_month).to_s,

data/lib/pay/stripe/subscription.rb

@@ -10,6 +10,7 @@ module Pay
         :ends_at,
         :name,
         :on_trial?,
+        :past_due?,
         :pause_starts_at,
         :pause_starts_at?,
         :processor_id,
@@ -28,6 +29,11 @@ module Pay
         :current_period_end,
         to: :pay_subscription
 
+      def self.sync_from_checkout_session(session_id, stripe_account: nil)
+        checkout_session = ::Stripe::Checkout::Session.retrieve({id: session_id}, {stripe_account: stripe_account}.compact)
+        sync(checkout_session.subscription)
+      end
+
       def self.sync(subscription_id, object: nil, name: nil, stripe_account: nil, try: 0, retries: 1)
         # Skip loading the latest subscription details from the API if we already have it
         object ||= ::Stripe::Subscription.retrieve({id: subscription_id}.merge(expand_options), {stripe_account: stripe_account}.compact)
@@ -89,6 +95,17 @@ module Pay
           Time.at(object.current_period_end)
         end
 
+        # Sync payment method if directly attached to subscription
+        if object.default_payment_method
+          if object.default_payment_method.is_a? String
+            Pay::Stripe::PaymentMethod.sync(object.default_payment_method)
+            attributes[:payment_method_id] = object.default_payment_method
+          else
+            Pay::Stripe::PaymentMethod.sync(object.default_payment_method.id, object: object.default_payment_method)
+            attributes[:payment_method_id] = object.default_payment_method.id
+          end
+        end
+
         # Update or create the subscription
         pay_subscription = pay_customer.subscriptions.find_by(processor_id: object.id)
         if pay_subscription
@@ -130,6 +147,7 @@ module Pay
       def self.expand_options
         {
           expand: [
+            "default_payment_method",
             "pending_setup_intent",
             "latest_invoice.payment_intent",
             "latest_invoice.charge",
@@ -158,9 +176,28 @@ module Pay
         stripe_sub&.pending_setup_intent&.client_secret || stripe_sub&.latest_invoice&.payment_intent&.client_secret
       end
 
+      # Sets the default_payment_method on a subscription
+      # Pass an empty string to unset
+      def update_payment_method(id)
+        @stripe_subscription = ::Stripe::Subscription.update(processor_id, {default_payment_method: id}.merge(expand_options), stripe_options)
+        pay_subscription.update(payment_method_id: @stripe_subscription.default_payment_method&.id)
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+
+      # Marks a subscription to cancel at period end
+      #
+      # If subscription is already past_due, the subscription will be cancelled immediately
+      # To disable this, pass past_due_cancel_now: false
       def cancel(**options)
-        @stripe_subscription = ::Stripe::Subscription.update(processor_id, {cancel_at_period_end: true}.merge(expand_options), stripe_options)
-        pay_subscription.update(ends_at: (on_trial? ? trial_ends_at : Time.at(@stripe_subscription.current_period_end)))
+        return if canceled?
+
+        if past_due? && options.fetch(:past_due_cancel_now, true)
+          cancel_now!
+        else
+          @stripe_subscription = ::Stripe::Subscription.update(processor_id, {cancel_at_period_end: true}.merge(expand_options), stripe_options)
+          pay_subscription.update(ends_at: (on_trial? ? trial_ends_at : Time.at(@stripe_subscription.current_period_end)))
+        end
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -170,6 +207,8 @@ module Pay
       # cancel_now!(prorate: true)
       # cancel_now!(invoice_now: true)
       def cancel_now!(**options)
+        return if canceled?
+
         @stripe_subscription = ::Stripe::Subscription.cancel(processor_id, options.merge(expand_options), stripe_options)
         pay_subscription.update(ends_at: Time.current, status: :canceled)
       rescue ::Stripe::StripeError => e
@@ -243,8 +282,12 @@ module Pay
         )
       end
 
+      def resumable?
+        on_grace_period? || paused?
+      end
+
       def resume
-        unless on_grace_period? || paused?
+        unless resumable?
           raise StandardError, "You can only resume subscriptions within their grace period."
         end
 

data/lib/pay/stripe.rb

@@ -30,7 +30,7 @@ module Pay
 
     extend Env
 
-    REQUIRED_VERSION = "~> 9"
+    REQUIRED_VERSION = "~> 10"
 
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id
@@ -44,7 +44,6 @@ module Pay
 
     def self.setup
       ::Stripe.api_key = private_key
-      ::Stripe.api_version ||= "2023-08-16"
 
       # Used by Stripe to identify Pay for support
       ::Stripe.set_app_info("PayRails", partner_id: "pp_partner_IqhY0UExnJYLxg", version: Pay::VERSION, url: "https://github.com/pay-rails/pay")
@@ -123,13 +122,13 @@ module Pay
 
     def self.to_client_reference_id(record)
       raise ArgumentError, "#{record.class.name} does not include Pay. Allowed models: #{model_names.to_a.join(", ")}" unless model_names.include?(record.class.name)
-      [record.class.name, record.id].join("/")
+      [record.class.name, record.id].join("_")
     end
 
     def self.find_by_client_reference_id(client_reference_id)
       # If there is a client reference ID, make sure we have a Pay::Customer record
       # client_reference_id should be in the format of "User/1"
-      model_name, id = client_reference_id.split("/", 2)
+      model_name, id = client_reference_id.split("_", 2)
 
       # Only allow model names that use Pay
       return unless model_names.include?(model_name)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.8.1"
+  VERSION = "7.0.0"
 end

data/lib/pay.rb

@@ -17,7 +17,8 @@ module Pay
   # Payment processors
   autoload :Braintree, "pay/braintree"
   autoload :FakeProcessor, "pay/fake_processor"
-  autoload :Paddle, "pay/paddle"
+  autoload :PaddleBilling, "pay/paddle_billing"
+  autoload :PaddleClassic, "pay/paddle_classic"
   autoload :Stripe, "pay/stripe"
 
   autoload :Webhooks, "pay/webhooks"
@@ -55,7 +56,7 @@ module Pay
   @@routes_path = "/pay"
 
   mattr_accessor :enabled_processors
-  @@enabled_processors = [:stripe, :braintree, :paddle]
+  @@enabled_processors = [:stripe, :braintree, :paddle_billing, :paddle_classic]
 
   mattr_accessor :send_emails
   @@send_emails = true

data/lib/tasks/pay.rake

@@ -20,8 +20,8 @@ def sync_default_payment_method(pay_customer, retries: 2)
     when "stripe"
       payment_method_id = pay_customer.customer.invoice_settings.default_payment_method
       Pay::Stripe::PaymentMethod.sync(payment_method_id) if payment_method_id
-    when "paddle"
-      Pay::Paddle::PaymentMethod.sync(pay_customer: pay_customer)
+    when "paddle_classic"
+      Pay::PaddleClassic::PaymentMethod.sync(pay_customer: pay_customer)
     end
   rescue
     sleep 0.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,7 +44,8 @@ files:
 - app/controllers/pay/application_controller.rb
 - app/controllers/pay/payments_controller.rb
 - app/controllers/pay/webhooks/braintree_controller.rb
-- app/controllers/pay/webhooks/paddle_controller.rb
+- app/controllers/pay/webhooks/paddle_billing_controller.rb
+- app/controllers/pay/webhooks/paddle_classic_controller.rb
 - app/controllers/pay/webhooks/stripe_controller.rb
 - app/helpers/pay/application_helper.rb
 - app/jobs/pay/application_job.rb
@@ -103,20 +104,35 @@ files:
 - lib/pay/fake_processor/merchant.rb
 - lib/pay/fake_processor/payment_method.rb
 - lib/pay/fake_processor/subscription.rb
+- lib/pay/lemon_squeezy.rb
+- lib/pay/lemon_squeezy/billable.rb
+- lib/pay/lemon_squeezy/charge.rb
+- lib/pay/lemon_squeezy/error.rb
+- lib/pay/lemon_squeezy/payment_method.rb
+- lib/pay/lemon_squeezy/subscription.rb
+- lib/pay/lemon_squeezy/webhooks/subscription.rb
+- lib/pay/lemon_squeezy/webhooks/transaction_completed.rb
 - lib/pay/nano_id.rb
-- lib/pay/paddle.rb
-- lib/pay/paddle/billable.rb
-- lib/pay/paddle/charge.rb
-- lib/pay/paddle/error.rb
-- lib/pay/paddle/payment_method.rb
-- lib/pay/paddle/response.rb
-- lib/pay/paddle/subscription.rb
-- lib/pay/paddle/webhooks/signature_verifier.rb
-- lib/pay/paddle/webhooks/subscription_cancelled.rb
-- lib/pay/paddle/webhooks/subscription_created.rb
-- lib/pay/paddle/webhooks/subscription_payment_refunded.rb
-- lib/pay/paddle/webhooks/subscription_payment_succeeded.rb
-- lib/pay/paddle/webhooks/subscription_updated.rb
+- lib/pay/paddle_billing.rb
+- lib/pay/paddle_billing/billable.rb
+- lib/pay/paddle_billing/charge.rb
+- lib/pay/paddle_billing/error.rb
+- lib/pay/paddle_billing/payment_method.rb
+- lib/pay/paddle_billing/subscription.rb
+- lib/pay/paddle_billing/webhooks/subscription.rb
+- lib/pay/paddle_billing/webhooks/transaction_completed.rb
+- lib/pay/paddle_classic.rb
+- lib/pay/paddle_classic/billable.rb
+- lib/pay/paddle_classic/charge.rb
+- lib/pay/paddle_classic/error.rb
+- lib/pay/paddle_classic/payment_method.rb
+- lib/pay/paddle_classic/subscription.rb
+- lib/pay/paddle_classic/webhooks/signature_verifier.rb
+- lib/pay/paddle_classic/webhooks/subscription_cancelled.rb
+- lib/pay/paddle_classic/webhooks/subscription_created.rb
+- lib/pay/paddle_classic/webhooks/subscription_payment_refunded.rb
+- lib/pay/paddle_classic/webhooks/subscription_payment_succeeded.rb
+- lib/pay/paddle_classic/webhooks/subscription_updated.rb
 - lib/pay/payment.rb
 - lib/pay/receipts.rb
 - lib/pay/stripe.rb
@@ -168,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails

data/lib/pay/paddle/charge.rb

@@ -1,35 +0,0 @@
-module Pay
-  module Paddle
-    class Charge
-      attr_reader :pay_charge
-
-      delegate :processor_id, :customer, to: :pay_charge
-
-      def initialize(pay_charge)
-        @pay_charge = pay_charge
-      end
-
-      def charge
-        return unless customer.subscription
-        payments = PaddlePay::Subscription::Payment.list({subscription_id: customer.subscription.processor_id})
-        charges = payments.select { |p| p[:id].to_s == processor_id }
-        charges.try(:first)
-      rescue ::PaddlePay::PaddlePayError => e
-        raise Pay::Paddle::Error, e
-      end
-
-      def refund!(amount_to_refund)
-        return unless customer.subscription
-        payments = PaddlePay::Subscription::Payment.list({subscription_id: customer.subscription.processor_id, is_paid: 1})
-        if payments.count > 0
-          PaddlePay::Subscription::Payment.refund(payments.last[:id], {amount: amount_to_refund})
-          pay_charge.update(amount_refunded: amount_to_refund)
-        else
-          raise Error, "Payment not found"
-        end
-      rescue ::PaddlePay::PaddlePayError => e
-        raise Pay::Paddle::Error, e
-      end
-    end
-  end
-end

data/lib/pay/paddle.rb

@@ -1,80 +0,0 @@
-module Pay
-  module Paddle
-    autoload :Billable, "pay/paddle/billable"
-    autoload :Charge, "pay/paddle/charge"
-    autoload :Error, "pay/paddle/error"
-    autoload :PaymentMethod, "pay/paddle/payment_method"
-    autoload :Subscription, "pay/paddle/subscription"
-
-    module Webhooks
-      autoload :SignatureVerifier, "pay/paddle/webhooks/signature_verifier"
-      autoload :SubscriptionCreated, "pay/paddle/webhooks/subscription_created"
-      autoload :SubscriptionCancelled, "pay/paddle/webhooks/subscription_cancelled"
-      autoload :SubscriptionPaymentRefunded, "pay/paddle/webhooks/subscription_payment_refunded"
-      autoload :SubscriptionPaymentSucceeded, "pay/paddle/webhooks/subscription_payment_succeeded"
-      autoload :SubscriptionUpdated, "pay/paddle/webhooks/subscription_updated"
-    end
-
-    extend Env
-
-    def self.enabled?
-      return false unless Pay.enabled_processors.include?(:paddle) && defined?(::PaddlePay)
-
-      Pay::Engine.version_matches?(required: "~> 0.2", current: ::PaddlePay::VERSION) || (raise "[Pay] paddle gem must be version ~> 0.2")
-    end
-
-    def self.setup
-      ::PaddlePay.config.vendor_id = vendor_id
-      ::PaddlePay.config.vendor_auth_code = vendor_auth_code
-      ::PaddlePay.config.environment = environment
-    end
-
-    def self.vendor_id
-      find_value_by_name(:paddle, :vendor_id)
-    end
-
-    def self.vendor_auth_code
-      find_value_by_name(:paddle, :vendor_auth_code)
-    end
-
-    def self.environment
-      find_value_by_name(:paddle, :environment) || "production"
-    end
-
-    def self.public_key
-      find_value_by_name(:paddle, :public_key)
-    end
-
-    def self.public_key_file
-      find_value_by_name(:paddle, :public_key_file)
-    end
-
-    def self.public_key_base64
-      find_value_by_name(:paddle, :public_key_base64)
-    end
-
-    def self.passthrough(owner:, **options)
-      options.merge(owner_sgid: owner.to_sgid.to_s).to_json
-    end
-
-    def self.parse_passthrough(passthrough)
-      JSON.parse(passthrough)
-    end
-
-    def self.owner_from_passthrough(passthrough)
-      GlobalID::Locator.locate_signed parse_passthrough(passthrough)["owner_sgid"]
-    rescue JSON::ParserError
-      nil
-    end
-
-    def self.configure_webhooks
-      Pay::Webhooks.configure do |events|
-        events.subscribe "paddle.subscription_created", Pay::Paddle::Webhooks::SubscriptionCreated.new
-        events.subscribe "paddle.subscription_updated", Pay::Paddle::Webhooks::SubscriptionUpdated.new
-        events.subscribe "paddle.subscription_cancelled", Pay::Paddle::Webhooks::SubscriptionCancelled.new
-        events.subscribe "paddle.subscription_payment_succeeded", Pay::Paddle::Webhooks::SubscriptionPaymentSucceeded.new
-        events.subscribe "paddle.subscription_payment_refunded", Pay::Paddle::Webhooks::SubscriptionPaymentRefunded.new
-      end
-    end
-  end
-end