pay 11.0.1 → 11.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7200a013cb88ad073e1de38f397fa6b46e28892dbfd3e70426dd99308422a1f
-  data.tar.gz: 6397051e6cfaf375f5e66bb5eab4a13c4fd22a7204939876e08452bf4f1f9c55
+  metadata.gz: 683137bc5d05a03c2c9dac51eb73c81566f7f7843e1806d4701382bb9f1dd603
+  data.tar.gz: 3974ae308b9eb16e473978fb7a6988dc2e62afbbf136bfe2a03a623dac6b0435
 SHA512:
-  metadata.gz: 3cbc10ffdf3b6d277c833fe3bc51536f57f09d26fa524db6d2ea8fc876751926b04334e6ca530a2a8ff9911dbcbca672c67f83e7799519a174f2ac2164d86807
-  data.tar.gz: 81f0182087f30e15f90557cf78442425b2a44316d3db29f3ccc08f759183ad75bdb1bb64a03aa7d7515b953d5dc32b3e244d878308eaab09d5140333feb926d8
+  metadata.gz: 04b6d4956b0f68d82908793e4f075c1d197e62bdd9c805ee5f113495577c20278185a7d8f3c53db3a2e9c2346df151ec19619eb4f38e0d25fb29f4f9544259f1
+  data.tar.gz: a5013d8bdefd8c1da3ab2be65fe6cce87095172c3bf7e6f1e137fd8b754fbf494606ef47fa29c2a16555bea62929481d443ed879db3e4483778f25b21b30087c

data/app/models/pay/stripe/charge.rb

@@ -65,11 +65,13 @@ module Pay
           create!(attrs.merge(customer: pay_customer, processor_id: object.id))
         end
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
-        try += 1
-        raise unless try <= retries
-
-        sleep 0.1
-        retry
+        if try > retries
+          raise
+        else
+          try += 1
+          sleep 0.15**try
+          retry
+        end
       end
 
       def api_record

data/app/models/pay/stripe/payment_method.rb

@@ -41,12 +41,12 @@ module Pay
         pay_payment_method.update!(attributes)
         pay_payment_method
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
-        try += 1
-        if try <= retries
-          sleep 0.1
-          retry
-        else
+        if try > retries
           raise
+        else
+          try += 1
+          sleep 0.15**try
+          retry
         end
       end
 

data/app/views/pay/user_mailer/payment_action_required.text.erb

@@ -0,0 +1,9 @@
+Extra confirmation is needed to process your payment
+
+Your <%= Pay.application_name %> subscription requires confirmation to process your payment to continue access.
+
+Confirm your payment: <%= pay.payment_url(params[:payment_intent_id]) %>
+
+If you have any questions, please hit reply and let us know.
+
+— The <%= Pay.application_name %> Team

data/app/views/pay/user_mailer/payment_failed.text.erb

@@ -0,0 +1,9 @@
+Your payment was declined
+
+We were unable to charge your payment method for your <%= Pay.application_name %> subscription. Please update your billing information.
+
+Update billing information: <%= root_url %>
+
+Let us know if you have any questions.
+
+— The <%= Pay.application_name %> Team

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

@@ -0,0 +1,20 @@
+We received payment for your <%= Pay.application_name %> subscription. Thanks for your business!
+
+Questions? Please reply to this email.
+
+------------------------------------
+RECEIPT - SUBSCRIPTION
+
+<%= Pay.application_name %>
+Amount: <%= params[:pay_charge].amount_with_currency %>
+
+Charged to: <%= params[:pay_charge].charged_to %>
+Transaction ID: <%= params[:pay_charge].id %>
+Date: <%= l params[:pay_charge].created_at %>
+<% if params[:pay_charge].customer.owner.try(:extra_billing_info?) %>
+<%= params[:pay_charge].customer.owner.extra_billing_info %>
+<% end %>
+
+<%= Pay.business_name %>
+<%= Pay.business_address %>
+------------------------------------

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

@@ -0,0 +1,21 @@
+We have processed your <%= Pay.application_name %> refund.
+Please allow up to 7 business days for your refund to appear in your account
+
+Questions? Please reply to this email.
+
+------------------------------------
+RECEIPT - REFUND
+
+<%= Pay.application_name %>
+Amount: <%= params[:pay_charge].amount_refunded_with_currency %>
+
+Refunded to: <%= params[:pay_charge].charged_to %>
+Transaction ID: <%= params[:pay_charge].id %>
+Date: <%= l params[:pay_charge].created_at %>
+<% if params[:pay_charge].customer.owner.try(:extra_billing_info?) %>
+<%= params[:pay_charge].customer.owner.extra_billing_info %>
+<% end %>
+
+<%= Pay.business_name %>
+<%= Pay.business_address %>
+------------------------------------

data/app/views/pay/user_mailer/subscription_renewing.text.erb

@@ -0,0 +1,8 @@
+Your upcoming <%= Pay.application_name %> subscription renewal
+
+This is a friendly reminder that your <%= Pay.application_name %> subscription will renew automatically on <%= l params[:date].to_date, format: :long %>.
+
+You may manage your subscription via your account: <%= root_url %>
+If you have any questions, please hit reply and let us know.
+
+— The <%= Pay.application_name %> Team

data/app/views/pay/user_mailer/subscription_trial_ended.text.erb

@@ -0,0 +1,8 @@
+Your <%= Pay.application_name %> trial has ended
+
+This is just a friendly reminder that your <%= Pay.application_name %> trial has ended.
+
+You may manage your subscription via your account: <%= root_url %>
+If you have any questions, please hit reply and let us know.
+
+— The <%= Pay.application_name %> Team

data/app/views/pay/user_mailer/subscription_trial_will_end.text.erb

@@ -0,0 +1,8 @@
+Your <%= Pay.application_name %> trial is ending soon
+
+This is just a friendly reminder that your <%= Pay.application_name %> trial will be ending soon.
+
+You may manage your subscription via your account: <%= root_url %>
+If you have any questions, please hit reply and let us know.
+
+— The <%= Pay.application_name %> Team

data/lib/pay/stripe.rb

@@ -142,16 +142,25 @@ module Pay
       nil
     end
 
-    def self.sync_checkout_session(session_id, stripe_account: nil)
+    # Subscriptions aren't always immediately associated, so we want to retry by default
+    def self.sync_checkout_session(session_id, stripe_account: nil, try: 0, retries: 5)
       checkout_session = ::Stripe::Checkout::Session.retrieve({id: session_id, expand: ["payment_intent.latest_charge"]}, {stripe_account: stripe_account}.compact)
       case checkout_session.mode
       when "payment"
         if (id = checkout_session.payment_intent.try(:latest_charge)&.id)
-          Pay::Stripe::Charge.sync(id, stripe_account: stripe_account)
+          Pay::Stripe::Charge.sync(id, stripe_account: stripe_account, retries: 5)
         end
       when "subscription"
         Pay::Stripe::Subscription.sync(checkout_session.subscription, stripe_account: stripe_account)
       end
+    rescue ::Stripe::InvalidRequestError
+      if try > retries
+        raise
+      else
+        try += 1
+        sleep 0.15**try
+        retry
+      end
     end
   end
 end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.0.1"
+  VERSION = "11.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.0.1
+  version: 11.1.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -89,12 +89,19 @@ files:
 - app/views/layouts/pay/application.html.erb
 - app/views/pay/payments/show.html.erb
 - app/views/pay/user_mailer/payment_action_required.html.erb
+- app/views/pay/user_mailer/payment_action_required.text.erb
 - app/views/pay/user_mailer/payment_failed.html.erb
+- app/views/pay/user_mailer/payment_failed.text.erb
 - app/views/pay/user_mailer/receipt.html.erb
+- app/views/pay/user_mailer/receipt.text.erb
 - app/views/pay/user_mailer/refund.html.erb
+- app/views/pay/user_mailer/refund.text.erb
 - app/views/pay/user_mailer/subscription_renewing.html.erb
+- app/views/pay/user_mailer/subscription_renewing.text.erb
 - app/views/pay/user_mailer/subscription_trial_ended.html.erb
+- app/views/pay/user_mailer/subscription_trial_ended.text.erb
 - app/views/pay/user_mailer/subscription_trial_will_end.html.erb
+- app/views/pay/user_mailer/subscription_trial_will_end.text.erb
 - config/currencies/iso.json
 - config/locales/en.yml
 - config/routes.rb