pay 10.1.3 → 10.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fddeba44df77f083b49b253a9df62cbf96b131f1e6909307ebda05d97182067a
-  data.tar.gz: a688da09f393dd5979c733218d9532f905a4f8770b24349f9743617752d80e34
+  metadata.gz: 740b4dafabcbd3a2fdffa9cf0e34ca0f22e4b6c4f74da849d3b2087267439fa1
+  data.tar.gz: 6f59c38d8a5302a0793f22d558795136a1bac2d7d453e6076502a95ff7cf5512
 SHA512:
-  metadata.gz: fbd0cde3b1c9633b4b5648d7e92b4542bd9235a03e808ef8344afc85a08d9a8c66447cd814f7604199c74e26c12124d4a075eb2f1ef7e96c5b3b100f145f0a7d
-  data.tar.gz: daa632f8f37b54b528e025ce8d8ce6ba294b52457d743ce1360bb0438e5d985ee96b08ab8f72b8c6920f8d295e18d2324edc64e1d8b4999e7523153ddb7e6cb0
+  metadata.gz: 5a8190510febace01505e5aab44f1cb3747254ebf8fd41b7450ed33a434941c601bea6470b37d7f50d82ecda529696d5ba5cb7a94f651001130921d4d32c7d93
+  data.tar.gz: 3c9db926c7b0520ff8e24cc5a8ec106e2b478a11e3fb8ea435c48d25758af196727b720cdab564c30bc1a543ce4df6310e4280db54e79cae3f4745be1549c716

data/app/controllers/pay/payments_controller.rb

@@ -6,7 +6,7 @@ module Pay
 
     def show
       @payment = Payment.from_id(params[:id])
-    rescue Stripe::StripeError => e
+    rescue ::Stripe::StripeError => e
       redirect_to root_path, alert: e.message
     end
 

data/app/models/pay/customer.rb

@@ -20,7 +20,7 @@ module Pay
     store_accessor :data, :invoice_credit_balance
     store_accessor :data, :currency
 
-    delegate :email, to: :owner
+    delegate :email, to: :owner, allow_nil: true
 
     %w[stripe braintree paddle_billing paddle_classic lemon_squeezy fake_processor].each do |processor_name|
       scope processor_name, -> { where(processor: processor_name) }

data/app/models/pay/fake_processor/customer.rb

@@ -55,6 +55,10 @@ module Pay
         subscriptions.create!(attributes)
       end
 
+      def sync_subscriptions(**options)
+        []
+      end
+
       def add_payment_method(payment_method_id, default: false)
         # Make to generate a processor_id
         api_record

data/app/models/pay/stripe/subscription.rb

@@ -297,7 +297,7 @@ module Pay
         )
 
         # Validate that swap was successful and handle SCA if needed
-        if (payment_intent_id = @api_record.latest_invoice.payments.first.payment.payment_intent)
+        if (payment_intent_id = @api_record.latest_invoice.payments.first&.payment&.payment_intent)
           Pay::Payment.from_id(payment_intent_id).validate
         end
 

data/lib/pay/attributes.rb

@@ -35,7 +35,7 @@ module Pay
         klass = "Pay::#{processor_name.to_s.classify}::Customer".constantize
         raise ArgumentError, "not a valid payment processor" if klass.ancestors.exclude?(Pay::Customer)
 
-        ActiveRecord::Base.transaction do
+        with_lock do
           pay_customers.update_all(default: false)
           pay_customer = pay_customers.active.where(processor: processor_name, type: klass.name).first_or_initialize
           pay_customer.update!(attributes.merge(default: true))
@@ -81,7 +81,7 @@ module Pay
       end
 
       def set_merchant_processor(processor_name, **attributes)
-        ActiveRecord::Base.transaction do
+        with_lock do
           pay_merchants.update_all(default: false)
           pay_merchant = pay_merchants.where(processor: processor_name, type: "Pay::#{processor_name.to_s.classify}::Merchant").first_or_initialize
           pay_merchant.update!(attributes.merge(default: true))

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

@@ -13,11 +13,13 @@ module Pay
           pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, subscription_id)
           return if pay_subscription.nil? || pay_subscription.status == "incomplete"
 
-          if Pay.send_email?(:payment_action_required, pay_subscription)
+          invoice_payment = ::Stripe::InvoicePayment.list({invoice: invoice.id, status: :open}).first
+
+          if invoice_payment && Pay.send_email?(:payment_action_required, pay_subscription)
             Pay.mailer.with(
               pay_customer: pay_subscription.customer,
-              payment_intent_id: invoice.payment_intent,
-              pay_subscription: pay_subscription
+              pay_subscription: pay_subscription,
+              payment_intent_id: invoice_payment.payment.payment_intent
             ).payment_action_required.deliver_later
           end
         end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "10.1.3"
+  VERSION = "10.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 10.1.3
+  version: 10.1.5
 platform: ruby
 authors:
 - Jason Charnes
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Payments engine for Ruby on Rails
 test_files: []