pay 4.0.0 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e717b53ed9818a630f87c3847987395e9c1b66659bab7b606f13b6981ac7169
-  data.tar.gz: 367aab7c54a527c8933f2c64c8d1efd3b02af1e7982c377f5d00341d25e598e9
+  metadata.gz: 6659a95f47cd229375f090cb734b440ca8484cd9672b88bd482dede070fa6819
+  data.tar.gz: 408ef1cbfd3364d30d7e7bbfd78c58b585034c54e65346db92f1e9a7cf3ab279
 SHA512:
-  metadata.gz: 84250ec5485c33c88f8300fb4568eca3b4a2a31ea398eb6770b23f7c08d25e56ac5341873b724c49d5ef2d691632ad9ea97d603b6a251a33de45d22aa862f348
-  data.tar.gz: df0b4d5551925bb9a8dd4d69427c50c944b333a37bc3cdbd13e47963903d439691823213b211f99709e5caa79df1b39b0f879ae7f4aa43cc73bae1a94dc7ae6f
+  metadata.gz: 8ffbc4d1d685f994a1dc3e45d8b7f20a4a4d4f8852cd3ca7d349d2af5cc22445c2c526eef8906305aa80b8d37ae82c6f0101b271a121b66d4bc4624f82446480
+  data.tar.gz: 12332883526b3e321e70e8b30445b40dfa85715f3a7a7bfece32940fb857f8f747b586d48245f760b9e3866a54d2532d9ca9dce8b0da55441f3b619cec14072f

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/receipts.rb

@@ -60,7 +60,8 @@ module Pay
 
       # Tax rates
       Array.wrap(total_tax_amounts).each do |tax_amount|
-        items << [nil, nil, tax_description(tax_amount), Pay::Currency.format(tax, currency: currency)]
+        next if tax_amount["amount"].zero?
+        items << [nil, nil, tax_description(tax_amount), Pay::Currency.format(tax_amount["amount"], currency: currency)]
       end
 
       items << [nil, nil, I18n.t("pay.line_items.total"), Pay::Currency.format(amount, currency: currency)]

data/lib/pay/stripe/billable.rb

@@ -104,7 +104,7 @@ module Pay
       def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
         quantity = options.delete(:quantity)
         opts = {
-          expand: ["pending_setup_intent", "latest_invoice.payment_intent", "latest_invoice.charge.invoice"],
+          expand: ["pending_setup_intent", "latest_invoice.payment_intent", "latest_invoice.charge"],
           items: [plan: plan, quantity: quantity],
           off_session: true
         }.merge(options)

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/subscription.rb

@@ -84,7 +84,7 @@ module Pay
 
         # Sync the latest charge if we already have it loaded (like during subscrbe), otherwise, let webhooks take care of creating it
         if (charge = object.try(:latest_invoice).try(:charge)) && charge.try(:status) == "succeeded"
-          Pay::Stripe::Charge.sync(charge.id, object: charge)
+          Pay::Stripe::Charge.sync(charge.id, stripe_account: pay_subscription.stripe_account)
         end
 
         pay_subscription
@@ -100,7 +100,7 @@ module Pay
 
       # Common expand options for all requests that create, retrieve, or update a Stripe Subscription
       def self.expand_options
-        {expand: ["pending_setup_intent", "latest_invoice.payment_intent", "latest_invoice.charge.invoice"]}
+        {expand: ["pending_setup_intent", "latest_invoice.payment_intent", "latest_invoice.charge"]}
       end
 
       def initialize(pay_subscription)

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/checkout_session_async_payment_succeeded.rb

@@ -1,14 +1,7 @@
 module Pay
   module Stripe
     module Webhooks
-      class CheckoutSessionAsyncPaymentSucceeded
-        def call(event)
-          # TODO: Also handle payment intents
-
-          if event.data.object.subscription
-            Pay::Stripe::Subscription.sync(event.data.object.subscription, stripe_account: event.try(:account))
-          end
-        end
+      class CheckoutSessionAsyncPaymentSucceeded < CheckoutSessionCompleted
       end
     end
   end

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

@@ -5,10 +5,29 @@ module Pay
         def call(event)
           # TODO: Also handle payment intents
 
-          if event.data.object.subscription
-            Pay::Stripe::Subscription.sync(event.data.object.subscription, stripe_account: event.try(:account))
+          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
+          end
+
+          if (subscription_id = event.data.object.subscription)
+            Pay::Stripe::Subscription.sync(subscription_id, stripe_account: event.try(:account))
           end
         end
+
+        def locate_owner(object)
+          return if object.client_reference_id.nil?
+
+          # If there is a client reference ID, make sure we have a Pay::Customer record
+          owner = GlobalID::Locator.locate_signed(object.client_reference_id)
+          owner&.add_payment_processor(:stripe, processor_id: object.customer)
+        rescue
+          Rails.logger.debug "[Pay] Unable to locate record with SGID: #{object.client_reference_id}"
+        end
       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.4"
 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.4
 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-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails