pay 6.7.2 → 6.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af316b3951f2b2d0844c3fcfebc005f43a42cca3f2704eb19cde32df968f787
-  data.tar.gz: d22bc794be545843843ba97e03ac9190e3835ec61c288aeb2e14fe562be055dc
+  metadata.gz: bcbe66e7978f3f589514c71a54b0f7450b41b57ddcd7025ce17e93130e42e1dd
+  data.tar.gz: e6168b5908003c44a5bf494d93590c4eaed7e2777178e66aa3303c72e2ffea2a
 SHA512:
-  metadata.gz: a855e7acead57687470d16476fdee052649ae15977f21e611fbf529d337551895696310fbdc7f62d9242142f737de3c4045077c4208d79aa6bb38313467003c9
-  data.tar.gz: d9071f2afbb72357256e78997a0617d4edbc5fbb1f904fc2a9afaff3078e2f19fbe8fa6b9b39708e75b0cba27b16f9dd9778be86514f0fdaabaacf86aa105be3
+  metadata.gz: 3c5ed3d8be3d803c66091d647957a8dc115c298de1daa4a8f53a69aae55ff7a8df406835718feafe231437f842a1770dedadac1cf9b8ac81a9494ee31e1ccc8e
+  data.tar.gz: 2571ba9c847b47ad74fe3996b159bac179b553dc1bc1d673f52194fbd6a17f381a27ebace5668254f13c17dd288a6bba0d6f93d51c809d0474ac28b68f0f42b4

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

@@ -5,11 +5,11 @@ module Pay
     module Webhooks
       class SubscriptionChargedUnsuccessfully
         def call(event)
-          subscription = event.subscription
-          return if subscription.nil?
+          # subscription = event.subscription
+          # return if subscription.nil?
 
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          return unless pay_subscription.present?
+          # pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
+          # return unless pay_subscription.present?
 
           # pay_customer = pay_subscription.customer
           # pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)

data/lib/pay/stripe/billable.rb

@@ -77,20 +77,17 @@ module Pay
         )
       end
 
+      # Charges an amount to the customer's default payment method
       def charge(amount, options = {})
         add_payment_method(payment_method_token, default: true) if payment_method_token?
 
         payment_method = pay_customer.default_payment_method
         args = {
-          amount: amount,
           confirm: true,
-          currency: "usd",
-          customer: processor_id,
-          expand: ["latest_charge.refunds"],
           payment_method: payment_method&.processor_id
         }.merge(options)
 
-        payment_intent = ::Stripe::PaymentIntent.create(args, stripe_options)
+        payment_intent = create_payment_intent(amount, args)
         Pay::Payment.new(payment_intent).validate
 
         charge = payment_intent.latest_charge
@@ -99,6 +96,24 @@ module Pay
         raise Pay::Stripe::Error, e
       end
 
+      # Creates and returns a Stripe::PaymentIntent
+      def create_payment_intent(amount, options = {})
+        args = {
+          amount: amount,
+          currency: "usd",
+          customer: processor_id,
+          expand: ["latest_charge.refunds"],
+          return_url: root_url
+        }.merge(options)
+
+        ::Stripe::PaymentIntent.create(args, stripe_options)
+      end
+
+      # Used for creating Stripe Terminal charges
+      def terminal_charge(amount, options = {})
+        create_payment_intent(amount, options.merge(payment_method_types: ["card_present"], capture_method: "manual"))
+      end
+
       def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
         quantity = options.delete(:quantity)
         opts = {

data/lib/pay/stripe/charge.rb

@@ -15,12 +15,16 @@ module Pay
       def self.sync(charge_id, object: nil, stripe_account: nil, try: 0, retries: 1)
         # Skip loading the latest charge details from the API if we already have it
         object ||= ::Stripe::Charge.retrieve({id: charge_id, expand: ["invoice.total_discount_amounts.discount", "invoice.total_tax_amounts.tax_rate", "refunds"]}, {stripe_account: stripe_account}.compact)
-
-        # Ignore charges without a Customer
-        return if object.customer.blank?
+        if object.customer.blank?
+          Rails.logger.debug "Stripe Charge #{object.id} does not have a customer"
+          return
+        end
 
         pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
-        return unless pay_customer
+        if pay_customer.blank?
+          Rails.logger.debug "Pay::Customer #{object.customer} is not in the database while syncing Stripe Charge #{object.id}"
+          return
+        end
 
         refunds = []
         object.refunds.auto_paging_each { |refund| refunds << refund }

data/lib/pay/stripe/payment_method.rb

@@ -28,9 +28,16 @@ module Pay
       # Syncs PaymentMethod objects from Stripe
       def self.sync(id, object: nil, stripe_account: nil, try: 0, retries: 1)
         object ||= ::Stripe::PaymentMethod.retrieve(id, {stripe_account: stripe_account}.compact)
+        if object.customer.blank?
+          Rails.logger.debug "Stripe PaymentMethod #{object.id} does not have a customer"
+          return
+        end
 
         pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
-        return unless pay_customer
+        if pay_customer.blank?
+          Rails.logger.debug "Pay::Customer #{object.customer} is not in the database while syncing Stripe PaymentMethod #{object.id}"
+          return
+        end
 
         default_payment_method_id = pay_customer.customer.invoice_settings.default_payment_method
         default = (id == default_payment_method_id)

data/lib/pay/stripe/subscription.rb

@@ -31,9 +31,16 @@ module Pay
       def self.sync(subscription_id, object: nil, name: nil, stripe_account: nil, try: 0, retries: 1)
         # Skip loading the latest subscription details from the API if we already have it
         object ||= ::Stripe::Subscription.retrieve({id: subscription_id}.merge(expand_options), {stripe_account: stripe_account}.compact)
+        if object.customer.blank?
+          Rails.logger.debug "Stripe Subscription #{object.id} does not have a customer"
+          return
+        end
 
         pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
-        return unless pay_customer
+        if pay_customer.blank?
+          Rails.logger.debug "Pay::Customer #{object.customer} is not in the database while syncing Stripe Subscription #{object.id}"
+          return
+        end
 
         attributes = {
           application_fee_percent: object.application_fee_percent,

data/lib/pay/stripe.rb

@@ -30,6 +30,8 @@ module Pay
 
     extend Env
 
+    REQUIRED_VERSION = "~> 9"
+
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id
     mattr_accessor :model_names, default: Set.new
@@ -37,12 +39,12 @@ module Pay
     def self.enabled?
       return false unless Pay.enabled_processors.include?(:stripe) && defined?(::Stripe)
 
-      Pay::Engine.version_matches?(required: "~> 8", current: ::Stripe::VERSION) || (raise "[Pay] stripe gem must be version ~> 8")
+      Pay::Engine.version_matches?(required: REQUIRED_VERSION, current: ::Stripe::VERSION) || (raise "[Pay] stripe gem must be version #{REQUIRED_VERSION}")
     end
 
     def self.setup
       ::Stripe.api_key = private_key
-      ::Stripe.api_version ||= "2022-11-15"
+      ::Stripe.api_version ||= "2023-08-16"
 
       # Used by Stripe to identify Pay for support
       ::Stripe.set_app_info("PayRails", partner_id: "pp_partner_IqhY0UExnJYLxg", version: Pay::VERSION, url: "https://github.com/pay-rails/pay")

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.7.2"
+  VERSION = "6.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 6.8.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-09-05 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.18
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails