pay 3.0.24 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b3ebc48aeb54c0c71ccb8570c00ca5194258982fc06f00a51e2b49211dd82f0
-  data.tar.gz: f13ea4e812837ce733f797b9165ad798a0920e80e95b201a26a83c12c5c91f1f
+  metadata.gz: cd5f149f88ae66352491ff4da889e6e252d491fa37467a1a7a05d635ef855f61
+  data.tar.gz: 970ca6f6183aba7795368d5b2b78c3ddb932498bd54af20567c467d126246e10
 SHA512:
-  metadata.gz: 44a72ba1d1c77004f2e98a20a0a6014030614be04027b6f2341d58523af3fb686bcef8ebdbde9233f52fc65c7578863430b60e2a0a73feadcf79d95043a94c38
-  data.tar.gz: acf91b1679dabc86e8199a28b5fd87a72a18362c8436dac3fc3318b624896bbce92b6936f8694250e4a46ca84c03defe3209e1d074273abae87fe96fcef4b448
+  metadata.gz: e7fd623efada808362cef4f67d1a66919a2a74103c69cf16c859d854dc5e4ef8aed9e58cccd6addc1b2328b663824d7fa0830144ec44bceff3c2fde32a6f7131
+  data.tar.gz: 27cad2d3b9a1fb239c5dc68282f728fadf07451b2a9c9aa29d77274077d52b608865a39f90de5d3416f69c418f75493a545f4f41f00b58bccf722a52dcfabf3e

data/README.md

@@ -2,7 +2,7 @@
 
 # 💳 Pay - Payments engine for Ruby on Rails
 
-[![Build Status](https://github.com/pay-rails/pay/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/pay.svg)](https://badge.fury.io/rb/pay) [![Tuple](https://img.shields.io/badge/Pairing%20with-Tuple-5A67D8)](https://tuple.app)
+[![Build Status](https://github.com/pay-rails/pay/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/pay.svg)](https://badge.fury.io/rb/pay)
 
 <img src="docs/images/stripe_partner_badge.svg" height="26px">
 

data/app/controllers/pay/webhooks/braintree_controller.rb

@@ -17,7 +17,7 @@ module Pay
       def queue_event(event)
         return unless Pay::Webhooks.delegator.listening?("braintree.#{event.kind}")
 
-        record = Pay::Webhook.create(
+        record = Pay::Webhook.create!(
           processor: :braintree,
           event_type: event.kind,
           event: {bt_signature: params[:bt_signature], bt_payload: params[:bt_payload]}

data/app/controllers/pay/webhooks/paddle_controller.rb

@@ -17,7 +17,7 @@ module Pay
       def queue_event(event)
         return unless Pay::Webhooks.delegator.listening?("paddle.#{params[:alert_name]}")
 
-        record = Pay::Webhook.create(processor: :paddle, event_type: params[:alert_name], event: event)
+        record = Pay::Webhook.create!(processor: :paddle, event_type: params[:alert_name], event: event)
         Pay::Webhooks::ProcessJob.perform_later(record)
       end
 

data/app/controllers/pay/webhooks/stripe_controller.rb

@@ -18,7 +18,7 @@ module Pay
       def queue_event(event)
         return unless Pay::Webhooks.delegator.listening?("stripe.#{event.type}")
 
-        record = Pay::Webhook.create(processor: :stripe, event_type: event.type, event: event)
+        record = Pay::Webhook.create!(processor: :stripe, event_type: event.type, event: event)
         Pay::Webhooks::ProcessJob.perform_later(record)
       end
 

data/app/jobs/pay/customer_sync_job.rb

@@ -1,7 +1,5 @@
 module Pay
   class CustomerSyncJob < ApplicationJob
-    queue_as :default
-
     def perform(pay_customer_id)
       Pay::Customer.find(pay_customer_id).update_customer!
     rescue ActiveRecord::RecordNotFound

data/app/mailers/pay/application_mailer.rb

@@ -1,6 +1,6 @@
 module Pay
   class ApplicationMailer < ActionMailer::Base
-    default from: Pay.support_email
+    default from: Pay.support_email || ApplicationMailer.default_params[:from]
     layout "mailer"
   end
 end

data/app/mailers/pay/user_mailer.rb

@@ -1,8 +1,8 @@
 module Pay
-  class UserMailer < ApplicationMailer
+  class UserMailer < Pay.parent_mailer.constantize
     def receipt
-      if params[:charge].respond_to? :receipt
-        attachments[params[:charge].filename] = params[:charge].receipt
+      if params[:pay_charge].respond_to? :receipt
+        attachments[params[:pay_charge].filename] = params[:pay_charge].receipt
       end
 
       mail to: to

data/app/models/pay/charge.rb

@@ -17,6 +17,7 @@ module Pay
 
     # Store the payment method kind (card, paypal, etc)
     store_accessor :data, :paddle_receipt_url
+    store_accessor :data, :stripe_receipt_url
     store_accessor :data, :stripe_account
 
     # Payment method attributes
@@ -29,6 +30,18 @@ module Pay
     store_accessor :data, :username # Venmo
     store_accessor :data, :bank
 
+    store_accessor :data, :amount_captured
+    store_accessor :data, :invoice_id
+    store_accessor :data, :payment_intent_id
+    store_accessor :data, :period_start
+    store_accessor :data, :period_end
+    store_accessor :data, :line_items
+    store_accessor :data, :subtotal # subtotal amount in cents
+    store_accessor :data, :tax # total tax amount in cents
+    store_accessor :data, :discounts # array of discount IDs applied to the Stripe Invoice
+    store_accessor :data, :total_discount_amounts # array of discount details
+    store_accessor :data, :total_tax_amounts # array of tax details for each jurisdiction
+
     # Helpers for payment processors
     %w[braintree stripe paddle fake_processor].each do |processor_name|
       define_method "#{processor_name}?" do
@@ -38,6 +51,8 @@ module Pay
       scope processor_name, -> { where(processor: processor_name) }
     end
 
+    delegate :capture, :credit_note!, :credit_notes, to: :payment_processor
+
     def self.find_by_processor_and_id(processor, processor_id)
       joins(:customer).find_by(processor_id: processor_id, pay_customers: {processor: processor})
     end
@@ -54,6 +69,10 @@ module Pay
       payment_processor.charge
     end
 
+    def captured?
+      amount_captured > 0
+    end
+
     def refund!(refund_amount = nil)
       refund_amount ||= amount
       payment_processor.refund!(refund_amount)
@@ -111,5 +130,9 @@ module Pay
         payment_method_type&.titleize
       end
     end
+
+    def line_items
+      Array.wrap(super)
+    end
   end
 end

data/app/models/pay/customer.rb

@@ -41,12 +41,8 @@ module Pay
     end
 
     def subscribed?(name: Pay.default_product_name, processor_plan: nil)
-      subscription = subscription(name: name)
-
-      return false if subscription.nil?
-      return subscription.active? if processor_plan.nil?
-
-      subscription.active? && subscription.processor_plan == processor_plan
+      query = {name: name, processor_plan: processor_plan}.compact
+      subscriptions.active.where(query).exists?
     end
 
     def on_trial?(name: Pay.default_product_name, plan: nil)

data/app/models/pay/merchant.rb

@@ -16,5 +16,11 @@ module Pay
       return if processor.blank?
       @pay_processor ||= self.class.pay_processor_for(processor).new(self)
     end
+
+    def onboarding_complete?
+      ActiveModel::Type::Boolean.new.cast(
+        (data.presence || {})["onboarding_complete"]
+      )
+    end
   end
 end

data/app/models/pay/subscription.rb

@@ -11,7 +11,7 @@ module Pay
     scope :on_trial, -> { where.not(trial_ends_at: nil).where("#{table_name}.trial_ends_at > ?", Time.zone.now) }
     scope :cancelled, -> { where.not(ends_at: nil) }
     scope :on_grace_period, -> { cancelled.where("#{table_name}.ends_at > ?", Time.zone.now) }
-    scope :active, -> { where(ends_at: nil).or(on_grace_period).or(on_trial) }
+    scope :active, -> { where(status: ["trialing", "active"], ends_at: nil).or(on_grace_period).or(on_trial) }
     scope :incomplete, -> { where(status: :incomplete) }
     scope :past_due, -> { where(status: :past_due) }
     scope :with_active_customer, -> { joins(:customer).merge(Customer.active) }
@@ -24,6 +24,10 @@ module Pay
     store_accessor :data, :paddle_cancel_url
     store_accessor :data, :paddle_paused_from
     store_accessor :data, :stripe_account
+    store_accessor :data, :metered
+    store_accessor :data, :subscription_items
+    store_accessor :data, :pause_behavior
+    store_accessor :data, :pause_resumes_at
 
     attribute :prorate, :boolean, default: true
 
@@ -31,15 +35,10 @@ module Pay
     validates :name, presence: true
     validates :processor_id, presence: true, uniqueness: {scope: :customer_id, case_sensitive: true}
     validates :processor_plan, presence: true
-    validates :quantity, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 1}
+    validates :quantity, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
     validates :status, presence: true
 
-    delegate :on_grace_period?,
-      :paused?,
-      :pause,
-      :cancel,
-      :cancel_now!,
-      to: :payment_processor
+    delegate_missing_to :payment_processor
 
     # Helper methods for payment processors
     %w[braintree stripe paddle fake_processor].each do |processor_name|
@@ -50,6 +49,24 @@ module Pay
       scope processor_name, -> { joins(:customer).where(pay_customers: {processor: processor_name}) }
     end
 
+    def self.with_metered_items
+      case Pay::Adapter.current_adapter
+      when "sqlite3"
+        where("json_extract(data, '$.\"metered\"') = true")
+        # For SQLite 3.38+ we could use the arrows
+        # where("data->'metered' = ?", "true")
+      when "mysql2"
+        where("data->'$.\"metered\"' = true")
+      when "postgresql", "postgis"
+        # Single quotes are important for json keys apparently
+        where("data->>'metered' = 'true'")
+      end
+    end
+
+    def metered_items?
+      !!metered
+    end
+
     def self.find_by_processor_and_id(processor, processor_id)
       joins(:customer).find_by(processor_id: processor_id, pay_customers: {processor: processor})
     end
@@ -62,6 +79,10 @@ module Pay
       @payment_processor ||= self.class.pay_processor_for(customer.processor).new(self)
     end
 
+    def sync!
+      self.class.pay_processor_for(customer.processor).sync(processor_id)
+    end
+
     def no_prorate
       self.prorate = false
     end
@@ -138,6 +159,12 @@ module Pay
       end
     end
 
+    def pause_resumes_at
+      if (resumes_at = super)
+        Time.zone.parse(resumes_at)
+      end
+    end
+
     private
 
     def cancel_if_active

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: <%= params[:charge].amount_with_currency %><br/>
+Amount: <%= params[:pay_charge].amount_with_currency %><br/>
 <br/>
-Charged to: <%= params[:charge].charged_to %><br/>
-Transaction ID: <%= params[:charge].id %><br/>
-Date: <%= params[:charge].created_at %><br/>
-<% if params[:charge].customer.owner.try(:extra_billing_info?) %>
-<%= params[:charge].customer.owner.extra_billing_info %><br/>
+Charged to: <%= params[:pay_charge].charged_to %><br/>
+Transaction ID: <%= params[:pay_charge].id %><br/>
+Date: <%= params[:pay_charge].created_at %><br/>
+<% if params[:pay_charge].customer.owner.try(:extra_billing_info?) %>
+<%= params[:pay_charge].customer.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: <%= params[:charge].amount_refunded_with_currency %><br/>
+Amount: <%= params[:pay_charge].amount_refunded_with_currency %><br/>
 <br/>
-Refunded to: <%= params[:charge].charged_to %><br/>
-Transaction ID: <%= params[:charge].id %><br/>
-Date: <%= params[:charge].created_at %><br/>
-<% if params[:charge].customer.owner.try(:extra_billing_info?) %>
-<%= params[:charge].customer.owner.extra_billing_info %><br/>
+Refunded to: <%= params[:pay_charge].charged_to %><br/>
+Transaction ID: <%= params[:pay_charge].id %><br/>
+Date: <%= params[:pay_charge].created_at %><br/>
+<% if params[:pay_charge].customer.owner.try(:extra_billing_info?) %>
+<%= params[:pay_charge].customer.owner.extra_billing_info %><br/>
 <% end %>
 <br/>
 <br/>

data/config/locales/en.yml

@@ -1,37 +1,44 @@
 en:
   pay:
     successful:
-      header: Payment Successful
-      description: This payment was already successfully confirmed.
+      header: "Payment Successful"
+      description: "This payment was already successfully confirmed."
     cancelled:
-      header: Payment Cancelled
-      description: This payment was cancelled.
+      header: "Payment Cancelled"
+      description: "This payment was cancelled."
     requires_action:
-      header: Confirm your %{amount} payment
-      description: Extra confirmation is needed to process your payment. Please confirm your payment by filling out your payment details below.
-      full_name: Full name
-      card: Credit or debit card
-      button: Pay %{amount}
-      name_missing: Please provide your name.
-      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
-      refunded: Refunded
-      paid: Paid
-    invoice:
+      header: "Confirm your %{amount} payment"
+      description: "Extra confirmation is needed to process your payment. Please confirm your payment by filling out your payment details below."
+      full_name: "Full name"
+      card: "Credit or debit card"
+      button: "Pay %{amount}"
+      name_missing: "Please provide your name."
+      success: "The payment was successful."
+    all_rights_reserved: "All rights reserved."
+    back: "Go back"
+    refund: "Refund"
+    line_items:
       amount: "Amount"
-      product: "Product"
+      description: "Description"
       quantity: "Quantity"
       subtotal: "Subtotal"
+      discount: "Discount"
+      tax: "Tax"
       total: "Total"
       unit_price: "Unit Price"
+      percent_discount: "%{name} (%{percent}% off)"
+      amount_discount: "%{name} (%{amount} off)"
+    receipt:
+      date: "Date"
+      number: "Receipt Number"
+      paid: "Paid"
+      payment_method: "Payment Method"
+      amount_paid: "Amount paid"
+      refunded: "Refunded"
+    invoice:
+      number: "Invoice Number"
+      date: "Date"
+      payment_method: "Payment method"
     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."

data/config/routes.rb

@@ -2,7 +2,7 @@
 
 Pay::Engine.routes.draw do
   resources :payments, only: [:show], module: :pay
-  post "webhooks/stripe", to: "pay/webhooks/stripe#create"
-  post "webhooks/braintree", to: "pay/webhooks/braintree#create"
-  post "webhooks/paddle", to: "pay/webhooks/paddle#create"
+  post "webhooks/stripe", to: "pay/webhooks/stripe#create" if Pay::Stripe.enabled?
+  post "webhooks/braintree", to: "pay/webhooks/braintree#create" if Pay::Braintree.enabled?
+  post "webhooks/paddle", to: "pay/webhooks/paddle#create" if Pay::Paddle.enabled?
 end

data/lib/pay/attributes.rb

@@ -8,6 +8,10 @@ module Pay
       extend ActiveSupport::Concern
 
       included do
+        cattr_accessor :pay_default_payment_processor
+        cattr_accessor :pay_stripe_customer_attributes
+        cattr_accessor :pay_braintree_customer_attributes
+
         has_many :pay_customers, class_name: "Pay::Customer", as: :owner, inverse_of: :owner
         has_many :charges, through: :pay_customers, class_name: "Pay::Charge"
         has_many :subscriptions, through: :pay_customers, class_name: "Pay::Subscription"
@@ -35,6 +39,24 @@ module Pay
         reload_payment_processor
       end
 
+      def add_payment_processor(processor_name, allow_fake: false, **attributes)
+        raise Pay::Error, "Processor `#{processor_name}` is not allowed" if processor_name.to_s == "fake_processor" && !allow_fake
+
+        pay_customer = pay_customers.active.where(processor: processor_name).first_or_initialize
+        pay_customer.update!(attributes)
+        pay_customer
+      end
+
+      def payment_processor
+        current_processor = super
+
+        if current_processor.blank? && self.class.pay_default_payment_processor.present?
+          set_payment_processor(self.class.pay_default_payment_processor, allow_fake: true)
+        else
+          current_processor
+        end
+      end
+
       def cancel_active_pay_subscriptions!
         subscriptions.active.each(&:cancel_now!)
       end
@@ -61,12 +83,16 @@ module Pay
     end
 
     class_methods do
-      def pay_customer
+      def pay_customer(options = {})
         include Billable::SyncCustomer
         include CustomerExtension
+
+        self.pay_default_payment_processor = options[:default_payment_processor]
+        self.pay_stripe_customer_attributes = options[:stripe_attributes]
+        self.pay_braintree_customer_attributes = options[:braintree_attributes]
       end
 
-      def pay_merchant
+      def pay_merchant(options = {})
         include MerchantExtension
       end
     end

data/lib/pay/billable/sync_customer.rb

@@ -8,7 +8,7 @@ module Pay
       extend ActiveSupport::Concern
 
       included do
-        after_update :enqeue_sync_email_job, if: :pay_should_sync_customer?
+        after_update :enqeue_customer_sync_job, if: :pay_should_sync_customer?
       end
 
       def pay_should_sync_customer?
@@ -17,8 +17,8 @@ module Pay
 
       private
 
-      def enqeue_sync_email_job
-        if saved_change_to_email?
+      def enqeue_customer_sync_job
+        if pay_should_sync_customer?
           # Queue job to update each payment processor for this customer
           pay_customers.pluck(:id).each do |pay_customer_id|
             CustomerSyncJob.perform_later(pay_customer_id)

data/lib/pay/braintree/billable.rb

@@ -15,6 +15,24 @@ module Pay
         @pay_customer = pay_customer
       end
 
+      # Returns a hash of attributes for the Stripe::Customer object
+      def customer_attributes
+        owner = pay_customer.owner
+
+        attributes = case owner.class.pay_braintree_customer_attributes
+        when Symbol
+          owner.send(owner.class.pay_braintree_customer_attributes, pay_customer)
+        when Proc
+          owner.class.pay_braintree_customer_attributes.call(pay_customer)
+        end
+
+        # Guard against attributes being returned nil
+        attributes ||= {}
+
+        first_name, last_name = customer_name.split(" ", 2)
+        {email: email, first_name: first_name, last_name: last_name}.merge(attributes)
+      end
+
       # Retrieve the Braintree::Customer object
       #
       # - If no processor_id is present, creates a Customer.
@@ -30,8 +48,7 @@ module Pay
 
           customer
         else
-          first_name, last_name = customer_name.split(" ", 2)
-          result = gateway.customer.create(email: email, first_name: first_name, last_name: last_name, payment_method_nonce: payment_method_token)
+          result = gateway.customer.create(customer_attributes.merge(payment_method_nonce: payment_method_token))
           raise Pay::Braintree::Error, result unless result.success?
           pay_customer.update!(processor_id: result.customer.id)
 
@@ -49,10 +66,10 @@ module Pay
       end
 
       # Syncs name and email to Braintree::Customer
-      def update_customer!
-        return unless processor_id?
-        first_name, last_name = customer_name.split(" ", 2)
-        gateway.customer.update(processor_id, first_name: first_name, last_name: last_name, email: email)
+      # You can also pass in other attributes that will be merged into the default attributes
+      def update_customer!(**attributes)
+        customer unless processor_id?
+        gateway.customer.update(processor_id, customer_attributes.merge(attributes))
       end
 
       def charge(amount, options = {})
@@ -135,10 +152,6 @@ module Pay
         raise Pay::Braintree::Error, e
       end
 
-      def update_email!
-        gateway.customer.update(processor_id, email: email, first_name: try(:first_name), last_name: try(:last_name))
-      end
-
       def trial_end_date(subscription)
         return unless subscription.trial_period
         # Braintree returns dates without time zones, so we'll assume they're UTC
@@ -174,44 +187,44 @@ module Pay
 
       def save_payment_method(payment_method, default:)
         attributes = case payment_method
-                     when ::Braintree::CreditCard, ::Braintree::ApplePayCard, ::Braintree::GooglePayCard, ::Braintree::SamsungPayCard, ::Braintree::VisaCheckoutCard
-                       {
-                         payment_method_type: :card,
-                         brand: payment_method.card_type,
-                         last4: payment_method.last_4,
-                         exp_month: payment_method.expiration_month,
-                         exp_year: payment_method.expiration_year
-                       }
-
-                     when ::Braintree::PayPalAccount
-                       {
-                         payment_method_type: :paypal,
-                         brand: "PayPal",
-                         email: payment_method.email
-                       }
-                     when ::Braintree::VenmoAccount
-                       {
-                         payment_method_type: :venmo,
-                         brand: "Venmo",
-                         username: payment_method.username
-                       }
-                     when ::Braintree::UsBankAccount
-                       {
-                         payment_method_type: "us_bank_account",
-                         bank: payment_method.bank_name,
-                         last4: payment_method.last_4
-                       }
-                     else
-                       {
-                         payment_method_type: payment_method.class.name.demodulize.underscore,
-                         brand: payment_method.try(:card_type),
-                         last4: payment_method.try(:last_4),
-                         exp_month: payment_method.try(:expiration_month),
-                         exp_year: payment_method.try(:expiration_year),
-                         bank: payment_method.try(:bank_name),
-                         username: payment_method.try(:username),
-                         email: payment_method.try(:email)
-                       }
+        when ::Braintree::CreditCard, ::Braintree::ApplePayCard, ::Braintree::GooglePayCard, ::Braintree::SamsungPayCard, ::Braintree::VisaCheckoutCard
+          {
+            payment_method_type: :card,
+            brand: payment_method.card_type,
+            last4: payment_method.last_4,
+            exp_month: payment_method.expiration_month,
+            exp_year: payment_method.expiration_year
+          }
+
+        when ::Braintree::PayPalAccount
+          {
+            payment_method_type: :paypal,
+            brand: "PayPal",
+            email: payment_method.email
+          }
+        when ::Braintree::VenmoAccount
+          {
+            payment_method_type: :venmo,
+            brand: "Venmo",
+            username: payment_method.username
+          }
+        when ::Braintree::UsBankAccount
+          {
+            payment_method_type: "us_bank_account",
+            bank: payment_method.bank_name,
+            last4: payment_method.last_4
+          }
+        else
+          {
+            payment_method_type: payment_method.class.name.demodulize.underscore,
+            brand: payment_method.try(:card_type),
+            last4: payment_method.try(:last_4),
+            exp_month: payment_method.try(:expiration_month),
+            exp_year: payment_method.try(:expiration_year),
+            bank: payment_method.try(:bank_name),
+            username: payment_method.try(:username),
+            email: payment_method.try(:email)
+          }
         end
 
         pay_payment_method = pay_customer.payment_methods.where(processor_id: payment_method.token).first_or_initialize

data/lib/pay/braintree/subscription.rb

@@ -27,7 +27,7 @@ module Pay
         gateway.subscription.find(processor_id)
       end
 
-      def cancel
+      def cancel(**options)
         subscription = processor_subscription
 
         if on_trial?
@@ -43,9 +43,14 @@ module Pay
         raise Pay::Braintree::Error, e
       end
 
-      def cancel_now!
+      def cancel_now!(**options)
         gateway.subscription.cancel(processor_subscription.id)
-        pay_subscription.update(status: :canceled, ends_at: Time.current)
+        ends_at = Time.current
+        pay_subscription.update!(
+          status: :canceled,
+          trial_ends_at: (ends_at if pay_subscription.trial_ends_at?),
+          ends_at: ends_at
+        )
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end

data/lib/pay/braintree/webhooks/subscription_canceled.rb

@@ -11,7 +11,12 @@ module Pay
           pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
-          pay_subscription.update!(ends_at: Time.current, status: :canceled)
+          ends_at = Time.current
+          pay_subscription.update!(
+            status: :canceled,
+            trial_ends_at: (ends_at if pay_subscription.trial_ends_at?),
+            ends_at: ends_at
+          )
         end
       end
     end

data/lib/pay/braintree/webhooks/subscription_charged_successfully.rb

@@ -14,8 +14,8 @@ module Pay
           pay_customer = pay_subscription.customer
           pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
 
-          if pay_charge && Pay.send_emails
-            Pay::UserMailer.with(pay_customer: pay_customer, charge: pay_charge).receipt.deliver_later
+          if pay_charge && Pay.send_email?(:receipt, pay_charge)
+            Pay.mailer.with(pay_customer: pay_customer, pay_charge: pay_charge).receipt.deliver_later
           end
         end
       end