pay 2.2.2 → 2.4.3

data/app/models/pay/charge.rb

@@ -2,6 +2,9 @@ module Pay
   class Charge < ApplicationRecord
     self.table_name = Pay.chargeable_table
 
+    # Only serialize for non-json columns
+    serialize :data unless json_column?("data")
+
     # Associations
     belongs_to :owner, polymorphic: true
 
@@ -39,5 +42,9 @@ module Pay
     def paypal?
       braintree? && card_type == "PayPal"
     end
+
+    def paddle?
+      processor == "paddle"
+    end
   end
 end

data/app/models/pay/subscription.rb

@@ -2,7 +2,10 @@ module Pay
   class Subscription < ApplicationRecord
     self.table_name = Pay.subscription_table
 
-    STATUSES = %w[incomplete incomplete_expired trialing active past_due canceled unpaid]
+    STATUSES = %w[incomplete incomplete_expired trialing active past_due canceled unpaid paused]
+
+    # Only serialize for non-json columns
+    serialize :data unless json_column?("data")
 
     # Associations
     belongs_to :owner, polymorphic: true
@@ -26,6 +29,15 @@ module Pay
 
     attribute :prorate, :boolean, default: true
 
+    # Helpers for payment processors
+    %w[braintree stripe paddle].each do |processor_name|
+      define_method "#{processor_name}?" do
+        processor == processor_name
+      end
+
+      scope processor_name, -> { where(processor: processor_name) }
+    end
+
     def no_prorate
       self.prorate = false
     end
@@ -47,7 +59,8 @@ module Pay
     end
 
     def on_grace_period?
-      canceled? && Time.zone.now < ends_at
+      return unless processor?
+      send("#{processor}_on_grace_period?")
     end
 
     def active?
@@ -66,6 +79,14 @@ module Pay
       past_due? || incomplete?
     end
 
+    def paused?
+      send("#{processor}_paused?")
+    end
+
+    def pause
+      send("#{processor}_pause")
+    end
+
     def cancel
       send("#{processor}_cancel")
     end
@@ -75,13 +96,7 @@ module Pay
     end
 
     def resume
-      unless on_grace_period?
-        raise StandardError,
-          "You can only resume subscriptions within their grace period."
-      end
-
       send("#{processor}_resume")
-
       update(ends_at: nil, status: "active")
       self
     end

data/app/views/pay/user_mailer/payment_action_required.html.erb

@@ -1,6 +1,6 @@
 <h3>Extra confirmation is needed to process your payment</h3>
 <p>Your <%= Pay.business_name %> subscription requires confirmation to process your payment to continue access.</p>
 
-<p>You may confirm your payment via your account. If you have any questions, please hit reply and let us know.</p>
+<p><%= link_to "Click here to confirm your payment", pay.payment_url(params[:payment_intent_id]) %>. If you have any questions, please hit reply and let us know.</p>
 
 <p>- The <%= Pay.business_name %> Team</p>

data/app/views/pay/user_mailer/receipt.html.erb

@@ -5,13 +5,13 @@ Questions? Please reply to this email.<br/>
 ------------------------------------<br/>
 RECEIPT - SUBSCRIPTION<br/>
 <br/>
-Amount: USD <%= ActionController::Base.helpers.number_to_currency(@charge.amount / 100.0) %><br/>
+Amount: USD <%= ActionController::Base.helpers.number_to_currency(params[:charge].amount / 100.0) %><br/>
 <br/>
-Charged to: <%= @charge.charged_to %><br/>
-Transaction ID: <%= @charge.id %><br/>
-Date: <%= @charge.created_at %><br/>
-<% if @charge.owner.extra_billing_info? %>
-<%= @charge.owner.extra_billing_info %><br/>
+Charged to: <%= params[:charge].charged_to %><br/>
+Transaction ID: <%= params[:charge].id %><br/>
+Date: <%= params[:charge].created_at %><br/>
+<% if params[:charge].owner.extra_billing_info? %>
+<%= params[:charge].owner.extra_billing_info %><br/>
 <% end %>
 <br/>
 <br/>

data/app/views/pay/user_mailer/refund.html.erb

@@ -6,13 +6,13 @@ Questions? Please reply to this email.<br/>
 ------------------------------------<br/>
 RECEIPT - REFUND<br/>
 <br/>
-Amount: USD <%= ActionController::Base.helpers.number_to_currency(@charge.amount / 100.0) %><br/>
+Amount: USD <%= ActionController::Base.helpers.number_to_currency(params[:charge].amount / 100.0) %><br/>
 <br/>
-Refunded to: <%= @charge.charged_to %><br/>
-Transaction ID: <%= @charge.id %><br/>
-Date: <%= @charge.created_at %><br/>
-<% if @charge.owner.extra_billing_info? %>
-<%= @charge.owner.extra_billing_info %><br/>
+Refunded to: <%= params[:charge].charged_to %><br/>
+Transaction ID: <%= params[:charge].id %><br/>
+Date: <%= params[:charge].created_at %><br/>
+<% if params[:charge].owner.extra_billing_info? %>
+<%= params[:charge].owner.extra_billing_info %><br/>
 <% end %>
 <br/>
 <br/>

data/app/views/pay/user_mailer/subscription_renewing.html.erb

@@ -1,5 +1,5 @@
 <h3>Your upcoming subscription renewal</h3>
-<p>This is just a friendly reminder that your <%= Pay.business_name %> subscription will renew automatically on <%= @subscription %>.</p>
+<p>This is just a friendly reminder that your <%= Pay.business_name %> subscription will renew automatically on <%= l params[:date].to_date, format: :long %>.</p>
 
 <p>You may manage your subscription via your account. If you have any questions, please hit reply and let us know.</p>
 

data/config/locales/en.yml

@@ -15,3 +15,140 @@ en:
     success: The payment was successful.
   all_rights_reserved: All rights reserved.
   back: Go back
+  receipt:
+    date: Date
+    account_billed: Account Billed
+    product: Product
+    amount: Amount
+    charged_to: Charged to
+    additional_info: Additional Info
+  errors:
+    action_required: "This payment attempt failed because additional action is required before it can be completed."
+    invalid_payment: "This payment attempt failed because of an invalid payment method."
+    email_required: "Email is required to create a customer"
+    no_processor: "No payment processor selected. Make sure to set the %{class_name}'s `processor` attribute to either 'stripe' or 'braintree'."
+    stripe:
+      errors:
+        account_already_exists: The email address provided for the creation of a deferred account already has an account associated with it. Use the OAuth flow to connect the existing account to your platform.
+        account_country_invalid_address: The country of the business address provided does not match the country of the account. Businesses must be located in the same country as the account.
+        account_invalid: The account ID provided as a value for the Stripe-Account header is invalid. Check that your requests are specifying a valid account ID.
+        account_number_invalid: The bank account number provided is invalid (e.g., missing digits). Bank account information varies from country to country. We recommend creating validations in your entry forms based on the bank account formats we provide.
+        alipay_upgrade_required: This method for creating Alipay payments is not supported anymore. Please upgrade your integration to use Sources instead.
+        amount_too_large: The specified amount is greater than the maximum amount allowed. Use a lower amount and try again.
+        amount_too_small: The specified amount is less than the minimum amount allowed. Use a higher amount and try again.
+        api_key_expired: The API key provided has expired. Obtain your current API keys from the Dashboard and update your integration to use them.
+        authentication_required: The payment requires authentication to proceed. If your customer is off session, notify your customer to return to your application and complete the payment. If you provided the error_on_requires_action parameter, then your customer should try another card that does not require authentication.
+        balance_insufficient: The transfer or payout could not be completed because the associated account does not have a sufficient balance available. Create a new transfer or payout using an amount less than or equal to the account’s available balance.
+        bank_account_declined: The bank account provided can not be used to charge, either because it is not verified yet or it is not supported.
+        bank_account_exists: The bank account provided already exists on the specified Customer object. If the bank account should also be attached to a different customer, include the correct customer ID when making the request again.
+        bank_account_unusable: The bank account provided cannot be used for payouts. A different bank account must be used.
+        bank_account_unverified: Your Connect platform is attempting to share an unverified bank account with a connected account.
+        bank_account_verification_failed: The bank account cannot be verified, either because the microdeposit amounts provided do not match the actual amounts, or because verification has failed too many times.
+        bitcoin_upgrade_required: This method for creating Bitcoin payments is not supported anymore. Please upgrade your integration to use Sources instead.
+        card_decline_rate_limit_exceeded: This card has been declined too many times. You can try to charge this card again after 24 hours. We suggest reaching out to your customer to make sure they have entered all of their information correctly and that there are no issues with their card.
+        card_declined: The card has been declined. When a card is declined, the error returned also includes the decline_code attribute with the reason why the card was declined. Refer to our decline codes documentation to learn more.
+        charge_already_captured: The charge you’re attempting to capture has already been captured. Update the request with an uncaptured charge ID.
+        charge_already_refunded: The charge you’re attempting to refund has already been refunded. Update the request to use the ID of a charge that has not been refunded.
+        charge_disputed: The charge you’re attempting to refund has been charged back. Check the disputes documentation to learn how to respond to the dispute.
+        charge_exceeds_source_limit: This charge would cause you to exceed your rolling-window processing limit for this source type. Please retry the charge later, or contact us to request a higher processing limit.
+        charge_expired_for_capture: The charge cannot be captured as the authorization has expired. Auth and capture charges must be captured within seven days.
+        charge_invalid_parameter: One or more provided parameters was not allowed for the given operation on the Charge. Check our API reference or the returned error message to see which values were not correct for that Charge.
+        clearing_code_unsupported: The clearing code provided is not supported.
+        country_code_invalid: The country code provided was invalid.
+        country_unsupported: Your platform attempted to create a custom account in a country that is not yet supported. Make sure that users can only sign up in countries supported by custom accounts.
+        coupon_expired: The coupon provided for a subscription or order has expired. Either create a new coupon, or use an existing one that is valid.
+        customer_max_payment_methods: The maximum number of PaymentMethods for this Customer has been reached. Either detach some PaymentMethods from this Customer or proceed with a different Customer.
+        customer_max_subscriptions: The maximum number of subscriptions for a customer has been reached. Contact us if you are receiving this error.
+        email_invalid: The email address is invalid (e.g., not properly formatted). Check that the email address is properly formatted and only includes allowed characters.
+        expired_card: The card has expired. Check the expiration date or use a different card.
+        idempotency_key_in_use: The idempotency key provided is currently being used in another request. This occurs if your integration is making duplicate requests simultaneously.
+        incorrect_address: The card’s address is incorrect. Check the card’s address or use a different card.
+        incorrect_cvc: The card’s security code is incorrect. Check the card’s security code or use a different card.
+        incorrect_number: The card number is incorrect. Check the card’s number or use a different card.
+        incorrect_zip: The card’s postal code is incorrect. Check the card’s postal code or use a different card.
+        instant_payouts_unsupported: This card is not eligible for Instant Payouts. Try a debit card from a supported bank.
+        intent_invalid_state: Intent is not the state that is rquired to perform the operation.
+        intent_verification_method_missing: Intent does not have verification method specified in its PaymentMethodOptions object.
+        invalid_card_type: The card provided as an external account is not supported for payouts. Provide a non-prepaid debit card instead.
+        invalid_characters: This value provided to the field contains characters that are unsupported by the field.
+        invalid_charge_amount: The specified amount is invalid. The charge amount must be a positive integer in the smallest currency unit, and not exceed the minimum or maximum amount.
+        invalid_cvc: The card’s security code is invalid. Check the card’s security code or use a different card.
+        invalid_expiry_month: The card’s expiration month is incorrect. Check the expiration date or use a different card.
+        invalid_expiry_year: The card’s expiration year is incorrect. Check the expiration date or use a different card.
+        invalid_number: The card number is invalid. Check the card details or use a different card.
+        invalid_source_usage: The source cannot be used because it is not in the correct state (e.g., a charge request is trying to use a source with a pending, failed, or consumed source). Check the status of the source you are attempting to use.
+        invoice_no_customer_line_items: An invoice cannot be generated for the specified customer as there are no pending invoice items. Check that the correct customer is being specified or create any necessary invoice items first.
+        invoice_no_payment_method_types: An invoice cannot be finalized because there are no payment method types available to process the payment. Your invoice template settings or the invoice’s payment_settings might be restricting which payment methods are available, or you might need to activate more payment methods in the Dashboard.
+        invoice_no_subscription_line_items: An invoice cannot be generated for the specified subscription as there are no pending invoice items. Check that the correct subscription is being specified or create any necessary invoice items first.
+        invoice_not_editable: The specified invoice can no longer be edited. Instead, consider creating additional invoice items that will be applied to the next invoice. You can either manually generate the next invoice or wait for it to be automatically generated at the end of the billing cycle.
+        invoice_payment_intent_requires_action: This payment requires additional user action before it can be completed successfully. Payment can be completed using the PaymentIntent associated with the invoice. See this page for more details.
+        invoice_upcoming_none: There is no upcoming invoice on the specified customer to preview. Only customers with active subscriptions or pending invoice items have invoices that can be previewed.
+        livemode_mismatch: Test and live mode API keys, requests, and objects are only available within the mode they are in.
+        lock_timeout: This object cannot be accessed right now because another API request or Stripe process is currently accessing it. If you see this error intermittently, retry the request. If you see this error frequently and are making multiple concurrent requests to a single object, make your requests serially or at a lower rate. See the rate limit documentation for more details.
+        missing: Both a customer and source ID have been provided, but the source has not been saved to the customer. To create a charge for a customer with a specified source, you must first save the card details.
+        not_allowed_on_standard_account: Transfers and payouts on behalf of a Standard connected account are not allowed.
+        order_creation_failed: The order could not be created. Check the order details and then try again.
+        order_required_settings: The order could not be processed as it is missing required information. Check the information provided and try again.
+        order_status_invalid: The order cannot be updated because the status provided is either invalid or does not follow the order lifecycle (e.g., an order cannot transition from created to fulfilled without first transitioning to paid).
+        order_upstream_timeout: The request timed out. Try again later.
+        out_of_inventory: The SKU is out of stock. If more stock is available, update the SKU’s inventory quantity and try again.
+        parameter_invalid_empty: One or more required values were not provided. Make sure requests include all required parameters.
+        parameter_invalid_integer: One or more of the parameters requires an integer, but the values provided were a different type. Make sure that only supported values are provided for each attribute. Refer to our API documentation to look up the type of data each attribute supports.
+        parameter_invalid_string_blank: One or more values provided only included whitespace. Check the values in your request and update any that contain only whitespace.
+        parameter_invalid_string_empty: One or more required string values is empty. Make sure that string values contain at least one character.
+        parameter_missing: One or more required values are missing. Check our API documentation to see which values are required to create or modify the specified resource.
+        parameter_unknown: The request contains one or more unexpected parameters. Remove these and try again.
+        parameters_exclusive: Two or more mutually exclusive parameters were provided. Check our API documentation or the returned error message to see which values are permitted when creating or modifying the specified resource.
+        payment_intent_action_required: The provided payment method requires customer actions to complete, but error_on_requires_action was set. If you’d like to add this payment method to your integration, we recommend that you first upgrade your integration to handle actions.
+        payment_intent_authentication_failure: The provided payment method has failed authentication. Provide a new payment method to attempt to fulfill this PaymentIntent again.
+        payment_intent_incompatible_payment_method: The PaymentIntent expected a payment method with different properties than what was provided.
+        payment_intent_invalid_parameter: One or more provided parameters was not allowed for the given operation on the PaymentIntent. Check our API reference or the returned error message to see which values were not correct for that PaymentIntent.
+        payment_intent_payment_attempt_failed: The latest payment attempt for the PaymentIntent has failed. Check the last_payment_error property on the PaymentIntent for more details, and provide a new payment method to attempt to fulfill this PaymentIntent again.
+        payment_intent_unexpected_state: The PaymentIntent’s state was incompatible with the operation you were trying to perform.
+        payment_method_invalid_parameter: Invalid parameter was provided in the payment method object. Check our API documentation or the returned error message for more context.
+        payment_method_provider_decline: The payment was declined by the issuer or customer. Check the last_payment_error property on the PaymentIntent for more details, and provide a new payment method to attempt to fulfill this PaymentIntent again.
+        payment_method_provider_timeout: The payment method failed due to a timeout. Check the last_payment_error property on the PaymentIntent for more details, and provide a new payment method to attempt to fulfill this PaymentIntent again.
+        payment_method_unactivated: The operation cannot be performed as the payment method used has not been activated. Activate the payment method in the Dashboard, then try again.
+        payment_method_unexpected_state: The provided payment method’s state was incompatible with the operation you were trying to perform. Confirm that the payment method is in an allowed state for the given operation before attempting to perform it.
+        payment_method_unsupported_type: The API only supports payment methods of certain types.
+        payouts_not_allowed: Payouts have been disabled on the connected account. Check the connected account’s status to see if any additional information needs to be provided, or if payouts have been disabled for another reason.
+        platform_api_key_expired: The API key provided by your Connect platform has expired. This occurs if your platform has either generated a new key or the connected account has been disconnected from the platform. Obtain your current API keys from the Dashboard and update your integration, or reach out to the user and reconnect the account.
+        postal_code_invalid: The postal code provided was incorrect.
+        processing_error: An error occurred while processing the card. Try again later or with a different payment method.
+        product_inactive: The product this SKU belongs to is no longer available for purchase.
+        rate_limit: Too many requests hit the API too quickly. We recommend an exponential backoff of your requests.
+        resource_already_exists: A resource with a user-specified ID (e.g., plan or coupon) already exists. Use a different, unique value for id and try again.
+        resource_missing: The ID provided is not valid. Either the resource does not exist, or an ID for a different resource has been provided.
+        routing_number_invalid: The bank routing number provided is invalid.
+        secret_key_required: The API key provided is a publishable key, but a secret key is required. Obtain your current API keys from the Dashboard and update your integration to use them.
+        sepa_unsupported_account: Your account does not support SEPA payments.
+        setup_attempt_failed: The latest setup attempt for the SetupIntent has failed. Check the last_setup_error property on the SetupIntent for more details, and provide a new payment method to attempt to set it up again.
+        setup_intent_authentication_failure: The provided payment method has failed authentication. Provide a new payment method to attempt to fulfill this SetupIntent again.
+        setup_intent_invalid_parameter: One or more provided parameters was not allowed for the given operation on the SetupIntent. Check our API reference or the returned error message to see which values were not correct for that SetupIntent.
+        setup_intent_unexpected_state: The SetupIntent’s state was incompatible with the operation you were trying to perform.
+        shipping_calculation_failed: Shipping calculation failed as the information provided was either incorrect or could not be verified.
+        sku_inactive: The SKU is inactive and no longer available for purchase. Use a different SKU, or make the current SKU active again.
+        state_unsupported: Occurs when providing the legal_entity information for a U.S. custom account, if the provided state is not supported. (This is mostly associated states and territories.)
+        tax_id_invalid: The tax ID number provided is invalid (e.g., missing digits). Tax ID information varies from country to country, but must be at least nine digits.
+        taxes_calculation_failed: Tax calculation for the order failed.
+        terminal_location_country_unsupported: Terminal is currently only available in some countries. Locations in your country cannot be created in livemode.
+        testmode_charges_only: Your account has not been activated and can only make test charges. Activate your account in the Dashboard to begin processing live charges.
+        tls_version_unsupported: Your integration is using an older version of TLS that is unsupported. You must be using TLS 1.2 or above.
+        token_already_used: The token provided has already been used. You must create a new token before you can retry this request.
+        token_in_use: The token provided is currently being used in another request. This occurs if your integration is making duplicate requests simultaneously.
+        transfers_not_allowed: The requested transfer cannot be created. Contact us if you are receiving this error.
+        upstream_order_creation_failed: The order could not be created. Check the order details and then try again.
+        url_invalid: The URL provided is invalid.
+    braintree:
+      authorization: "Either the data you submitted is malformed and does not match the API or the API key you used may not be authorized to perform this action."
+
+  pay:
+    user_mailer:
+      receipt:
+        subject: "Payment receipt"
+      refund:
+        subject: "Payment refunded"
+      subscription_renewing:
+        subject: "Your upcoming subscription renewal"
+      payment_action_required:
+        subject: "Confirm your payment"

data/config/routes.rb

@@ -4,4 +4,5 @@ Pay::Engine.routes.draw do
   resources :payments, only: [:show], module: :pay
   post "webhooks/stripe", to: "stripe_event/webhook#event"
   post "webhooks/braintree", to: "pay/webhooks/braintree#create"
+  post "webhooks/paddle", to: "pay/webhooks/paddle#create"
 end

data/db/migrate/20200603134434_add_data_to_pay_models.rb

@@ -0,0 +1,22 @@
+class AddDataToPayModels < ActiveRecord::Migration[4.2]
+  def change
+    add_column :pay_subscriptions, :data, data_column_type
+    add_column :pay_charges, :data, data_column_type
+  end
+
+  def data_column_type
+    default_hash = ActiveRecord::Base.configurations.default_hash
+
+    # Rails 6.1 uses a symbol key instead of a string
+    adapter = default_hash.dig(:adapter) || default_hash.dig("adapter")
+
+    case adapter
+    when "mysql2"
+      :json
+    when "postgresql"
+      :jsonb
+    else
+      :text
+    end
+  end
+end

data/lib/pay.rb

@@ -2,6 +2,7 @@ require "pay/engine"
 require "pay/billable"
 require "pay/receipts"
 require "pay/payment"
+require "pay/errors"
 
 module Pay
   # Define who owns the subscription
@@ -12,6 +13,9 @@ module Pay
   @@billable_class = "User"
   @@billable_table = @@billable_class.tableize
 
+  mattr_accessor :model_parent_class
+  @@model_parent_class = "ApplicationRecord"
+
   mattr_accessor :chargeable_class
   mattr_accessor :chargeable_table
   @@chargeable_class = "Pay::Charge"
@@ -44,6 +48,11 @@ module Pay
   mattr_accessor :automount_routes
   @@automount_routes = true
 
+  mattr_accessor :default_product_name
+  @@default_product_name = "default"
+  mattr_accessor :default_plan_name
+  @@default_plan_name = "default"
+
   mattr_accessor :routes_path
   @@routes_path = "/pay"
 
@@ -98,45 +107,4 @@ module Pay
       business_address &&
       support_email
   end
-
-  class Error < StandardError
-  end
-
-  class BraintreeError < Error
-    attr_reader :result
-
-    def initialize(result = nil)
-      @result = result
-    end
-  end
-
-  class BraintreeAuthorizationError < BraintreeError
-    def message
-      "Either the data you submitted is malformed and does not match the API or the API key you used may not be authorized to perform this action."
-    end
-  end
-
-  class InvalidPaymentMethod < Error
-    attr_reader :payment
-
-    def initialize(payment)
-      @payment = payment
-    end
-
-    def message
-      "This payment attempt failed because of an invalid payment method."
-    end
-  end
-
-  class ActionRequired < Error
-    attr_reader :payment
-
-    def initialize(payment)
-      @payment = payment
-    end
-
-    def message
-      "This payment attempt failed because additional action is required before it can be completed."
-    end
-  end
 end

data/lib/pay/billable.rb

@@ -19,6 +19,7 @@ module Pay
       include Pay::Billable::SyncEmail
       include Pay::Stripe::Billable if defined? ::Stripe
       include Pay::Braintree::Billable if defined? ::Braintree
+      include Pay::Paddle::Billable if defined? ::PaddlePay
 
       has_many :charges, class_name: Pay.chargeable_class, foreign_key: :owner_id, inverse_of: :owner, as: :owner
       has_many :subscriptions, class_name: Pay.subscription_class, foreign_key: :owner_id, inverse_of: :owner, as: :owner
@@ -35,7 +36,7 @@ module Pay
 
     def customer
       check_for_processor
-      raise Pay::Error, "Email is required to create a customer" if email.nil?
+      raise Pay::Error, I18n.t("errors.email_required") if email.nil?
 
       customer = send("#{processor}_customer")
       update_card(card_token) if card_token.present?
@@ -51,7 +52,7 @@ module Pay
       send("create_#{processor}_charge", amount_in_cents, options)
     end
 
-    def subscribe(name: "default", plan: "default", **options)
+    def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
       check_for_processor
       send("create_#{processor}_subscription", name, plan, options)
     end
@@ -62,7 +63,7 @@ module Pay
       send("update_#{processor}_card", token)
     end
 
-    def on_trial?(name: "default", plan: nil)
+    def on_trial?(name: Pay.default_product_name, plan: nil)
       return true if default_generic_trial?(name, plan)
 
       sub = subscription(name: name)
@@ -80,7 +81,7 @@ module Pay
       send("#{processor}_subscription", subscription_id, options)
     end
 
-    def subscribed?(name: "default", processor_plan: nil)
+    def subscribed?(name: Pay.default_product_name, processor_plan: nil)
       subscription = subscription(name: name)
 
       return false if subscription.nil?
@@ -89,13 +90,13 @@ module Pay
       subscription.active? && subscription.processor_plan == processor_plan
     end
 
-    def on_trial_or_subscribed?(name: "default", processor_plan: nil)
+    def on_trial_or_subscribed?(name: Pay.default_product_name, processor_plan: nil)
       on_trial?(name: name, plan: processor_plan) ||
         subscribed?(name: name, processor_plan: processor_plan)
     end
 
-    def subscription(name: "default")
-      subscriptions.for_name(name).last
+    def subscription(name: Pay.default_product_name)
+      subscriptions.loaded? ? subscriptions.reverse.detect { |s| s.name == name } : subscriptions.for_name(name).last
     end
 
     def invoice!(options = {})
@@ -118,14 +119,18 @@ module Pay
       braintree? && card_type == "PayPal"
     end
 
-    def has_incomplete_payment?(name: "default")
+    def paddle?
+      processor == "paddle"
+    end
+
+    def has_incomplete_payment?(name: Pay.default_product_name)
       subscription(name: name)&.has_incomplete_payment?
     end
 
     private
 
     def check_for_processor
-      raise StandardError, "No payment processor selected. Make sure to set the #{self.class.name}'s `processor` attribute to either 'stripe' or 'braintree'." unless processor
+      raise StandardError, I18n.t("errors.no_processor", class_name: self.class.name) unless processor
     end
 
     # Used for creating a Pay::Subscription in the database