spree_stripe 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fc16c4c66625cd297cb6b34950212f80282a391bcfd8504f5bdca3fb965e3b6
-  data.tar.gz: c375e87b7aa96d0ff378b181b0db2585cfb16a8c207e859c1d7d266cf8de3116
+  metadata.gz: aba1375f50b74ab3e4fa3887f9b40c314f56f3e96898e21a02ab43efddc2dd07
+  data.tar.gz: a812910d9968f97b3f4ba54fa4026e5ca824e13b8ed4e86bc4a11377904e0285
 SHA512:
-  metadata.gz: f75ae1f8dafbf9be2c134b8689fdeddc9dd1a05e66b77b1cb315fb40627493c91ee035aa30555e6f8d1f8c48b24bf05a3338b0c9eba5e31ceeeead9b803518d1
-  data.tar.gz: 5577ee9f5e556bca74158eefe15091778a67099d7a9b44936fd778a11fcfaf62a3b268dfd30394790ffe825fa38361feab4b9c761e09156e228fc7d3512c9fcf
+  metadata.gz: 265ada6aa1bbbc80df01e8bdf347e1d9f24e6cec65e71c1480946dcfa0c9682df1d691c0fb80959807c5164027a0fec6e58dfa700d8dc5eeb5e1511327e67693
+  data.tar.gz: ef1a978a396ad0b67758811b48cd475c6ffbfdedb6b5292e138c89439711030c164dccd48f0c377094e5cac92c9376ee40888afc00932e74de4bf4b849cfe4b9

data/app/controllers/stripe_event/webhook_controller_decorator.rb

@@ -1,5 +1,9 @@
 module StripeEvent
   module WebhookControllerDecorator
+    def self.prepended(base)
+      base.include Spree::Core::ControllerHelpers::Store
+    end
+
     def secrets(payload, signature)
       all_signing_keys = SpreeStripe::WebhookKey.pluck(:signing_secret).uniq.compact
       all_signing_keys << ENV['STRIPE_SIGNING_SECRET'] if ENV['STRIPE_SIGNING_SECRET'].present?

data/app/javascript/spree_stripe/controllers/stripe_button_controller.js

@@ -160,14 +160,19 @@ export default class extends Controller {
       // In case of any error here we have to allow user try again
       try {
         const response = await fetch(
-          `${this.checkoutAdvancePathValue}?state=delivery&include=shipments.shipping_rates,line_items.vendor`,
+          this.checkoutAdvancePathValue,
           {
             method: 'PATCH',
             headers: {
               'X-Spree-Order-Token': this.orderTokenValue,
               'Content-Type': 'application/json'
             },
-            body: JSON.stringify({ quick_checkout: true, shipping_method_id: this.currentShippingOptionId })
+            body: JSON.stringify({
+              state: 'delivery',
+              include: 'shipments.shipping_rates',
+              quick_checkout: true,
+              shipping_method_id: this.currentShippingOptionId
+            })
           }
         )
         const newOrderResponse = await response.json()
@@ -259,13 +264,14 @@ export default class extends Controller {
     }
 
     const validationResponse = await fetch(
-      `${this.checkoutValidateOrderForPaymentPathValue}?skip_state=true`,
+      this.checkoutValidateOrderForPaymentPathValue,
       {
         method: 'POST',
         headers: {
           'X-Spree-Order-Token': this.orderTokenValue,
           'Content-Type': 'application/json'
-        }
+        },
+        body: JSON.stringify({ skip_state: true })
       }
     )
 
@@ -307,13 +313,16 @@ export default class extends Controller {
       return
     }
 
-    const advanceResponse = await fetch(`${this.checkoutAdvancePathValue}?state=payment`, {
+    const advanceResponse = await fetch(this.checkoutAdvancePathValue, {
       method: 'PATCH',
       headers: {
         'X-Spree-Order-Token': this.orderTokenValue,
         'Content-Type': 'application/json'
       },
-      body: JSON.stringify({ shipping_method_id: shippingRateId })
+      body: JSON.stringify({
+        state: 'payment',
+        shipping_method_id: shippingRateId
+      })
     })
 
     if (advanceResponse.status !== 200) {

data/app/javascript/spree_stripe/controllers/stripe_controller.js

@@ -206,10 +206,11 @@ export default class extends Controller {
   async updateBillingAddress() {
     // billing address same as shipping address
     if (this.billingAddressCheckbox?.checked) {
-      const response = await fetch(`${this.checkoutPathValue}?include=billing_address`, {
+      const response = await fetch(this.checkoutPathValue, {
         method: 'PATCH',
         headers: this.spreeApiHeaders,
         body: JSON.stringify({
+          include: 'billing_address',
           order: {
             use_shipping: true
           }
@@ -221,6 +222,8 @@ export default class extends Controller {
       if (response.ok) {
         return responseJson.included.find(item => item.type === 'address').attributes;
       } else {
+        const errors = Array.isArray(responseJson.error) ? responseJson.error.join('. ') : responseJson.error || 'Billing address is invalid';
+        showFlashMessage(errors, 'error');
         this.submitTarget.disabled = false;
         return false;
       }
@@ -230,10 +233,11 @@ export default class extends Controller {
     if (this.billingAddressForm.checkValidity()) {
       const formData = new FormData(this.billingAddressForm);
 
-      const response = await fetch(`${this.checkoutPathValue}?include=billing_address`, {
+      const response = await fetch(this.checkoutPathValue, {
         method: 'PATCH',
         headers: this.spreeApiHeaders,
         body: JSON.stringify({
+          include: 'billing_address',
           order: {
             bill_address_attributes: {
               firstname: formData.get("order[bill_address_attributes][firstname]"),
@@ -259,11 +263,6 @@ export default class extends Controller {
         const errors = Array.isArray(responseJson.error) ? responseJson.error.join('. ') : responseJson.error || 'Billing address is invalid';
         showFlashMessage(errors, 'error');
 
-        const flashMessage = document.getElementsByClassName('flash-message')[0];
-        if (flashMessage) {
-          flashMessage.scrollIntoView({ behavior: 'smooth', block: 'end', inline: 'nearest' });
-        }
-
         this.submitTarget.disabled = false;
         return false;
       }

data/app/jobs/spree_stripe/update_customer_job.rb

@@ -0,0 +1,10 @@
+module SpreeStripe
+  class UpdateCustomerJob < BaseJob
+    def perform(user_id)
+      return unless Spree.user_class.present?
+
+      user = Spree.user_class.find(user_id)
+      SpreeStripe::UpdateCustomer.new.call(user: user)
+    end
+  end
+end

data/app/models/spree_stripe/address_decorator.rb

@@ -0,0 +1,19 @@
+module SpreeStripe
+  module AddressDecorator
+    def self.prepended(base)
+      base.after_update :update_stripe_customer, if: :should_update_stripe_customer?
+    end
+
+    delegate :update_stripe_customer, to: :user, allow_nil: true
+
+    private
+
+    def should_update_stripe_customer?
+      user_default_billing? && previous_changes.any?
+    end
+  end
+end
+
+if ActiveRecord::Base.connection.database_exists? && ActiveRecord::Base.connection.table_exists?('spree_addresses')
+  Spree::Address.prepend(SpreeStripe::AddressDecorator)
+end

data/app/models/spree_stripe/gateway.rb

@@ -15,8 +15,8 @@ module SpreeStripe
 
     has_many :payment_intents, class_name: 'SpreeStripe::PaymentIntent', foreign_key: 'payment_method_id', dependent: :delete_all
 
-    def self.webhook_url
-      "https://#{Rails.application.routes.default_url_options[:host]}/stripe"
+    def webhook_url
+      StripeEvent::Engine.routes.url_helpers.root_url(host: stores.first.url, protocol: 'https')
     end
 
     def provider_class
@@ -128,18 +128,13 @@ module SpreeStripe
       gateway_customers.find_by(user: user) || create_customer(order: order, user: user)
     end
 
+    # Creates a Stripe customer based on the order or user
+    #
+    # @param order [Spree::Order] the order to use for creating the Stripe customer
+    # @param user [Spree::User] the user to use for creating the Stripe customer
+    # @return [Stripe::Customer] the created Stripe customer
     def create_customer(order: nil, user: nil)
-      user ||= order&.user
-      address = order&.bill_address || user&.bill_address
-      name = order&.name || user&.name
-      email = order&.email || user&.email
-
-      payload = SpreeStripe::CustomerPresenter.new(
-        name: name,
-        email: email,
-        address: address
-      ).call
-
+      payload = build_customer_payload(order: order, user: user)
       response = send_request { Stripe::Customer.create(payload) }
 
       customer = gateway_customers.build(user: user, profile_id: response.id)
@@ -147,6 +142,22 @@ module SpreeStripe
       customer
     end
 
+    # Updates a Stripe customer based on the order or user
+    #
+    # @param order [Spree::Order] the order to use for updating the Stripe customer
+    # @param user [Spree::User] the user to use for updating the Stripe customer
+    # @return [Stripe::Customer] the updated Stripe customer
+    def update_customer(order: nil, user: nil)
+      user ||= order&.user
+      return if user.blank?
+
+      customer = gateway_customers.find_by(user: user)
+      return if customer.blank?
+
+      payload = build_customer_payload(order: order, user: user)
+      send_request { Stripe::Customer.update(customer.profile_id, payload) }
+    end
+
     # Creates a Stripe payment intent for the order
     #
     # @param amount_in_cents [Integer] the amount in cents
@@ -362,5 +373,14 @@ module SpreeStripe
         end
       end
     end
+
+    def build_customer_payload(order: nil, user: nil)
+      user ||= order&.user
+      address = order&.bill_address || user&.bill_address
+      name = order&.name || user&.name
+      email = order&.email || user&.email
+
+      SpreeStripe::CustomerPresenter.new(name: name, email: email, address: address).call
+    end
   end
 end

data/app/models/spree_stripe/gateway_customer_decorator.rb

@@ -0,0 +1,9 @@
+module SpreeStripe
+  module GatewayCustomerDecorator
+    def self.prepended(base)
+      base.scope :stripe, -> { joins(:payment_method).where("#{Spree::PaymentMethod.table_name}.type" => SpreeStripe::Gateway.to_s) }
+    end
+  end
+end
+
+Spree::GatewayCustomer.prepend(SpreeStripe::GatewayCustomerDecorator)

data/app/models/spree_stripe/order_decorator.rb

@@ -12,6 +12,17 @@ module SpreeStripe
         payment_intent.update!(amount: total_minus_store_credits)
       end
     end
+
+    def associate_user!(user, override_email = true)
+      super(user, override_email)
+
+      return if payment_intents.empty?
+
+      responses = payment_intents.map { |payment_intent| payment_intent.update_stripe_payment_intent }
+      customer_id = responses.find { |response| response.params['customer'].present? }&.params['customer']
+
+      payment_intents.update_all(customer_id: customer_id) if customer_id.present?
+    end
   end
 end
 

data/app/models/spree_stripe/user_decorator.rb

@@ -0,0 +1,21 @@
+module SpreeStripe
+  module UserDecorator
+    def self.prepended(base)
+      base.after_update :update_stripe_customer, if: :should_update_stripe_customer?
+    end
+
+    def update_stripe_customer
+      SpreeStripe::UpdateCustomerJob.perform_later(id)
+    end
+
+    private
+
+    def should_update_stripe_customer?
+      ship_address_previously_changed? || bill_address_previously_changed? ||
+        first_name_previously_changed? || last_name_previously_changed? ||
+        email_previously_changed?
+    end
+  end
+end
+
+Spree.user_class.prepend(SpreeStripe::UserDecorator) if Spree.user_class.present?

data/app/presenters/spree_stripe/customer_presenter.rb

@@ -28,7 +28,7 @@ module SpreeStripe
         line2: address.address2,
         postal_code: address.zipcode,
         country: address.country_name,
-        state: address.state_name
+        state: address.state_name_text
       }
     end
   end

data/app/services/spree_stripe/create_gateway_webhooks.rb

@@ -2,15 +2,15 @@ module SpreeStripe
   class CreateGatewayWebhooks
     def call(payment_method:, events: SpreeStripe::Config[:supported_webhook_events], connect: false)
       webhook_list = Stripe::WebhookEndpoint.list({}, { api_key: payment_method.preferred_secret_key })
-      webhook = find_webhook(webhook_list[:data], events)
+      webhook = find_webhook(payment_method, webhook_list[:data], events)
 
       ensure_webhook(payment_method, webhook, connect, events)
     end
 
     private
 
-    def find_webhook(webhooks_data, enabled_events)
-      webhook_url = SpreeStripe::Gateway.webhook_url
+    def find_webhook(payment_method, webhooks_data, enabled_events)
+      webhook_url = payment_method.webhook_url
 
       webhooks_data.find do |webhook|
         webhook[:url] == webhook_url && webhook[:enabled_events].sort == enabled_events.sort
@@ -32,7 +32,7 @@ module SpreeStripe
     end
 
     def create_webhook_endpoint(payment_method, connect, events)
-      params = build_webhook_params(connect, events)
+      params = build_webhook_params(payment_method, connect, events)
       stripe_webhook = Stripe::WebhookEndpoint.create(params, { api_key: payment_method.preferred_secret_key })
 
       SpreeStripe::WebhookKey.create!(
@@ -44,9 +44,9 @@ module SpreeStripe
       Rails.cache.delete('stripe_webhook_signing_keys')
     end
 
-    def build_webhook_params(connect, events)
+    def build_webhook_params(payment_method, connect, events)
       {
-        url: SpreeStripe::Gateway.webhook_url,
+        url: payment_method.webhook_url,
         enabled_events: events,
         connect: connect
       }

data/app/services/spree_stripe/update_customer.rb

@@ -0,0 +1,13 @@
+module SpreeStripe
+  class UpdateCustomer
+    def call(user:)
+      gateway_customers = user.gateway_customers.stripe
+      return if gateway_customers.empty?
+
+      gateway_customers.each do |gateway_customer|
+        stripe_gateway = gateway_customer.payment_method
+        stripe_gateway.update_customer(user: user)
+      end
+    end
+  end
+end

data/app/views/spree_stripe/_quick_checkout.html.erb

@@ -27,7 +27,7 @@
       } do %>
       <div id="payment-request-button"></div>
 
-      <div class="relative group-[.no-separator]:hidden flex py-5 items-center ">
+      <div class="relative group-[.no-separator]:hidden flex pt-5 items-center ">
         <div class="flex-grow border-t border-default"></div>
         <span class="flex-shrink mx-4 text-gray-500 text-sm">
           <%= Spree.t('storefront.checkout.or_continue_below') %>

data/lib/spree_stripe/version.rb

@@ -1,5 +1,5 @@
 module SpreeStripe
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.6'.freeze
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_stripe
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 2025-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -204,10 +204,13 @@ files:
 - app/jobs/spree_stripe/complete_order_job.rb
 - app/jobs/spree_stripe/create_webhook_endpoint_job.rb
 - app/jobs/spree_stripe/register_domain_job.rb
+- app/jobs/spree_stripe/update_customer_job.rb
+- app/models/spree_stripe/address_decorator.rb
 - app/models/spree_stripe/base.rb
 - app/models/spree_stripe/credit_card_decorator.rb
 - app/models/spree_stripe/custom_domain_decorator.rb
 - app/models/spree_stripe/gateway.rb
+- app/models/spree_stripe/gateway_customer_decorator.rb
 - app/models/spree_stripe/order_decorator.rb
 - app/models/spree_stripe/payment_decorator.rb
 - app/models/spree_stripe/payment_intent.rb
@@ -223,6 +226,7 @@ files:
 - app/models/spree_stripe/payment_sources/przelewy24.rb
 - app/models/spree_stripe/payment_sources/sepa_debit.rb
 - app/models/spree_stripe/store_decorator.rb
+- app/models/spree_stripe/user_decorator.rb
 - app/models/spree_stripe/webhook_key.rb
 - app/presenters/spree_stripe/customer_presenter.rb
 - app/presenters/spree_stripe/payment_intent_presenter.rb
@@ -251,6 +255,7 @@ files:
 - app/services/spree_stripe/create_setup_intent.rb
 - app/services/spree_stripe/create_source.rb
 - app/services/spree_stripe/register_domain.rb
+- app/services/spree_stripe/update_customer.rb
 - app/services/spree_stripe/webhook_handlers/payment_intent_payment_failed.rb
 - app/services/spree_stripe/webhook_handlers/payment_intent_succeeded.rb
 - app/services/spree_stripe/webhook_handlers/setup_intent_succeeded.rb