pay 12.1.1 → 12.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc4265d73925a1e3134b5dafcdf452b131b8c478c2d9f04179148d313ac3275
-  data.tar.gz: 02f84e17b0216f30d5d38d92455adc13a9fd14fff96a84f5ee045041340dc999
+  metadata.gz: f77372d0f6b47b272a614d14cd91183c86b56dd02d2ecea25fd99ebccde3ec7b
+  data.tar.gz: 7c6c0b2196445b486b0519a14c1fe1a1123c81316822af0cc2fea3c891c731dd
 SHA512:
-  metadata.gz: fdf6618be0a7510e7cf015ee9e80a0e08b1550953c739fb978adfa1f3b74fe6ad58244deef09bdc52284bf92dcc1013e14daaa70d49d5516c85b0f63bcbbd701
-  data.tar.gz: be11d81512c0dc629be7eaf13070c6382fa1c30f3606bc05b0ce2c882a8b9b3bf5760b5e52be48efe2353e6a0773225b2cc473c1b5e194153e515a57e459f701
+  metadata.gz: e30e10e229a3af4a2dea25d532c209831c9388222226d97b1c576e4ddf3aee7509da290a2fa6f762dd6a687bea07962e5c309c22ce1cca84a337d6edc979057c
+  data.tar.gz: 4878549cc6eb89db69734ae9bbec6d2e9fa4d6027322af4e266e89c5a026ebb19c946a202b63327f55c3b3da8b9384112ace9310effe1c9552a4ede2efef0516

data/app/models/pay/paddle_billing/customer.rb

@@ -27,7 +27,7 @@ module Pay
           update!(processor_id: pc.id)
           pc
         end
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
@@ -55,7 +55,7 @@ module Pay
         charge = charges.find_or_initialize_by(processor_id: transaction.id)
         charge.update(attrs)
         charge
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 

data/app/models/pay/paddle_billing/subscription.rb

@@ -39,8 +39,6 @@ module Pay
             pay_customer.payment_methods.destroy_all
           when "trialing"
             attributes[:trial_ends_at] = Time.parse(subscription.next_billed_at) if subscription.next_billed_at
-          when "paused"
-            attributes[:pause_starts_at] = Time.parse(subscription.paused_at) if subscription.paused_at
           when "active", "past_due"
             attributes[:trial_ends_at] = nil
             attributes[:pause_starts_at] = nil
@@ -76,10 +74,12 @@ module Pay
       end
 
       # If a subscription is paused, cancel immediately
-      # Otherwise, cancel at period end
+      # Otherwise, cancel at period end. A scheduled pause is removed first
       def cancel(**options)
         return if canceled?
 
+        remove_scheduled_pause if will_pause?
+
         response = ::Paddle::Subscription.cancel(
           id: processor_id,
           effective_from: options.fetch(:effective_from, paused? ? "immediately" : "next_billing_period")
@@ -88,14 +88,12 @@ module Pay
           status: response.status,
           ends_at: response.scheduled_change&.effective_at || Time.current
         )
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
       def cancel_now!(**options)
         cancel(**options.merge(effective_from: "immediately"))
-      rescue ::Paddle::Error => e
-        raise Pay::PaddleBilling::Error, e
       end
 
       def change_quantity(quantity, **options)
@@ -110,24 +108,30 @@ module Pay
           proration_billing_mode: options.delete(:proration_billing_mode) || "prorated_immediately"
         )
         update(quantity: quantity)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
       # A subscription could be set to cancel or pause in the future
       # It is considered on grace period until the cancel or pause time begins
       def on_grace_period?
-        (canceled? && Time.current < ends_at) || (paused? && pause_starts_at? && Time.current < pause_starts_at)
+        (canceled? && ends_at.future?) || will_pause?
+      end
+
+      def will_pause?
+        pause_starts_at? && pause_starts_at.future?
       end
 
+      # Paddle keeps the status `active` until a scheduled pause starts, so check pause_starts_at as well
       def paused?
-        status == "paused"
+        status == "paused" || pause_starts_at?
       end
 
+      # Pauses the subscription at the end of the current billing period
       def pause
         response = ::Paddle::Subscription.pause(id: processor_id)
-        update!(status: :paused, pause_starts_at: response.scheduled_change.effective_at)
-      rescue ::Paddle::Error => e
+        update!(status: response.status, pause_starts_at: response.scheduled_change.effective_at)
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
@@ -141,15 +145,14 @@ module Pay
         end
 
         # Paddle Billing API only allows "resuming" subscriptions when they are paused
-        # So cancel the scheduled change if it is in the future
-        if paused? && pause_starts_at? && Time.current < pause_starts_at
-          ::Paddle::Subscription.update(id: processor_id, scheduled_change: nil)
+        if will_pause?
+          remove_scheduled_pause
         else
           ::Paddle::Subscription.resume(id: processor_id, effective_from: "immediately")
         end
 
         update(ends_at: nil, status: :active, pause_starts_at: nil)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
@@ -168,6 +171,14 @@ module Pay
         )
         update(processor_plan: plan, ends_at: nil, status: :active)
       end
+
+      private
+
+      # Paddle rejects changes to a subscription with a scheduled change
+      def remove_scheduled_pause
+        ::Paddle::Subscription.update(id: processor_id, scheduled_change: nil)
+        update!(pause_starts_at: nil)
+      end
     end
   end
 end

data/app/models/pay/paddle_classic/customer.rb

@@ -30,7 +30,7 @@ module Pay
         charge = charges.find_or_initialize_by(processor_id: response[:invoice_id])
         charge.update(attributes)
         charge
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 

data/app/models/pay/paddle_classic/payment_method.rb

@@ -13,7 +13,7 @@ module Pay
 
         payment_method.update!(attributes)
         payment_method
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 

data/app/models/pay/paddle_classic/subscription.rb

@@ -54,7 +54,7 @@ module Pay
 
       def api_record(**options)
         PaddleClassic.client.users.list(subscription_id: processor_id).data.try(:first)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -78,7 +78,7 @@ module Pay
 
         # Remove payment methods since customer cannot be reused after cancelling
         Pay::PaymentMethod.where(customer_id: customer_id).destroy_all
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -90,7 +90,7 @@ module Pay
 
         # Remove payment methods since customer cannot be reused after cancelling
         Pay::PaymentMethod.where(customer_id: customer_id).destroy_all
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -111,7 +111,7 @@ module Pay
       def pause
         response = PaddleClassic.client.users.pause(subscription_id: processor_id)
         update(status: :paused, pause_starts_at: Time.zone.parse(response.dig(:next_payment, :date)))
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -126,7 +126,7 @@ module Pay
 
         PaddleClassic.client.users.unpause(subscription_id: processor_id)
         update(ends_at: nil, status: :active, pause_starts_at: nil)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -138,7 +138,7 @@ module Pay
         PaddleClassic.client.users.update(subscription_id: processor_id, **attributes)
 
         update(processor_plan: plan, ends_at: nil, status: :active)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
     end

data/app/models/pay/stripe/customer.rb

@@ -133,7 +133,7 @@ module Pay
 
       # Used for creating Stripe Terminal charges
       def terminal_charge(amount, options = {})
-        create_payment_intent(amount, options.merge(payment_method_types: ["card_present"], capture_method: "manual"))
+        create_payment_intent(amount, options.merge(allowed_payment_method_types: ["card_present"], capture_method: "manual"))
       end
 
       def create_setup_intent(options = {})

data/app/models/pay/stripe/subscription.rb

@@ -217,7 +217,7 @@ module Pay
       end
 
       def paused?
-        pause_behavior == "void"
+        status_paused? || pause_behavior_void?
       end
 
       # Pauses a Stripe subscription
@@ -266,12 +266,22 @@ module Pay
         on_grace_period? || paused?
       end
 
-      def resume
+      # Resumes a subscription that is on its grace period or paused
+      #
+      # Subscriptions with a `paused` status are billed immediately and stay paused until that invoice is paid
+      # Raises Pay::InvalidPaymentMethod or Pay::ActionRequired if that payment needs a payment method or authentication
+      #
+      # resume(billing_cycle_anchor: "unchanged")
+      #
+      # https://docs.stripe.com/api/subscriptions/resume
+      def resume(**options)
         unless resumable?
-          raise Error, "You can only resume subscriptions within their grace period."
+          raise Error, "You can only resume subscriptions that are paused or within their grace period."
         end
 
-        if paused?
+        if status_paused?
+          @api_record = ::Stripe::Subscription.resume(processor_id, options.merge(expand_options), stripe_options)
+        elsif paused?
           unpause
         else
           @api_record = ::Stripe::Subscription.update(processor_id, {
@@ -281,6 +291,10 @@ module Pay
             stripe_options)
         end
         update(ends_at: nil, status: @api_record.status)
+
+        # Stripe resumes successfully even when the payment fails, leaving the subscription paused
+        validate_latest_payment if status_paused?
+        true
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -291,6 +305,11 @@ module Pay
         prorate = options.delete(:prorate) { true }
         proration_behavior = options.delete(:proration_behavior) || (prorate ? "always_invoice" : "none")
 
+        # Stripe 20 takes billing_cycle_anchor as {type: "now"} on updates, so convert the old "now" / "unchanged" form
+        if options[:billing_cycle_anchor].is_a?(String) || options[:billing_cycle_anchor].is_a?(Symbol)
+          options[:billing_cycle_anchor] = {type: options[:billing_cycle_anchor].to_s}
+        end
+
         @api_record = ::Stripe::Subscription.update(
           processor_id,
           {
@@ -303,9 +322,7 @@ module Pay
         )
 
         # Validate that swap was successful and handle SCA if needed
-        if (payment_intent_id = @api_record.latest_invoice.payments.first&.payment&.payment_intent)
-          Pay::Payment.from_id(payment_intent_id, stripe_account: stripe_account).validate
-        end
+        validate_latest_payment
 
         sync!(object: @api_record)
       rescue ::Stripe::StripeError => e
@@ -369,6 +386,23 @@ module Pay
 
       private
 
+      # Stripe sets the status to `paused` when a trial ends without a payment method
+      def status_paused?
+        status == "paused"
+      end
+
+      # Pausing collection with `void` leaves the status unchanged
+      def pause_behavior_void?
+        pause_behavior == "void"
+      end
+
+      # Raises Pay::InvalidPaymentMethod or Pay::ActionRequired if the latest invoice's payment is incomplete
+      def validate_latest_payment
+        if (payment_intent = latest_payment)
+          Pay::Payment.new(payment_intent, stripe_account: stripe_account).validate
+        end
+      end
+
       # Options for Stripe requests
       def stripe_options
         {stripe_account: stripe_account}.compact

data/app/views/pay/payments/show.html.erb

@@ -1,12 +1,14 @@
+<% scope = @payment.setup_intent? ? "pay.setup_intent" : "pay" %>
 <div
   data-controller="payment-intent"
   data-payment-intent-public-key-value="<%= Pay::Stripe.public_key %>"
   data-payment-intent-stripe-account-value="<%= @payment.stripe_account %>"
   data-payment-intent-client-secret-value="<%= @payment.client_secret %>"
   data-payment-intent-status-value="<%= @payment.status %>"
+  data-payment-intent-setup-intent-value="<%= @payment.setup_intent? %>"
   data-payment-intent-customer-value="<%= @payment.customer %>"
   data-payment-intent-name-missing-message-value="<%= t("pay.requires_action.name_missing") %>"
-  data-payment-intent-confirmed-message-value="<%= t("pay.requires_action.success") %>"
+  data-payment-intent-confirmed-message-value="<%= t("requires_action.success", scope: scope) %>"
   class="h-screen md:flex md:justify-center md:items-center">
   <div class="w-full max-w-lg">
     <!-- Status Messages -->
@@ -28,18 +30,18 @@
 
     <div class="bg-white rounded-lg shadow-xl p-4 sm:py-6 sm:px-10 mb-5">
       <% if @payment.succeeded? %>
-        <h1 class="text-xl mt-2 mb-4 text-gray-700"><%=t "pay.successful.header" %></h1>
-        <p class="mb-6"><%=t "pay.successful.description" %></p>
+        <h1 class="text-xl mt-2 mb-4 text-gray-700"><%=t "successful.header", scope: scope %></h1>
+        <p class="mb-6"><%=t "successful.description", scope: scope %></p>
 
       <% elsif @payment.canceled? %>
-        <h1 class="text-xl mt-2 mb-4 text-gray-700"><%=t "pay.cancelled.header" %></h1>
-        <p class="mb-6"><%=t "pay.cancelled.description" %></p>
+        <h1 class="text-xl mt-2 mb-4 text-gray-700"><%=t "cancelled.header", scope: scope %></h1>
+        <p class="mb-6"><%=t "cancelled.description", scope: scope %></p>
 
       <% else %>
         <div data-payment-intent-target="form" id="payment-elements">
           <!-- Instructions -->
-          <h1 class="text-xl mt-2 mb-4 text-gray-700"><%=t "pay.requires_action.header", amount: @payment.amount_with_currency %></h1>
-          <p class="mb-6"><%=t "pay.requires_action.description" %></p>
+          <h1 class="text-xl mt-2 mb-4 text-gray-700"><%=t "requires_action.header", scope: scope, amount: @payment.amount_with_currency %></h1>
+          <p class="mb-6"><%=t "requires_action.description", scope: scope %></p>
 
           <div data-payment-intent-target="cardFields" class="hidden">
             <!-- Name -->
@@ -53,7 +55,7 @@
 
           <!-- Pay Button -->
           <button data-payment-intent-target="button" data-action="click->payment-intent#confirmPayment" class="inline-block w-full px-4 py-3 mb-4 text-white rounded-lg bg-blue-400 hover:bg-blue-500">
-            <%=t "pay.requires_action.button", amount: @payment.amount_with_currency %>
+            <%=t "requires_action.button", scope: scope, amount: @payment.amount_with_currency %>
           </button>
         </div>
       <% end %>
@@ -79,6 +81,7 @@
       clientSecret: String,
       customer: String,
       status: String,
+      setupIntent: Boolean,
       nameMissingMessage: String,
       confirmedMessage: String,
       errorMessage: String,
@@ -104,7 +107,7 @@
       switch(this.statusValue) {
         case "requires_action":
           this.processingValue = true
-          this.stripe.confirmPayment({clientSecret: this.clientSecretValue, confirmParams: { return_url: document.location.href }}).then(this.handleConfirmResult.bind(this))
+          this.confirm({clientSecret: this.clientSecretValue})
           break
         case "requires_payment_method":
           this.cardFieldsTarget.classList.toggle("hidden", false)
@@ -114,7 +117,14 @@
 
     confirmPayment() {
       this.processingValue = true
-      this.stripe.confirmPayment({elements: this.elements, confirmParams: { return_url: document.location.href }}).then(this.handleConfirmResult.bind(this))
+      this.confirm({elements: this.elements})
+    }
+
+    // SetupIntents (saving a payment method) and PaymentIntents confirm through different Stripe.js methods
+    confirm(options) {
+      const params = {...options, confirmParams: { return_url: document.location.href }}
+      const result = this.setupIntentValue ? this.stripe.confirmSetup(params) : this.stripe.confirmPayment(params)
+      result.then(this.handleConfirmResult.bind(this))
     }
 
     handleConfirmResult(result) {
@@ -126,7 +136,8 @@
           this.errorMessageValue = this.nameMissingMessageValue
         } else {
           this.errorMessageValue = result.error.message
-          this.statusValue = result.error.payment_intent.status
+          const intent = result.error.payment_intent || result.error.setup_intent
+          if (intent) { this.statusValue = intent.status }
         }
       } else {
         this.completeValue = true

data/config/locales/en.yml

@@ -14,6 +14,18 @@ en:
       button: "Pay %{amount}"
       name_missing: "Please provide your name."
       success: "The payment was successful."
+    setup_intent:
+      successful:
+        header: "Payment Method Saved"
+        description: "Your payment method was successfully confirmed."
+      cancelled:
+        header: "Setup Cancelled"
+        description: "This payment method setup was cancelled."
+      requires_action:
+        header: "Confirm your payment method"
+        description: "Extra confirmation is needed to save your payment method. Please confirm it by filling out your payment details below."
+        button: "Save payment method"
+        success: "Your payment method was saved."
     all_rights_reserved: "All rights reserved."
     back: "Go back"
     refund: "Refund"

data/lib/pay/paddle_billing.rb

@@ -14,11 +14,13 @@ module Pay
 
     extend Env
 
+    REQUIRED_VERSION = "~> 3"
+
     def self.enabled?
       return false unless Pay.enabled_processors.include?(:paddle_billing) && defined?(::Paddle)
 
-      Pay::Engine.version_matches?(required: "~> 2.5",
-        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version ~> 2.5")
+      Pay::Engine.version_matches?(required: REQUIRED_VERSION,
+        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version #{REQUIRED_VERSION}")
     end
 
     def self.setup

data/lib/pay/paddle_classic.rb

@@ -18,11 +18,13 @@ module Pay
 
     extend Env
 
+    REQUIRED_VERSION = "~> 3"
+
     def self.enabled?
       return false unless Pay.enabled_processors.include?(:paddle_classic) && defined?(::Paddle)
 
-      Pay::Engine.version_matches?(required: "~> 2.5",
-        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version ~> 2.5")
+      Pay::Engine.version_matches?(required: REQUIRED_VERSION,
+        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version #{REQUIRED_VERSION}")
     end
 
     def self.client

data/lib/pay/payment.rb

@@ -19,6 +19,10 @@ module Pay
       @stripe_account = stripe_account
     end
 
+    def setup_intent?
+      intent.is_a?(::Stripe::SetupIntent)
+    end
+
     def requires_payment_method?
       status == "requires_payment_method"
     end
@@ -35,7 +39,9 @@ module Pay
       status == "succeeded"
     end
 
+    # SetupIntents save a payment method for later and have no amount
     def amount_with_currency
+      return if setup_intent?
       Pay::Currency.format(amount, currency: currency)
     end
 

data/lib/pay/stripe.rb

@@ -28,7 +28,7 @@ module Pay
 
     extend Env
 
-    REQUIRED_VERSION = "~> 19"
+    REQUIRED_VERSION = "~> 20"
 
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "12.1.1"
+  VERSION = "12.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 12.1.1
+  version: 12.3.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.18
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Payments engine for Ruby on Rails
 test_files: []