pay 4.0.2 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd5f149f88ae66352491ff4da889e6e252d491fa37467a1a7a05d635ef855f61
-  data.tar.gz: 970ca6f6183aba7795368d5b2b78c3ddb932498bd54af20567c467d126246e10
+  metadata.gz: e9178fdc2803ccfa6b8552a26e34a3849702c5f0ea7143a00773dc8d51b7f373
+  data.tar.gz: c8da4c71a2317213e3e23b4be9651eafc4ce3df5848b4ac918d89fab916d731e
 SHA512:
-  metadata.gz: e7fd623efada808362cef4f67d1a66919a2a74103c69cf16c859d854dc5e4ef8aed9e58cccd6addc1b2328b663824d7fa0830144ec44bceff3c2fde32a6f7131
-  data.tar.gz: 27cad2d3b9a1fb239c5dc68282f728fadf07451b2a9c9aa29d77274077d52b608865a39f90de5d3416f69c418f75493a545f4f41f00b58bccf722a52dcfabf3e
+  metadata.gz: fff2d403ce33d8fe02b869b4387d164a8f50ec5b2bdfdb7d747e11987ba586e14958dc220e77379e5649340b44a12352b61e2862395ccf0991c4b3597b7261f0
+  data.tar.gz: 9a98e720f18f9e2572410c52d86ea3b46c08490a1a7749ea627bc7cb4ee8fe717ac7d45c90e58c8799a92d602d8b91712d08eea7ccfec7d0ec1a93b7c20af004

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,15 @@ 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",
+            "latest_invoice.total_discount_amounts.discount",
+            "latest_invoice.total_tax_amounts.tax_rate"
+          ]
+        }
       end
 
       def initialize(pay_subscription)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "4.0.2"
+  VERSION = "4.1.1"
 end

metadata

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