pay 11.0.0 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc13750a45c160a2cf53afc173735a5e846d3401955b3c05b080b61936b3173
-  data.tar.gz: 315acc27967b4dc0063981950dbb25aade62c8e29447714d410db48066acbf83
+  metadata.gz: 82dd9dc3193e898e2fd8538148e9ff886b852506d80c768a26616921049fbd65
+  data.tar.gz: 1b85c150235a1ae4531592b6d6c5cf577e126e693c1ce516ea2b01d8199f5276
 SHA512:
-  metadata.gz: 6730e4367a8c0de82aa4f7daddb87c8c4184fe3f87830b5dff9fb13480f2583c002d7ef0c65c466a528596d3c60a373c69112a396c01a8903103c640417ba304
-  data.tar.gz: 8bb32b72e87510fa62be51140271a163424d7bfc12c046b1faa128ff155fa46e03f43018f79e205283c07d56674083cb0de1b278c10c0fd61d65569f468fcdd7
+  metadata.gz: c0b450e4daa02317f33e74bc627728643157361f5d51d5748e37c5a372d94dabb41b28306b569f4e9c2fa4a0ca04e437f18e15007cac6ec3eb23a8a9ca190609
+  data.tar.gz: 1964aabb5533aba8a248164ef01b7203bf450fed5dab23859c14a1cbbdf9f90a67ac29beeb8840decd0ec4e70bd4da0d252e668b1d5b6bcbb63b3214ad16d38b

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

@@ -47,6 +47,8 @@ module Pay
         if object.trial_end
           trial_ended_at = [object.ended_at, object.trial_end].compact.min
           attributes[:trial_ends_at] = Time.at(trial_ended_at)
+        else
+          attributes[:trial_ends_at] = nil
         end
 
         object.items.auto_paging_each do |subscription_item|
@@ -164,7 +166,7 @@ module Pay
           cancel_now!
         else
           @api_record = ::Stripe::Subscription.update(processor_id, {cancel_at_period_end: true}.merge(expand_options), stripe_options)
-          update(ends_at: (on_trial? ? trial_ends_at : Time.at(@api_record.items.first.current_period_end)))
+          update(ends_at: Time.at(@api_record.cancel_at))
         end
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
@@ -178,7 +180,11 @@ module Pay
         return if canceled? && ends_at.past?
 
         @api_record = ::Stripe::Subscription.cancel(processor_id, options.merge(expand_options), stripe_options)
-        update(trial_ends_at: Time.current, ends_at: Time.current, status: :canceled)
+        update(
+          trial_ends_at: (@api_record.trial_end ? Time.at(@api_record.trial_end) : nil),
+          ends_at: Time.at(@api_record.ended_at),
+          status: @api_record.status
+        )
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end

data/app/models/pay/subscription.rb

@@ -66,10 +66,12 @@ module Pay
 
     # Does not include the last second of the trial
     def on_trial?
+      return false if ended?
       trial_ends_at? && trial_ends_at > Time.current
     end
 
     def trial_ended?
+      return true if ended?
       trial_ends_at? && trial_ends_at <= Time.current
     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/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.0.0"
+  VERSION = "11.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.1.0
 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