pay 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c79f10c2e9258ebfd7a54a58283d0d14eb33121b5f51f4a5b563088f672d41'
-  data.tar.gz: 14af03dc31b7b65f9975c90876d1ffb764009e3cae1038abe2bce37822901c49
+  metadata.gz: b424cae3cd4905b55f734e86687c12fba5972aeade9dc81f430d364d29bd9ea6
+  data.tar.gz: 709ca786d171e5b5652fb1a4de5206b2564155a0adabfb02476282eefbfe473a
 SHA512:
-  metadata.gz: bb583c78584c50bbf21d8d15f7a97449073864cb7064c6ae265639d3f75a97d528868d9db1b2b5d4a8e4e1036d19dd55a4ecdd49f96b9f24149f8e38c4cd4eab
-  data.tar.gz: 95f41a1f851f09d9dae598a7d2f795668f4c1b5f28b0fec2ac05e7aed1fd95ad5aefdc5f1fab28f4cbf9a16b6385d55d40bb0f78562906335d8373eb4d76cdee
+  metadata.gz: d153b66802f9ffea402b973ea2420f2cbb9ae6666dfe4c81d49457ac11045c06ee2e54f2ea3410fd5a7b3452461ca580e1cf52cde6831ab9238c624862cbe831
+  data.tar.gz: 2c22450d862a9d39d6abed5b3cc1454c657e15ab92399f64d2c306b69cf600fb2cf838d8d2080d285d42d62b0554de526a72bb7602b342eeecdeff4b49670cbd

data/app/models/pay/charge.rb

@@ -41,6 +41,8 @@ module Pay
     store_accessor :data, :discounts # array of discount IDs applied to the Stripe Invoice
     store_accessor :data, :total_discount_amounts # array of discount details
     store_accessor :data, :total_tax_amounts # array of tax details for each jurisdiction
+    store_accessor :data, :credit_notes # array of credit notes for the Stripe Invoice
+    store_accessor :data, :refunds # array of refunds
 
     # Helpers for payment processors
     %w[braintree stripe paddle fake_processor].each do |processor_name|

data/config/locales/en.yml

@@ -35,6 +35,7 @@ en:
       payment_method: "Payment Method"
       amount_paid: "Amount paid"
       refunded: "Refunded"
+      refunded_on: "Refunded on %{date}"
     invoice:
       number: "Invoice Number"
       date: "Date"

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)]
@@ -85,16 +86,29 @@ module Pay
       "#{tax_rate["display_name"]} - #{tax_rate["jurisdiction"]} (#{percent})"
     end
 
-    def receipt_pdf(**options)
-      receipt_line_items = pdf_line_items
+    def receipt_line_items
+      line_items = pdf_line_items
 
       # Include total paid
-      receipt_line_items << [nil, nil, I18n.t("pay.receipt.amount_paid"), Pay::Currency.format(amount, currency: currency)]
+      line_items << [nil, nil, I18n.t("pay.receipt.amount_paid"), Pay::Currency.format(amount, currency: currency)]
 
       if refunded?
-        receipt_line_items << [nil, nil, I18n.t("pay.receipt.refunded_on"), Pay::Currency.format(amount_refunded, currency: currency)]
+        # If we have a list of individual refunds, add each entry
+        if refunds&.any?
+          refunds.each do |refund|
+            next unless refund["status"] == "succeeded"
+            refunded_at = Time.at(refund["created"]).to_date
+            line_items << [nil, nil, I18n.t("pay.receipt.refunded_on", date: I18n.l(refunded_at, format: :long)), Pay::Currency.format(refund["amount"], currency: refund["currency"])]
+          end
+        else
+          line_items << [nil, nil, I18n.t("pay.receipt.refunded"), Pay::Currency.format(amount_refunded, currency: currency)]
+        end
       end
 
+      line_items
+    end
+
+    def receipt_pdf(**options)
       defaults = {
         details: receipt_details,
         recipient: [

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

@@ -22,6 +22,9 @@ module Pay
         pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
         return unless pay_customer
 
+        refunds = []
+        object.refunds.auto_paging_each { |refund| refunds << refund }
+
         payment_method = object.payment_method_details.send(object.payment_method_details.type)
         attrs = {
           amount: object.amount,
@@ -42,7 +45,8 @@ module Pay
           payment_method_type: object.payment_method_details.type,
           stripe_account: pay_customer.stripe_account,
           stripe_receipt_url: object.receipt_url,
-          total_tax_amounts: []
+          total_tax_amounts: [],
+          refunds: refunds.sort_by! { |r| r["created"] }
         }
 
         # Associate charge with subscription if we can
@@ -75,7 +79,6 @@ module Pay
               period_end: Time.at(line_item.period.end)
             }
           end
-
         # Charges without invoices
         else
           attrs[:period_start] = Time.at(object.created)

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

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

metadata

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