pay 3.0.1 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07034cf63312114cc2f7b73a505672c0d23bc6cd45c2ca66f8da64f2a1b0e6b
-  data.tar.gz: d87d2538c18f81fed51cc8540ad00bb35d5035e0d55a12ade4d80552a0a45642
+  metadata.gz: 2a5f1e8f94af3893db2d70bfd6f7b153213c0fc6bcc8c73b5d58465f94a35ea9
+  data.tar.gz: 14cc1b16d5a6cfc1ff4b220cef61c4910da17bd6e896719e8ecda7284894b848
 SHA512:
-  metadata.gz: 29baa34daa342750337e17206ede9bc0e94c5ec212f5f68eca67abed83da8ca62b805be97c91f164c99db940e6b415c343b3f506518d05f3b4eac9892911920e
-  data.tar.gz: fc921354cb86b8b150bc78f29a8efb86f438700f668273e002dbdecac6f10069604227f7cfecba2cc10beec25c6ac74f7ceba083427ce353ebce0b0cc3b0578a
+  metadata.gz: a2b2164b3af965a2598c1c9257ded5741c2e0631d08f36198b32a981b3a4e7edc0fb83e6dc7bc9de00c796a9dc8bdafab2a36f385e3bb47511aa7376924a5be3
+  data.tar.gz: 6550e82d22748167fa820dbfa48bf2db33e8f98369bb37ac654492a7ea37578b8d8ccd77ab93354e677f1ef94b788afb52f3d537e52dc7fd39084356fa2d3047

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

@@ -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

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/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))
 
           else
             # No default payment method set

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "3.0.1"
+  VERSION = "3.0.6"
 end

data/lib/tasks/pay.rake

@@ -3,18 +3,29 @@ namespace :pay do
     desc "Sync default payment methods for Pay::Customers"
     task sync_default: :environment do
       Pay::Customer.find_each do |pay_customer|
-        puts "Syncing Pay::Customer ##{pay_customer.id}: #{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
+        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.1
+  version: 3.0.6
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails