pay 3.0.15 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da2776b04254282c1261d0cc5d96ea2cfeb632875b29ea2121e0a38e6657f02
-  data.tar.gz: 360680271236c15fc26a307a0b9ff74bce4e380f2a23cf9909b3a8b4e7e4b0d4
+  metadata.gz: '093c067bb867fddfbdb00486613ad7be4b9e1d3d0d5ff1e22ec3d892b6bb76b3'
+  data.tar.gz: d4b53a841c0e7cae39f6c73786dbfbe20bc61c81dbbfe3885cbe2a0b0f830936
 SHA512:
-  metadata.gz: 74dffc7becc6c899d770674576757967b20c1c0ece21e4525c97e7e491699cce8b066e4c9aca8cadf9f4bd3c9c9ec7cd719d177c8556fa9e73dbc75919c51e5c
-  data.tar.gz: 5b355770187eb928ae7b5c70a403ff5895c46ba0a0f3791ecc3e3c7b3680bb6879360dd5bdeb29e6add51ef8cb12dbad961227df975c0899d8273db70544d5cc
+  metadata.gz: cee4d5e1b4ed8954e7004b121165c5e4b4dc69f5a39a01b4f9b90197ef4a8dc04cca5660488b7b2da2975a78d9cf0e5356cd30e84923af56e2460277c6c79979
+  data.tar.gz: 261fdecca8eb33582d279ce18f76fe4c80e3efe5fb95c479549c8c4232e53b6096a69decd3915ac12fe7792035e14e88122ef35a459090b5f4e8a710588a2b80

data/README.md

@@ -23,11 +23,11 @@ Our supported payment processors are:
 - Stripe ([SCA Compatible](https://stripe.com/docs/strong-customer-authentication) using API version `2020-08-27`)
 - Paddle (SCA Compatible & supports PayPal)
 - Braintree (supports PayPal)
-- [Fake Processor](docs/fake_processor.md) (used for generic trials without cards, free subscriptions, testing, etc)
+- [Fake Processor](docs/fake_processor/1_overview.md) (used for generic trials without cards, free subscriptions, testing, etc)
 
 Want to add a new payment provider? Contributions are welcome.
 
-> We make our best attempt to standardize the different payment providers. They function differently so keep that in mind if you plan on doing more complex payments. It would be best to stick witha single payment provider in that case so you don't run into discrepancies.
+> We make our best attempt to standardize the different payment providers. They function differently so keep that in mind if you plan on doing more complex payments. It would be best to stick with a single payment provider in that case so you don't run into discrepancies.
 
 ## 📚 Docs
 

data/app/mailers/pay/user_mailer.rb

@@ -23,11 +23,7 @@ module Pay
     private
 
     def to
-      if params[:billable].respond_to?(:customer_name)
-        "#{params[:billable].customer_name} <#{params[:billable].email}>"
-      else
-        params[:billable].email
-      end
+      "#{params[:pay_customer].customer_name} <#{params[:pay_customer].email}>"
     end
   end
 end

data/app/models/pay/subscription.rb

@@ -70,6 +70,10 @@ module Pay
       self.trial_ends_at = nil
     end
 
+    def generic_trial?
+      fake_processor? && trial_ends_at?
+    end
+
     def on_trial?
       trial_ends_at? && Time.zone.now < trial_ends_at
     end
@@ -128,6 +132,12 @@ module Pay
       processor_subscription(expand: ["latest_invoice.payment_intent"]).latest_invoice.payment_intent
     end
 
+    def paddle_paused_from
+      if (timestamp = super)
+        Time.zone.parse(timestamp)
+      end
+    end
+
     private
 
     def cancel_if_active

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

@@ -5,7 +5,7 @@ Questions? Please reply to this email.<br/>
 ------------------------------------<br/>
 RECEIPT - SUBSCRIPTION<br/>
 <br/>
-Amount: USD <%= params[:charge].amount_with_currency %><br/>
+Amount: <%= params[:charge].amount_with_currency %><br/>
 <br/>
 Charged to: <%= params[:charge].charged_to %><br/>
 Transaction ID: <%= params[:charge].id %><br/>

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

@@ -6,7 +6,7 @@ Questions? Please reply to this email.<br/>
 ------------------------------------<br/>
 RECEIPT - REFUND<br/>
 <br/>
-Amount: USD <%= params[:charge].amount_refunded_with_currency %><br/>
+Amount: <%= params[:charge].amount_refunded_with_currency %><br/>
 <br/>
 Refunded to: <%= params[:charge].charged_to %><br/>
 Transaction ID: <%= params[:charge].id %><br/>

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

@@ -12,10 +12,10 @@ module Pay
           return unless pay_subscription.present?
 
           pay_customer = pay_subscription.customer
-          charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
+          pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
 
-          if Pay.send_emails
-            Pay::UserMailer.with(billable: pay_customer.owner, charge: charge).receipt.deliver_later
+          if pay_charge && Pay.send_emails
+            Pay::UserMailer.with(pay_customer: pay_customer, charge: pay_charge).receipt.deliver_later
           end
         end
       end

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

@@ -11,11 +11,11 @@ module Pay
           pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
-          # billable = pay_subscription.owner
-          # charge = Pay::Braintree::Billable.new(billable).save_transaction(subscription.transactions.first)
+          # pay_customer = pay_subscription.customer
+          # pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
 
           # if Pay.send_emails
-          #  Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
+          #  Pay::UserMailer.with(pay_customer: pay_charge.customer, charge: pay_charge).receipt.deliver_later
           # end
         end
       end

data/lib/pay/paddle/subscription.rb

@@ -75,9 +75,19 @@ module Pay
       end
 
       def cancel
-        ends_at = on_trial? ? trial_ends_at : processor_subscription.next_payment[:date]
+        ends_at = if on_trial?
+          trial_ends_at
+        elsif paused?
+          paddle_paused_from
+        else
+          processor_subscription.next_payment&.fetch(:date) || Time.current
+        end
+
         PaddlePay::Subscription::User.cancel(processor_id)
         pay_subscription.update(status: :canceled, ends_at: ends_at)
+
+        # Remove payment methods since customer cannot be reused after cancelling
+        Pay::PaymentMethod.where(customer_id: pay_subscription.customer_id).destroy_all
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end
@@ -85,6 +95,9 @@ module Pay
       def cancel_now!
         PaddlePay::Subscription::User.cancel(processor_id)
         pay_subscription.update(status: :canceled, ends_at: Time.current)
+
+        # Remove payment methods since customer cannot be reused after cancelling
+        Pay::PaymentMethod.where(customer_id: pay_subscription.customer_id).destroy_all
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end
@@ -100,7 +113,7 @@ module Pay
       def pause
         attributes = {pause: true}
         response = PaddlePay::Subscription::User.update(processor_id, attributes)
-        pay_subscription.update(paddle_paused_from: Time.zone.parse(response[:next_payment][:date]))
+        pay_subscription.update(paddle_paused_from: Time.zone.parse(response.dig(:next_payment, :date)))
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end

data/lib/pay/paddle/webhooks/subscription_cancelled.rb

@@ -13,7 +13,7 @@ module Pay
           pay_subscription.update!(ends_at: Time.zone.parse(event.cancellation_effective_date)) if pay_subscription.ends_at.blank? && event.cancellation_effective_date.present?
 
           # Paddle doesn't allow reusing customers, so we should remove their payment methods
-          pay_subscription.customer.payment_methods.destroy_all
+          Pay::PaymentMethod.where(customer_id: pay_subscription.customer_id).destroy_all
         end
       end
     end

data/lib/pay/paddle/webhooks/subscription_payment_refunded.rb

@@ -3,16 +3,13 @@ module Pay
     module Webhooks
       class SubscriptionPaymentRefunded
         def call(event)
-          charge = Pay::Charge.find_by_processor_and_id(:paddle, event.subscription_payment_id)
-          return unless charge.present?
+          pay_charge = Pay::Charge.find_by_processor_and_id(:paddle, event.subscription_payment_id)
+          return unless pay_charge.present?
 
-          charge.update(amount_refunded: (event.gross_refund.to_f * 100).to_i)
-          notify_user(charge.customer.owner, charge)
-        end
+          pay_charge.update(amount_refunded: (event.gross_refund.to_f * 100).to_i)
 
-        def notify_user(billable, charge)
           if Pay.send_emails
-            Pay::UserMailer.with(billable: billable, charge: charge).refund.deliver_later
+            Pay::UserMailer.with(pay_customer: pay_charge.customer, charge: pay_charge).refund.deliver_later
           end
         end
       end

data/lib/pay/paddle/webhooks/subscription_payment_succeeded.rb

@@ -18,7 +18,7 @@ module Pay
           return if pay_customer.charges.where(processor_id: event.subscription_payment_id).any?
 
           charge = create_charge(pay_customer, event)
-          notify_user(pay_customer.owner, charge)
+          notify_user(charge)
         end
 
         def create_charge(pay_customer, event)
@@ -42,9 +42,9 @@ module Pay
           charge
         end
 
-        def notify_user(billable, charge)
-          if Pay.send_emails && charge.respond_to?(:receipt)
-            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
+        def notify_user(pay_charge)
+          if Pay.send_emails
+            Pay::UserMailer.with(pay_customer: pay_charge.customer, charge: pay_charge).receipt.deliver_later
           end
         end
       end

data/lib/pay/stripe/webhooks/charge_refunded.rb

@@ -4,12 +4,9 @@ module Pay
       class ChargeRefunded
         def call(event)
           pay_charge = Pay::Stripe::Charge.sync(event.data.object.id, stripe_account: event.try(:account))
-          notify_user(pay_charge.customer.owner, pay_charge) if pay_charge
-        end
 
-        def notify_user(billable, charge)
-          if Pay.send_emails
-            Pay::UserMailer.with(billable: billable, charge: charge).refund.deliver_later
+          if pay_charge && Pay.send_emails
+            Pay::UserMailer.with(pay_customer: pay_charge.customer, charge: pay_charge).refund.deliver_later
           end
         end
       end

data/lib/pay/stripe/webhooks/charge_succeeded.rb

@@ -4,12 +4,9 @@ module Pay
       class ChargeSucceeded
         def call(event)
           pay_charge = Pay::Stripe::Charge.sync(event.data.object.id, stripe_account: event.try(:account))
-          notify_user(pay_charge.customer.owner, pay_charge) if pay_charge
-        end
 
-        def notify_user(billable, charge)
-          if Pay.send_emails && charge.respond_to?(:receipt)
-            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
+          if pay_charge && Pay.send_emails
+            Pay::UserMailer.with(pay_customer: pay_charge.customer, charge: pay_charge).receipt.deliver_later
           end
         end
       end

data/lib/pay/stripe/webhooks/payment_action_required.rb

@@ -10,14 +10,13 @@ module Pay
 
           subscription = Pay::Subscription.find_by_processor_and_id(:stripe, object.subscription)
           return if subscription.nil?
-          billable = subscription.customer.owner
 
-          notify_user(billable, event.data.object.payment_intent, subscription)
-        end
-
-        def notify_user(billable, payment_intent_id, subscription)
           if Pay.send_emails
-            Pay::UserMailer.with(billable: billable, payment_intent_id: payment_intent_id, subscription: subscription).payment_action_required.deliver_later
+            Pay::UserMailer.with(
+              pay_customer: subscription.customer,
+              payment_intent_id: event.data.object.payment_intent,
+              subscription: subscription
+            ).payment_action_required.deliver_later
           end
         end
       end

data/lib/pay/stripe/webhooks/subscription_renewing.rb

@@ -18,12 +18,12 @@ module Pay
           interval = price.recurring.interval
           return unless interval == "year"
 
-          notify_user(subscription.customer.owner, subscription, Time.zone.at(event.data.object.next_payment_attempt))
-        end
-
-        def notify_user(billable, subscription, date)
           if Pay.send_emails
-            Pay::UserMailer.with(billable: billable, subscription: subscription, date: date).subscription_renewing.deliver_later
+            Pay::UserMailer.with(
+              pay_customer: subscription.customer,
+              subscription: subscription,
+              date: Time.zone.at(event.data.object.next_payment_attempt)
+            ).subscription_renewing.deliver_later
           end
         end
       end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "3.0.15"
+  VERSION = "3.0.19"
 end

data/lib/pay.rb

@@ -54,12 +54,4 @@ module Pay
   def self.setup
     yield self
   end
-
-  def self.receipts_supported?
-    charge_model.respond_to?(:receipt) &&
-      application_name.present? &&
-      business_name &&
-      business_address &&
-      support_email
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.19
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails