pay 3.0.17 → 3.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2268e7ac1a9c24a08f77336d8e17b46cc0dcefc17762dfd48ad698b11a3e990c
-  data.tar.gz: 8227fdb6f1fb10a657f5a731a200ddeb8e711884dcffafe1ffedaf06a1988c0e
+  metadata.gz: a37f4ee9640c9f48545166512e3ce5dfd8f17555c6181794807db5a6cc88e4ac
+  data.tar.gz: 994889fa6c1e3c55b836d3597f95046eaed46d1c551154c57c83543312153965
 SHA512:
-  metadata.gz: 7b7131afb212c9ff2e0bc657ad26440b09765f2eaa7d2d50c38f110efed513c42547994b65fea9354e5d8429185ca5c5cb109e8cf5d42b57af2f95d69743cf30
-  data.tar.gz: d0a9cabba6b63a6a087687efe94f7c13a3040550e57c150dd171ebb4d2b3df6157cd87592de10d216d7c12a4f8bff5ce6e7cb0fd72411930ba6778c0cf0f7de9
+  metadata.gz: d6e97f172fb3a5fbb9b62e3867fb29e363f9c5ea3f1fc385ab22a9ea59f27547ea84ca357eac1473e2ca4b25584d0c28f58f9124ca80e729cd5fa1da465d5b71
+  data.tar.gz: f455c3cc02a3b93f7eb5dd04c2edf0c67d0f72c3e2bddd3ced8e509a8b557705609b20dab00b0b40daab19734b46e097f2c4fcbe2f6aaf5df79f8291b75f6d3d

data/README.md

@@ -23,7 +23,7 @@ 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.
 

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

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

@@ -78,6 +78,9 @@ module Pay
         ends_at = on_trial? ? trial_ends_at : processor_subscription.next_payment[:date]
         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 +88,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

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.17"
+  VERSION = "3.0.18"
 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.17
+  version: 3.0.18
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails