pay 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e717b53ed9818a630f87c3847987395e9c1b66659bab7b606f13b6981ac7169
-  data.tar.gz: 367aab7c54a527c8933f2c64c8d1efd3b02af1e7982c377f5d00341d25e598e9
+  metadata.gz: '09c79f10c2e9258ebfd7a54a58283d0d14eb33121b5f51f4a5b563088f672d41'
+  data.tar.gz: 14af03dc31b7b65f9975c90876d1ffb764009e3cae1038abe2bce37822901c49
 SHA512:
-  metadata.gz: 84250ec5485c33c88f8300fb4568eca3b4a2a31ea398eb6770b23f7c08d25e56ac5341873b724c49d5ef2d691632ad9ea97d603b6a251a33de45d22aa862f348
-  data.tar.gz: df0b4d5551925bb9a8dd4d69427c50c944b333a37bc3cdbd13e47963903d439691823213b211f99709e5caa79df1b39b0f879ae7f4aa43cc73bae1a94dc7ae6f
+  metadata.gz: bb583c78584c50bbf21d8d15f7a97449073864cb7064c6ae265639d3f75a97d528868d9db1b2b5d4a8e4e1036d19dd55a4ecdd49f96b9f24149f8e38c4cd4eab
+  data.tar.gz: 95f41a1f851f09d9dae598a7d2f795668f4c1b5f28b0fec2ac05e7aed1fd95ad5aefdc5f1fab28f4cbf9a16b6385d55d40bb0f78562906335d8373eb4d76cdee

data/app/mailers/pay/user_mailer.rb

@@ -1,5 +1,5 @@
 module Pay
-  class UserMailer < ApplicationMailer
+  class UserMailer < Pay.parent_mailer.constantize
     def receipt
       if params[:pay_charge].respond_to? :receipt
         attachments[params[:pay_charge].filename] = params[:pay_charge].receipt

data/lib/pay/braintree/webhooks/subscription_charged_successfully.rb

@@ -15,7 +15,7 @@ module Pay
           pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
 
           if pay_charge && Pay.send_email?(:receipt, pay_charge)
-            Pay::UserMailer.with(pay_customer: pay_customer, pay_charge: pay_charge).receipt.deliver_later
+            Pay.mailer.with(pay_customer: pay_customer, pay_charge: pay_charge).receipt.deliver_later
           end
         end
       end

data/lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb

@@ -15,7 +15,7 @@ module Pay
           # pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
 
           # if Pay.send_emails
-          #  Pay::UserMailer.with(pay_customer: pay_charge.customer, charge: pay_charge).receipt.deliver_later
+          #  Pay.mailer.with(pay_customer: pay_charge.customer, charge: pay_charge).receipt.deliver_later
           # end
         end
       end

data/lib/pay/paddle/webhooks/subscription_payment_refunded.rb

@@ -9,7 +9,7 @@ module Pay
           pay_charge.update!(amount_refunded: (event.gross_refund.to_f * 100).to_i)
 
           if Pay.send_email?(:refund, pay_charge)
-            Pay::UserMailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).refund.deliver_later
+            Pay.mailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).refund.deliver_later
           end
         end
       end

data/lib/pay/paddle/webhooks/subscription_payment_succeeded.rb

@@ -44,7 +44,7 @@ module Pay
 
         def notify_user(pay_charge)
           if Pay.send_email?(:receipt, pay_charge)
-            Pay::UserMailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).receipt.deliver_later
+            Pay.mailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).receipt.deliver_later
           end
         end
       end

data/lib/pay/stripe/charge.rb

@@ -128,7 +128,7 @@ module Pay
         else
           ::Stripe::Refund.create(options.merge(charge: processor_id, amount: amount_to_refund), stripe_options)
         end
-        pay_charge.update!(amount_refunded: amount_to_refund)
+        pay_charge.update!(amount_refunded: pay_charge.amount_refunded + amount_to_refund)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end

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

@@ -6,7 +6,7 @@ module Pay
           pay_charge = Pay::Stripe::Charge.sync(event.data.object.id, stripe_account: event.try(:account))
 
           if pay_charge && Pay.send_email?(:refund, pay_charge)
-            Pay::UserMailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).refund.deliver_later
+            Pay.mailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).refund.deliver_later
           end
         end
       end

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

@@ -6,7 +6,7 @@ module Pay
           pay_charge = Pay::Stripe::Charge.sync(event.data.object.id, stripe_account: event.try(:account))
 
           if pay_charge && Pay.send_email?(:receipt, pay_charge)
-            Pay::UserMailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).receipt.deliver_later
+            Pay.mailer.with(pay_customer: pay_charge.customer, pay_charge: pay_charge).receipt.deliver_later
           end
         end
       end

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

@@ -12,7 +12,7 @@ module Pay
           return if pay_subscription.nil?
 
           if Pay.send_email?(:payment_action_required, pay_subscription)
-            Pay::UserMailer.with(
+            Pay.mailer.with(
               pay_customer: pay_subscription.customer,
               payment_intent_id: event.data.object.payment_intent,
               pay_subscription: pay_subscription

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

@@ -15,7 +15,7 @@ module Pay
           price = event.data.object.lines.data.first.price
 
           if Pay.send_email?(:subscription_renewing, pay_subscription, price)
-            Pay::UserMailer.with(
+            Pay.mailer.with(
               pay_customer: pay_subscription.customer,
               pay_subscription: pay_subscription,
               date: Time.zone.at(event.data.object.next_payment_attempt)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

data/lib/pay.rb

@@ -3,6 +3,8 @@ require "pay/engine"
 require "pay/errors"
 require "pay/adapter"
 
+require "active_support/dependencies"
+
 module Pay
   autoload :Attributes, "pay/attributes"
   autoload :Env, "pay/env"
@@ -60,6 +62,20 @@ module Pay
     (price&.type == "recurring") && (price.recurring&.interval == "year")
   }
 
+  @@mailer = "Pay::UserMailer"
+
+  def self.mailer=(value)
+    @@mailer = value
+    @@mailer_ref = nil
+  end
+
+  def self.mailer
+    @@mailer_ref ||= @@mailer&.constantize
+  end
+
+  mattr_accessor :parent_mailer
+  @@parent_mailer = "Pay::ApplicationMailer"
+
   def self.setup
     yield self
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails