pay 6.6.1 → 6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab0375b33bf0e7b915b73943996117c80c1c27698a0194dc061804edf18e200
-  data.tar.gz: 50c1aea0c823cc6c1ed317fc1b9742c53b8ed9dfe0f8d8d7d580dbeb4b5b9008
+  metadata.gz: f6c599414b39eb92d44ee17f7ccb9de063c15eed29b0ea42d404f600df9966a8
+  data.tar.gz: 9d74f8b7307dfb0f5236c07356227dfb3f51dfa90e2e20a98beefa9a70d362a6
 SHA512:
-  metadata.gz: c6e964209c442885544401a62dfe5669a26a9f04ffacbf3531a1ec6d3eb7bb97dfa2dc9298397abfa9aabe7547e54851369bbd96505ce08ec0a90f5d28358671
-  data.tar.gz: e6749f6044b4075cd107d9cfb0b7739e9d60a7a55d9dac952520b1ddc71609e10825946395ab5271a19dcda07cb9e0703827864e6cf2dbbfe8eba0921bb1e26d
+  metadata.gz: b9b66934a36fedbd9bba2bbf01d3d4c97f32bf561d391919a980b3c95aa6ab59abcb0bf972c3f283707e8f578c329025525396f50a85e39a74572b7623467484
+  data.tar.gz: 7720adbb3990da1bb586a0be8f53d071ebce4bca693f37213b56a0987b8ecc865495abb56ad6ada95472e8af272bb07c407d14becdc346b16d9160358d76be78

data/app/controllers/pay/payments_controller.rb

@@ -13,7 +13,7 @@ module Pay
     # Ensure the back parameter is a valid path
     # This safely handles XSS or external redirects
     def set_redirect_to
-      @redirect_to = URI.parse(params[:back].to_s).path || root_path
+      @redirect_to = URI.parse(params[:back].to_s).path.presence || root_path
     end
   end
 end

data/app/models/pay/customer.rb

@@ -19,6 +19,10 @@ module Pay
     store_accessor :data, :stripe_account
     store_accessor :data, :braintree_account
 
+    # Stripe invoice credit balance is a Hash-like object { "usd" => 1234 }
+    store_accessor :data, :invoice_credit_balance
+    store_accessor :data, :currency
+
     delegate :email, to: :owner
     delegate_missing_to :pay_processor
 

data/lib/pay/env.rb

@@ -9,21 +9,20 @@ module Pay
     # the current environment.
     #
     # 1. Check environment variable
-    # 2. Check environment scoped credentials, then secrets
-    # 3. Check unscoped credentials, then secrets
+    # 2. Check environment scoped credentials
+    # 3. Check unscoped credentials
+    # 4. Check scoped and unscoped secrets (removed in Rails 7.2)
     #
     # For example, find_value_by_name("stripe", "private_key") will check the following in order until it finds a value:
     #
     #   ENV["STRIPE_PRIVATE_KEY"]
     #   Rails.application.credentials.dig(:production, :stripe, :private_key)
-    #   Rails.application.secrets.dig(:production, :stripe, :private_key)
     #   Rails.application.credentials.dig(:stripe, :private_key)
-    #   Rails.application.secrets.dig(:stripe, :private_key)
     def find_value_by_name(scope, name)
       ENV["#{scope.upcase}_#{name.upcase}"] ||
         credentials&.dig(env, scope, name) ||
-        secrets&.dig(env, scope, name) ||
         credentials&.dig(scope, name) ||
+        secrets&.dig(env, scope, name) ||
         secrets&.dig(scope, name)
     rescue ActiveSupport::MessageEncryptor::InvalidMessage
       Rails.logger.error <<~MESSAGE
@@ -40,7 +39,7 @@ module Pay
     end
 
     def secrets
-      Rails.application.secrets
+      Rails.application.secrets if Rails.application.respond_to?(:secrets)
     end
 
     def credentials

data/lib/pay/stripe/billable.rb

@@ -49,7 +49,7 @@ module Pay
       # Returns a Stripe::Customer object
       def customer
         stripe_customer = if processor_id?
-          ::Stripe::Customer.retrieve({id: processor_id, expand: ["tax"]}, stripe_options)
+          ::Stripe::Customer.retrieve({id: processor_id, expand: ["tax", "invoice_credit_balance"]}, stripe_options)
         else
           sc = ::Stripe::Customer.create(customer_attributes.merge(expand: ["tax"]), stripe_options)
           pay_customer.update!(processor_id: sc.id, stripe_account: stripe_account)

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

@@ -9,14 +9,24 @@ module Pay
           # Couldn't find user, we can skip
           return unless pay_customer.present?
 
+          stripe_customer = pay_customer.customer
+
           # Sync default card
-          if (payment_method_id = pay_customer.customer.invoice_settings.default_payment_method)
+          if (payment_method_id = stripe_customer.invoice_settings.default_payment_method)
             Pay::Stripe::PaymentMethod.sync(payment_method_id, stripe_account: event.try(:account))
 
           else
             # No default payment method set
             pay_customer.payment_methods.update_all(default: false)
           end
+
+          # Sync invoice credit balance and currency
+          if stripe_customer.invoice_credit_balance.present?
+            pay_customer.update(
+              invoice_credit_balance: stripe_customer.invoice_credit_balance,
+              currency: stripe_customer.currency
+            )
+          end
         end
       end
     end

data/lib/pay/stripe.rb

@@ -98,7 +98,7 @@ module Pay
         # When a customers subscription trial period is 3 days from ending or ended immediately this event is fired
         events.subscribe "stripe.customer.subscription.trial_will_end", Pay::Stripe::Webhooks::SubscriptionTrialWillEnd.new
 
-        # Monitor changes for customer's default card changing
+        # Monitor changes for customer's default card changing and invoice credit updates
         events.subscribe "stripe.customer.updated", Pay::Stripe::Webhooks::CustomerUpdated.new
 
         # If a customer was deleted in Stripe, their subscriptions should be cancelled

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.6.1"
+  VERSION = "6.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.6.1
+  version: 6.7.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails