pay 3.0.0 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a85b63ecf485a80f4825041bdfc4d66be639b65060c1836135422f367e0b878
-  data.tar.gz: d43a4bf47062f27d6fcdc4771517a2d2911bb3c38298d0c66b883446a42ac8ed
+  metadata.gz: 98d201890dfc59215167a68fe0c2fc23d071ecdc831931eb51c1be85b12d0091
+  data.tar.gz: 86dbc8f7bebcda970cdbdc9eb22b97ce2716570daeb4a8b64f1d794a350b19fa
 SHA512:
-  metadata.gz: 88701e517c153b29434b56132cc567145f5c6bce65d0e6592c3118cd700147c45616840bb246df12c6d9999940c4e44147d332af7d4857b0ea02dcd2699d0d34
-  data.tar.gz: d57a35f69149eb0a49a9417fef01f9e3b70703bc077a3fcc7a2b7c6acb1f5f228570f695942ab75a67fd6f664baee7e6aa58ef7b16e1744b7633a4d7caec31e1
+  metadata.gz: 321eef31d462caade5b3099d3897a7f8e7bf9374e05a76dca1c165329156eb83266c3655f13fb658a1756b91899b4b70e322f131d042c5668431e67529a88214
+  data.tar.gz: cd2e93563744dec1081687c26e4ad496ed7a9a04e918f95f57c2ff8340e7b15d3b4ef85d948891a6be0a34f09ca69b63787751de2ca42f65a4bafd10449922ec

data/README.md

@@ -8,7 +8,7 @@
 
 Pay is a payments engine for Ruby on Rails 6.0 and higher.
 
-**Upgrading?** Check the [UPGRADE](UPGRADE.md) guide for required changes and/or migration when upgrading from a previous version of Pay.
+⚠️  **Upgrading?** Check the [UPGRADE](UPGRADE.md) guide for required changes and/or migration when upgrading from a previous version of Pay.
 
 ## 🧑‍💻 Tutorial
 

data/app/models/pay/charge.rb

@@ -63,9 +63,33 @@ module Pay
     def charged_to
       case payment_method_type
       when "card"
-        "#{brand} (**** **** **** #{last4})"
+        "#{brand.titleize} (**** **** **** #{last4})"
       when "paypal"
         "#{brand} (#{email})"
+
+      # Braintree
+      when "venmo"
+        "#{brand.titleize} #{username}"
+      when "us_bank_account"
+        "#{bank} #{last4}"
+
+      # Stripe
+      when "acss_debit"
+        "#{bank} #{last4}"
+      when "eps", "fpx", "ideal", "p24"
+        bank
+
+      when "au_becs_debit"
+        "BECS Debit #{last4}"
+
+      when "bacs_debit"
+        "Bacs Debit #{last4}"
+
+      when "sepa_debit"
+        "SEPA Debit #{last4}"
+
+      else
+        payment_method_type&.titleize
       end
     end
   end

data/app/models/pay/customer.rb

@@ -76,6 +76,16 @@ module Pay
       deleted_at.present?
     end
 
+    def on_generic_trial?
+      return false unless fake_processor?
+
+      subscription = subscriptions.active.last
+      return false unless subscription
+
+      # If these match, consider it a generic trial
+      subscription.trial_ends_at == subscription.ends_at
+    end
+
     %w[stripe braintree paddle fake_processor].each do |processor_name|
       scope processor_name, -> { where(processor: processor_name) }
 

data/app/models/pay/subscription.rb

@@ -18,7 +18,7 @@ module Pay
     scope :with_deleted_customer, -> { joins(:customer).merge(Customer.deleted) }
 
     # Callbacks
-    before_destroy :cancel_now!, if: :active?
+    before_destroy :cancel_if_active
 
     store_accessor :data, :paddle_update_url
     store_accessor :data, :paddle_cancel_url
@@ -110,7 +110,7 @@ module Pay
     end
 
     def swap(plan)
-      raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+      raise ArgumentError, "plan must be a string. Got `#{plan.inspect}` instead." unless plan.is_a?(String)
       payment_processor.swap(plan)
       update(processor_plan: plan, ends_at: nil, status: :active)
     end
@@ -127,5 +127,15 @@ module Pay
     def latest_payment
       processor_subscription(expand: ["latest_invoice.payment_intent"]).latest_invoice.payment_intent
     end
+
+    private
+
+    def cancel_if_active
+      if active?
+        cancel_now!
+      end
+    rescue => e
+      Rails.logger.info "[Pay] Unable to automatically cancel subscription `#{processor} #{id}`: #{e.message}"
+    end
   end
 end

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

@@ -115,7 +115,6 @@
 
     handleConfirmResult(result) {
       this.processingValue = false
-      console.log(result)
 
       if (result.error) {
         if (result.error.code === 'parameter_invalid_empty' &&

data/lib/pay/braintree/billable.rb

@@ -160,8 +160,6 @@ module Pay
         charge
       end
 
-      private
-
       def gateway
         Pay.braintree_gateway
       end
@@ -197,7 +195,14 @@ module Pay
                        }
                      else
                        {
-                         payment_method_type: payment_method.class.name.demodulize.underscore
+                         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
 

data/lib/pay/braintree/payment_method.rb

@@ -5,6 +5,15 @@ module Pay
 
       delegate :customer, :processor_id, to: :pay_payment_method
 
+      def self.sync(id, object: nil, try: 0, retries: 1)
+        object ||= gateway.payment_method.find(id)
+
+        pay_customer = Pay::Customer.find_by(processor: :braintree, processor_id: object.customer_id)
+        return unless pay_customer
+
+        pay_customer.save_payment_method(object, default: object.default?)
+      end
+
       def initialize(pay_payment_method)
         @pay_payment_method = pay_payment_method
       end

data/lib/pay/paddle/payment_method.rb

@@ -7,6 +7,8 @@ module Pay
 
       # Paddle doesn't provide PaymentMethod IDs, so we have to lookup via the Customer
       def self.sync(pay_customer:, attributes: nil)
+        return unless pay_customer.subscription
+
         payment_method = pay_customer.default_payment_method || pay_customer.build_default_payment_method
         payment_method.processor_id ||= NanoId.generate
 

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

@@ -11,7 +11,7 @@ module Pay
 
           # Sync default card
           if (payment_method_id = pay_customer.customer.invoice_settings.default_payment_method)
-            Pay::Stripe::PaymentMethod.sync(payment_method_id, {stripe_account: event.account}.compact)
+            Pay::Stripe::PaymentMethod.sync(payment_method_id, {stripe_account: event.try(:account)}.compact)
 
           else
             # No default payment method set

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "3.0.0"
+  VERSION = "3.0.5"
 end

data/lib/tasks/pay.rake

@@ -0,0 +1,31 @@
+namespace :pay do
+  namespace :payment_methods do
+    desc "Sync default payment methods for Pay::Customers"
+    task sync_default: :environment do
+      Pay::Customer.find_each do |pay_customer|
+        sync_default_payment_method(pay_customer)
+      end
+    end
+  end
+end
+
+def sync_default_payment_method(pay_customer, retries: 2)
+  try = 0
+  begin
+    puts "Syncing Pay::Customer ##{pay_customer.id} attempt #{try + 1}: #{pay_customer.processor.titleize} #{pay_customer.processor_id}"
+    case pay_customer.processor
+    when "braintree"
+      payment_method = pay_customer.customer.payment_methods.find(&:default?)
+      Pay::Braintree::PaymentMethod.sync(payment_method.token, object: payment_method) if payment_method
+    when "stripe"
+      payment_method_id = pay_customer.customer.invoice_settings.default_payment_method
+      Pay::Stripe::PaymentMethod.sync(payment_method_id) if payment_method_id
+    when "paddle"
+      Pay::Paddle::PaymentMethod.sync(pay_customer)
+    end
+  rescue
+    sleep 0.5
+    try += 1
+    try <= retries ? retry : raise
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.5
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,6 +202,7 @@ files:
 - lib/pay/webhooks.rb
 - lib/pay/webhooks/delegator.rb
 - lib/pay/webhooks/process_job.rb
+- lib/tasks/pay.rake
 homepage: https://github.com/pay-rails/pay
 licenses:
 - MIT