pay 6.0.3 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ffb1d86e804cae26df541cde3e1798a316c6176c271b1da5de66031f5ed99cc
-  data.tar.gz: a4fd5b34c5f873ef9c47d222688206ea318890cedc747c9059014001934f1c87
+  metadata.gz: 17a91b33a5c76733e60014f15e285b51e77d1d4794456afba359691edc4e44c2
+  data.tar.gz: f7b991d7a54f7fa57a54a56571f2ee4badeeb1aaaa62dc5f2cc6f889254818d3
 SHA512:
-  metadata.gz: d3c872342b43c5fa0ebc2aa797b7a145bdb99e310fd0db1019b6c19b9fe536fe8e242142ee5dc26edbf94a4bcdfca4e9b3aa7bb78444d1b1f3f3c35e3a2d236a
-  data.tar.gz: c3df896c8ba0056fcb0549c19e7b603322710ccf977832030414f2bfed5c0b14ed60a0574cf50ce237feaa56cc5bcab932cf6cc956fc0b33321d7d8117a6842b
+  metadata.gz: 5ef34ddc4e6b0ba75abab2577d216a85af478fa22c0bc8a16d312b5979e782fac467204e66ac72f7fa4f9e0b4dfa16f879aad82b27251ed290e05353c48df92c
+  data.tar.gz: e8dd4dbbdc01aa58ce21228b84a69bb70df05a814ab306b9e2b417b3e178bf50732117b73cad0f01dbb04035bbeb834f2aa2052b010c042b1d5e1f7660149188

data/README.md

@@ -20,7 +20,7 @@ Want to see how Pay works? Check out our video getting started guide.
 
 Our supported payment processors are:
 
-- Stripe ([SCA Compatible](https://stripe.com/docs/strong-customer-authentication) using API version `2022-08-01`)
+- Stripe ([SCA Compatible](https://stripe.com/docs/strong-customer-authentication) using API version `2022-11-15`)
 - Paddle (SCA Compatible & supports PayPal)
 - Braintree (supports PayPal)
 - [Fake Processor](docs/fake_processor/1_overview.md) (used for generic trials without cards, free subscriptions, testing, etc)

data/app/mailers/pay/user_mailer.rb

@@ -31,7 +31,7 @@ module Pay
     private
 
     def mail_arguments
-      Pay.mail_arguments.call(mailer_name, params)
+      instance_exec(&Pay.mail_arguments)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 <h3>Extra confirmation is needed to process your payment</h3>
-<p>Your <%= Pay.business_name %> subscription requires confirmation to process your payment to continue access.</p>
+<p>Your <%= Pay.application_name %> subscription requires confirmation to process your payment to continue access.</p>
 
 <p><%= link_to "Click here to confirm your payment", pay.payment_url(params[:payment_intent_id]) %>. If you have any questions, please hit reply and let us know.</p>
 
-<p>- The <%= Pay.business_name %> Team</p>
+<p>— The <%= Pay.application_name %> Team</p>

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

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

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

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

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

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

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

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

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

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

data/config/locales/en.yml

@@ -49,14 +49,14 @@ en:
         authorization: "Either the data you submitted is malformed and does not match the API or the API key you used may not be authorized to perform this action."
     user_mailer:
       receipt:
-        subject: "Payment receipt"
+        subject: "[%{application}] Payment receipt"
       refund:
-        subject: "Payment refunded"
+        subject: "[%{application}] Payment refunded"
       subscription_renewing:
-        subject: "Your upcoming subscription renewal"
+        subject: "[%{application}] Your upcoming subscription renewal"
       payment_action_required:
-        subject: "Confirm your payment"
+        subject: "[%{application}] Confirm your payment"
       subscription_trial_will_end:
-        subject: "Your trial is ending soon"
+        subject: "[%{application}] Your trial is ending soon"
       subscription_trial_ended:
-        subject: "Your trial has ended"
+        subject: "[%{application}] Your trial has ended"

data/lib/pay/braintree/subscription.rb

@@ -217,7 +217,7 @@ module Pay
               add: [
                 {
                   inherited_from_id: "plan-credit",
-                  amount: discount.amount,
+                  amount: discount.amount.round(2),
                   number_of_billing_cycles: discount.number_of_billing_cycles
                 }
               ]
@@ -225,9 +225,10 @@ module Pay
           }
         end
 
-        cancel_now!
-
+        # If subscribe fails we will raise a Pay::Braintree::Error and not cancel the current subscription
         customer.subscribe(**options.merge(name: name, plan: plan.id))
+
+        cancel_now!
       end
     end
   end

data/lib/pay/receipts.rb

@@ -119,7 +119,7 @@ module Pay
         company: {
           name: Pay.business_name,
           address: Pay.business_address,
-          email: Pay.support_email,
+          email: Pay.support_email.address,
           logo: Pay.business_logo
         },
         line_items: receipt_line_items
@@ -155,7 +155,7 @@ module Pay
         company: {
           name: Pay.business_name,
           address: Pay.business_address,
-          email: Pay.support_email,
+          email: Pay.support_email.address,
           logo: Pay.business_logo
         },
         line_items: pdf_line_items

data/lib/pay/stripe/charge.rb

@@ -125,7 +125,7 @@ module Pay
       # refund!(5_00, refund_application_fee: true)
       def refund!(amount_to_refund, **options)
         if invoice_id.present?
-          description = options.delete(:description) || I18n.t("refund")
+          description = options.delete(:description) || I18n.t("pay.refund")
           lines = [{type: :custom_line_item, description: description, quantity: 1, unit_amount: amount_to_refund}]
           credit_note!(**options.merge(refund_amount: amount_to_refund, lines: lines))
         else

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

@@ -3,15 +3,11 @@ module Pay
     module Webhooks
       class CheckoutSessionCompleted
         def call(event)
-          # TODO: Also handle payment intents
-
           locate_owner(event.data.object)
 
           if (payment_intent_id = event.data.object.payment_intent)
-            payment_intent = ::Stripe::PaymentIntent.retrieve(payment_intent_id, {stripe_account: event.try(:account)}.compact)
-            payment_intent.charges.each do |charge|
-              Pay::Stripe::Charge.sync(charge.id, stripe_account: event.try(:account))
-            end
+            payment_intent = ::Stripe::PaymentIntent.retrieve({id: payment_intent_id, expand: ["latest_charge"]}, {stripe_account: event.try(:account)}.compact)
+            Pay::Stripe::Charge.sync(payment_intent.latest_charge.id, object: payment_intent.latest_charge, stripe_account: event.try(:account))
           end
 
           if (subscription_id = event.data.object.subscription)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.0.3"
+  VERSION = "6.1.1"
 end

data/lib/pay.rb

@@ -37,6 +37,10 @@ module Pay
   mattr_accessor :business_logo
   mattr_accessor :support_email
 
+  def self.support_email=(value)
+    @@support_email = value.is_a?(Mail::Address) ? value : Mail::Address.new(value)
+  end
+
   mattr_accessor :automount_routes
   @@automount_routes = true
 
@@ -80,15 +84,16 @@ module Pay
 
   # Should return a hash of arguments for the `mail` call in UserMailer
   mattr_accessor :mail_arguments
-  @@mail_arguments = ->(mailer, params) {
+  @@mail_arguments = -> {
     {
-      to: Pay.mail_to.call(mailer, params)
+      to: instance_exec(&Pay.mail_to),
+      subject: default_i18n_subject(application: Pay.application_name)
     }
   }
 
   # Should return String or Array of email recipients
   mattr_accessor :mail_to
-  @@mail_to = ->(mailer, params) {
+  @@mail_to = -> {
     if ActionMailer::Base.respond_to?(:email_address_with_name)
       ActionMailer::Base.email_address_with_name(params[:pay_customer].email, params[:pay_customer].customer_name)
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails