spree_stripe 1.2.8 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba042a8962210e5a72ea878c0655a7cdc74fe70893d2c702e781e3d32364b8a9
-  data.tar.gz: b03960a8a7f5d7a2bc45884a3785264bfa7a9ae37bd3620d4e8fcd76a5dc78d8
+  metadata.gz: ed3fcc600ad3010c438e0fd42e964612f151d1bfacf1fab96bc781ca2e5d2fe2
+  data.tar.gz: c57032392b824d12f83aa4b63bc452cfdd88d22da8a88452426d150cddb226a4
 SHA512:
-  metadata.gz: 482a3764301fcb7ecb54b54d28d179999562a3131d3a049d5d61254609226b4044be3edcdc4340d16e5a2971da671f5108761484b4b989648feec1004c3451b0
-  data.tar.gz: 8c42847f31556185b30ae8f07a97720793dccae143db8cae35b20c990cde396ed027a6f059d56c7198a81124b337408b24898b1ae001387f35fcf0afffd12570
+  metadata.gz: f39b40bd6e0ceceb9f152fe4f2f7a2337368bd41bb823bbd1a403a2d126bc2b5c4446e82cd288758f93c422c8360cab41fb6f92bfeeb73ac5eb4ca0dc2ff4c5d
+  data.tar.gz: 8464c1cbbc5d25fb74390cd500f1ec8a7dddf2615d2281407ae8fe3ab361b5738e11aa1223d2c9c75a76a991122eba0f248f5152706b645aad44ee3acf985686

data/README.md

@@ -140,7 +140,7 @@ We’re thrilled to unveil [Spree 5](https://spreecommerce.org/announcing-spree-
 - New integrations: a native [Stripe integration](https://github.com/spree/spree_stripe), and also Stripe Connect, Klaviyo integrations available with the Enterprise Edition
 - Enterprise Edition Admin Features: Audit Log, [Multi-Vendor Marketplace](https://spreecommerce.org/marketplace-ecommerce/), [Multi-tenant / White-label SaaS eCommerce](https://spreecommerce.org/multi-tenant-white-label-ecommerce/)
 
-Read the [full Spree 5 announcement here](https://spreecommerce.org/announcing-spree-5-the-biggest-open-source-release-ever/).
+Read the [full Spree 5 announcement here](https://spreecommerce.org/announcing-spree-5-the-biggest-open-source-release-ever/) and the [changelog of Spree 5](https://github.com/spree/spree/releases) followup improvements.
 
 Check out the [Spree 5 demo](https://demo.spreecommerce.org/) for yourself, including this Stripe integration.
 

data/app/assets/images/payment_icons/banktransfer.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+</svg>

data/app/assets/images/payment_icons/sepadebit.svg

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="katman_1" x="0px" y="0px" style="enable-background:new 0 0 1190.55 841.89;" xml:space="preserve" viewBox="238.65 160 712.7 521">
+<style type="text/css">
+	.st0{fill:#26367D;}
+	.st1{clip-path:url(#SVGID_00000165933728503162618370000013584018841918814628_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#FBBA2C;}
+</style>
+<path class="st0" d="M302,160h586c34.99,0,63.35,28.36,63.35,63.35v394.3c0,34.99-28.36,63.35-63.35,63.35H302  c-34.99,0-63.35-28.36-63.35-63.35v-394.3C238.65,188.36,267.01,160,302,160z"/>
+<g>
+	<defs>
+		<rect id="SVGID_1_" x="341.04" y="162.96" width="507.9" height="506.81"/>
+	</defs>
+	<clipPath id="SVGID_00000137126528663880082090000017192719521453020821_">
+		<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
+	</clipPath>
+	<g style="clip-path:url(#SVGID_00000137126528663880082090000017192719521453020821_);">
+		<path class="st0" d="M367.09,226.31h455.81c14.38,0,26.04,13.62,26.04,30.41v319.29c0,16.79-11.66,30.41-26.04,30.41H367.09    c-14.38,0-26.05-13.62-26.05-30.41V256.72C341.04,239.93,352.71,226.31,367.09,226.31z"/>
+		<path class="st2" d="M404.53,381.92c0,3.22,0,5.34,1.06,8.55c0,1.09,1.05,2.12,1.05,3.22c2.06,13.91,8.3,20.27,21.76,21.38    c9.3,1.08,19.64,2.12,29,3.22c5.18,0,8.3,3.22,8.3,9.58c0,6.38-2.06,10.69-8.3,10.69h-18.64c-6.24,0-8.3-3.22-9.3-12.81h-24.82    v9.66c0,1.08,1.06,3.22,1.06,4.24c1.05,9.6,7.24,16.03,16.58,18.15c6.22,1.09,12.4,1.09,18.64,2.12h18.64    c6.24-1.09,11.4-2.12,17.58-4.24c7.24-2.12,12.42-7.48,13.46-16.03c1.06-7.48,1.06-16.03,1.06-23.5    c-1.05-8.55-5.16-14.94-13.46-17.1l-18.64-3.23c-6.22-1.09-12.42-1.09-18.64-1.09c-7.24,0-9.3-3.22-9.3-9.58    c0-7.48,3.12-9.6,9.3-10.69h10.34c9.3,0,11.4,1.11,12.42,10.69v1.09h24.82v-6.43c0-13.91-6.22-22.47-20.7-24.6    c-14.46-2.12-28.98-2.12-43.46,1.09c-11.4,2.12-16.58,7.48-18.64,20.27C405.55,378.69,404.53,379.8,404.53,381.92z M631.19,458.83    v-27.8h35.18c13.46,0,22.76-8.55,24.82-21.38c1.06-8.55,2.06-17.1,1.06-25.61c-1.06-19.24-10.34-28.82-28.98-29.93    c-17.58-1.09-35.18-1.09-52.82-1.09c-4.12,0-5.18,1.11-5.18,5.35v101.5C613.61,459.92,622.91,459.92,631.19,458.83z     M631.19,407.53V377.6c0,0,2.06-2.12,3.12-2.12h18.64c7.24,1.11,10.36,4.32,10.36,11.78v10.69c0,6.43-2.06,9.58-8.3,9.58H631.19z     M708.83,459.92c1.06-5.34,2.06-11.77,4.18-17.1c0-1.11,2.06-2.14,3.12-2.14h33.1c1.06,0,2.06,2.12,3.12,3.22    c2.06,5.35,3.12,10.69,5.18,16.03h27.94c-1.06-2.12-2.06-5.34-3.12-7.46l-27.94-96.23c0-1.09-2.06-3.22-3.12-3.22h-39.34    c-4.18,12.88-7.24,25.67-11.4,38.49c-6.24,22.41-13.46,45.9-19.64,68.37C680.9,459.87,708.83,459.92,708.83,459.92z     M747.12,421.43h-26.94c4.12-15,8.3-31.01,12.42-45.96h1.05c4.18,15,9.34,29.93,13.46,45.96H747.12z"/>
+		<path class="st3" d="M575.35,441.71c-16.6,0-29-7.46-34.18-19.24h37.28l4.12-11.77h-45.58v-8.55l46.59,2.12l5.16-13.86h-49.68    c5.16-14.94,18.64-22.46,36.22-22.46c7.44-0.05,14.81,1.44,21.76,4.26l4.12-14.94c-4.12-2.14-13.46-4.26-26.92-4.26    c-27.95,0-49.71,13.91-56.94,38.49h-12.35l-5.18,11.78h15.52v9.53h-9.3l-6.22,11.78h17.58c6.24,21.37,25.88,34.18,53.82,34.18    c13.46,0,23.82-2.12,27.94-4.26l-3.12-14.94C591.93,440.69,583.63,441.71,575.35,441.71z"/>
+	</g>
+</g>
+</svg>

data/app/controllers/spree/api/v2/storefront/stripe/payment_intents_controller.rb

@@ -56,7 +56,7 @@ module Spree
                 render_error_payload(Spree.t('order_already_completed'))
               elsif order != spree_current_order
                 raise ActiveRecord::RecordNotFound
-              elsif stripe_payment_intent.status == 'succeeded'
+              elsif @payment_intent.accepted?
                 spree_authorize! :update, spree_current_order, order_token
 
                 SpreeStripe::CompleteOrder.new(payment_intent: @payment_intent).call

data/app/controllers/spree_stripe/payment_intents_controller.rb

@@ -26,7 +26,7 @@ module SpreeStripe
       elsif @order.completed?
         redirect_to spree.checkout_complete_path(@order.token), status: :see_other
       # if the payment intent is successful, we need to process the payment and complete the order
-      elsif @stripe_payment_intent.status == 'succeeded'
+      elsif @payment_intent_record.accepted?
         @order = SpreeStripe::CompleteOrder.new(payment_intent: @payment_intent_record).call
 
         # set the session flag to indicate that the order was placed now

data/app/helpers/spree_stripe/checkout_helper_decorator.rb

@@ -0,0 +1,15 @@
+module SpreeStripe
+  module CheckoutHelperDecorator
+    def checkout_payment_sources(payment_method = nil)
+      payment_sources = super(payment_method)
+      return payment_sources if payment_sources.empty? || !payment_method.stripe?
+
+      wallet_sources, non_wallet_sources = payment_sources.partition { |source| source.wallet_type.present? }
+      unique_wallet_sources = wallet_sources.sort_by(&:created_at).reverse.uniq { |source| [source.wallet_type, source.cc_type, source.last_digits, source.month, source.year] }
+
+      non_wallet_sources + unique_wallet_sources
+    end
+  end
+end
+
+Spree::CheckoutHelper.prepend(SpreeStripe::CheckoutHelperDecorator)

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

@@ -25,6 +25,7 @@ export default class extends Controller {
     checkoutValidateOrderForPaymentPath: String,
     shippingRequired: { type: Boolean, default: true },
     returnUrl: String,
+    phoneRequired: { type: Boolean, default: false },
   }
 
   static targets = ['container']
@@ -104,6 +105,7 @@ export default class extends Controller {
 
       event.resolve({
         emailRequired: true,
+        phoneNumberRequired: this.phoneRequiredValue,
         shippingAddressRequired: this.shippingRequiredValue,
         allowedShippingCountries: this.availableCountriesValue,
         // If we want to collect shipping address then we need to provide at least one shipping option, it will be updated to the real ones in the `shippingaddresschange` event

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

@@ -13,7 +13,8 @@ export default class extends Controller {
     colorText: String,
     paymentIntentPath: String,
     checkoutPath: String,
-    checkoutValidateOrderForPaymentPath: String
+    checkoutValidateOrderForPaymentPath: String,
+    paymentElementAdditionalOptions: { type: Object, default: {} }
   }
 
   static targets = [
@@ -96,7 +97,8 @@ export default class extends Controller {
               postalCode: 'never'
             }
           }
-        }
+        },
+        ...this.paymentElementAdditionalOptionsValue
       })
       paymentElement.mount(this.paymentElementTarget)
       paymentElement.on('change', (event) => {

data/app/jobs/spree_stripe/create_tax_transaction_job.rb

@@ -0,0 +1,10 @@
+module SpreeStripe
+  class CreateTaxTransactionJob < BaseJob
+    def perform(store_id, payment_intent_id, tax_calculation_id)
+      store = Spree::Store.find(store_id)
+      gateway = store.stripe_gateway
+
+      gateway.create_tax_transaction(payment_intent_id, tax_calculation_id) if gateway.present?
+    end
+  end
+end

data/app/models/spree_stripe/calculators/stripe_tax.rb

@@ -0,0 +1,96 @@
+module SpreeStripe
+  module Calculators
+    class StripeTax < ::Spree::Calculator
+      def self.description
+        'Stripe tax calculator'
+      end
+
+      def compute_line_item(line_item)
+        order = line_item.order
+        return 0.to_d unless stripe_tax_enabled?(order)
+
+        tax_calculation_data = get_or_create_tax_calculation(order)
+        return 0.to_d unless tax_calculation_data.present?
+
+        # Find the tax line for this specific line item
+        line_items = tax_calculation_data.dig('line_items', 'data') || []
+        stripe_line_item = line_items.find do |line|
+          line['reference'].to_s == line_item.id.to_s
+        end
+
+        # Debug logging
+        if stripe_line_item.nil?
+          Rails.logger.debug "Stripe Tax: No line item found for reference #{line_item.id}. Available references: #{line_items.map { |li| li['reference'] }.join(', ')}"
+          return 0.to_d
+        end
+
+        # Get the tax amount for this line item from amount_tax field
+        amount_in_cents = stripe_line_item['amount_tax'] || 0
+        Rails.logger.debug "Stripe Tax: Line item #{line_item.id} tax amount: #{amount_in_cents} cents"
+        amount_money = Spree::Money.from_cents(amount_in_cents, { currency: order.currency })
+        amount_money.to_d
+      end
+
+      def compute_shipment(shipment)
+        order = shipment.order
+        return 0.to_d unless stripe_tax_enabled?(order)
+
+        tax_calculation_data = get_or_create_tax_calculation(order)
+        return 0.to_d unless tax_calculation_data.present?
+
+        # Get the shipping cost tax breakdown
+        shipping_cost = tax_calculation_data['shipping_cost']
+        return 0.to_d unless shipping_cost.present?
+
+        # Get the tax amount for shipping
+        amount_in_cents = shipping_cost['amount_tax'] || 0
+        amount_money = Spree::Money.from_cents(amount_in_cents, { currency: order.currency })
+        amount_money.to_d
+      end
+
+      private
+
+      def stripe_tax_enabled?(order)
+        stripe_gateway = order.store.stripe_gateway
+        stripe_gateway.present? && stripe_gateway.active?
+      end
+
+      def get_or_create_tax_calculation(order)
+        return unless order.tax_address.present?
+        return if order.state.in?(%w[cart address])
+
+        stripe_gateway = order.store.stripe_gateway
+
+        cache_key = [
+          order.number,
+          order.currency,
+          order.item_total,
+          order.item_count,
+          order.line_items.reload.map { |li| [li.id, li.quantity, li.taxable_amount].compact }.flatten.join('_'),
+          order.shipments.map { |s| [s.shipping_method&.id, s.cost].compact }.flatten.join('_'),
+          order.tax_address&.cache_key_with_version,
+        ].compact.join('_')
+
+        tax_calculation = Rails.cache.fetch("stripe_tax_calculation_#{cache_key}", expires_in: 1.hour) do
+          stripe_gateway.create_tax_calculation(order).to_hash.deep_stringify_keys
+        rescue => e
+          Rails.error.report(e, context: { order_id: order.id }, source: 'spree_stripe')
+          {}
+        end
+
+        return nil unless tax_calculation.present?
+
+        # persist the tax calculation in the order for future use
+        # we will need this to create tax transaction
+        order.stripe_tax_calculation_id = tax_calculation['id']
+        order.save!
+
+        tax_calculation
+      rescue => e
+        Rails.error.report(e, context: { order_id: order.id }, source: 'spree_stripe')
+        nil
+      end
+
+    end
+  end
+end

data/app/models/spree_stripe/gateway.rb

@@ -2,6 +2,9 @@ module SpreeStripe
   class Gateway < ::Spree::Gateway
     include SpreeStripe::Gateway::Tax if defined?(SpreeStripe::Gateway::Tax)
 
+    DELAYED_NOTIFICATION_PAYMENT_METHOD_TYPES = %w[sepa_debit us_bank_account].freeze
+    BANK_PAYMENT_METHOD_TYPES = %w[customer_balance us_bank_account].freeze
+
     preference :publishable_key, :password
     preference :secret_key, :password
 
@@ -23,6 +26,28 @@ module SpreeStripe
       self.class
     end
 
+    def payment_intent_accepted?(payment_intent)
+      payment_intent.status.in?(payment_intent_accepted_statuses(payment_intent))
+    end
+
+    def payment_intent_delayed_notification?(payment_intent)
+      payment_method = payment_intent.payment_method
+      return false unless payment_method.respond_to?(:type)
+
+      payment_intent.payment_method.type.in?(DELAYED_NOTIFICATION_PAYMENT_METHOD_TYPES)
+    end
+
+    def payment_intent_charge_not_required?(payment_intent)
+      payment_intent_bank_payment_method?(payment_intent)
+    end
+
+    def payment_intent_bank_payment_method?(payment_intent)
+      payment_method = payment_intent.payment_method
+      return false unless payment_method.respond_to?(:type)
+
+      payment_intent.payment_method.type.in?(BANK_PAYMENT_METHOD_TYPES)
+    end
+
     # @param amount_in_cents [Integer] the amount in cents to capture
     # @param payment_source [Spree::CreditCard | Spree::PaymentSource]
     # @param gateway_options [Hash] this is an instance of Spree::Payment::GatewayOptions.to_hash
@@ -52,7 +77,7 @@ module SpreeStripe
         payment = ensure_payment_intent_exists_for_payment(payment, amount_in_cents, payment_source)
         stripe_payment_intent = retrieve_payment_intent(payment.response_code)
 
-        response = if stripe_payment_intent.status == 'succeeded'
+        response = if payment_intent_accepted?(stripe_payment_intent)
                      # payment intent is already confirmed via Stripe JS SDK
                      stripe_payment_intent
                    else
@@ -92,8 +117,13 @@ module SpreeStripe
       end
     end
 
-    def void(response_code, source, gateway_options)
-      raise NotImplementedError
+    def void(response_code, _source, _gateway_options)
+      return failure('Response code is blank') if response_code.blank?
+
+      protect_from_error do
+        response = cancel_payment_intent(response_code)
+        success(response.id, response)
+      end
     end
 
     def cancel(payment_intent_id, payment = nil)
@@ -205,7 +235,7 @@ module SpreeStripe
     end
 
     def retrieve_payment_intent(payment_intent_id)
-      send_request { Stripe::PaymentIntent.retrieve(payment_intent_id) }
+      send_request { Stripe::PaymentIntent.retrieve({ id: payment_intent_id, expand: ['payment_method'] }) }
     end
 
     def confirm_payment_intent(payment_intent_id)
@@ -271,6 +301,43 @@ module SpreeStripe
       end
     end
 
+    def create_tax_calculation(order)
+      protect_from_error do
+        send_request do
+          Stripe::Tax::Calculation.create(
+            SpreeStripe::TaxPresenter.new(order: order).call
+          )
+        end
+      end
+    end
+
+    def create_tax_transaction(payment_intent_id, tax_calculation_id)
+      protect_from_error do
+        payload = {
+          calculation: tax_calculation_id,
+          reference: payment_intent_id,
+          expand: ['line_items']
+        }
+
+        send_request { Stripe::Tax::Transaction.create_from_calculation(payload) }
+      end
+    end
+
+    def attach_customer_to_credit_card(user)
+      payment_method_id = user&.default_credit_card&.gateway_payment_profile_id
+      return if payment_method_id.blank? || user&.default_credit_card&.gateway_customer_profile_id.present?
+
+      customer = fetch_or_create_customer(user: user)
+      return if customer.blank?
+
+      send_request { Stripe::PaymentMethod.attach(payment_method_id, { customer: customer.profile_id }) }
+
+      user.default_credit_card.update(gateway_customer_profile_id: customer.profile_id, gateway_customer_id: customer.id)
+    rescue Stripe::StripeError => e
+      Rails.error.report(e, context: { payment_method_id: id, user_id: user.id }, source: 'spree_stripe')
+      nil
+    end
+
     def apple_domain_association_file_content
       @apple_domain_association_file_content ||= apple_developer_merchantid_domain_association&.download
     end
@@ -382,5 +449,12 @@ module SpreeStripe
 
       SpreeStripe::CustomerPresenter.new(name: name, email: email, address: address).call
     end
+
+    def payment_intent_accepted_statuses(payment_intent)
+      statuses = %w[succeeded]
+      statuses << 'processing' if payment_intent_delayed_notification?(payment_intent)
+      statuses << 'requires_action' if payment_intent_charge_not_required?(payment_intent)
+      statuses
+    end
   end
 end

data/app/models/spree_stripe/order_decorator.rb

@@ -2,6 +2,8 @@ module SpreeStripe
   module OrderDecorator
     def self.prepended(base)
       base.has_many :payment_intents, class_name: 'SpreeStripe::PaymentIntent', dependent: :destroy
+
+      base.store_accessor :private_metadata, :stripe_tax_calculation_id
     end
 
     def update_payment_intents
@@ -23,6 +25,18 @@ module SpreeStripe
 
       payment_intents.update_all(customer_id: customer_id) if customer_id.present?
     end
+
+    def persist_user_credit_card
+      super
+      stripe_gateway = store.stripe_gateway
+      return if stripe_gateway.blank?
+
+      stripe_gateway.attach_customer_to_credit_card(user)
+    end
+
+    def stripe_payment_intent
+      @stripe_payment_intent ||= payment_intents.last.stripe_payment_intent
+    end
   end
 end
 

data/app/models/spree_stripe/payment_decorator.rb

@@ -14,13 +14,13 @@ module SpreeStripe
         'pass' => 'P',
         'unchecked' => 'I'
       }
-    }.freeze
+    }.freeze unless defined?(AVS_CODES)
 
     CVV_CODES = {
       'pass' => 'M',
       'fail' => 'N',
       'unchecked' => 'P'
-    }.freeze
+    }.freeze unless defined?(CVV_CODES)
 
     def self.prepended(base)
       base.store_accessor :private_metadata, :stripe_charge_id

data/app/models/spree_stripe/payment_intent.rb

@@ -26,12 +26,27 @@ module SpreeStripe
     delegate :api_options, to: :payment_method
     delegate :store, :currency, to: :order
 
+    def accepted?
+      payment_method.payment_intent_accepted?(stripe_payment_intent)
+    end
+
+    def successful?
+      stripe_payment_intent.status == 'succeeded'
+    end
+
+    def charge_not_required?
+      payment_method.payment_intent_charge_not_required?(stripe_payment_intent)
+    end
+
     def stripe_payment_intent
       @stripe_payment_intent ||= payment_method.retrieve_payment_intent(stripe_id)
     end
 
     def stripe_charge
-      @stripe_charge ||= payment_method.retrieve_charge(stripe_payment_intent.latest_charge)
+      @stripe_charge ||= begin
+        latest_charge = stripe_payment_intent.latest_charge
+        latest_charge.present? ? payment_method.retrieve_charge(latest_charge) : nil
+      end
     end
 
     # here we create a payment if it doesn't exist

data/app/models/spree_stripe/payment_method_decorator.rb

@@ -1,6 +1,6 @@
 module SpreeStripe
   module PaymentMethodDecorator
-    STRIPE_TYPE = 'SpreeStripe::Gateway'.freeze
+    STRIPE_TYPE = 'SpreeStripe::Gateway'.freeze unless defined?(STRIPE_TYPE)
 
     def self.prepended(base)
       base.has_many :payment_methods_webhook_keys, class_name: 'SpreeStripe::PaymentMethodsWebhookKey'

data/app/models/spree_stripe/payment_sources/bank_transfer.rb

@@ -0,0 +1,17 @@
+module SpreeStripe
+  module PaymentSources
+    class BankTransfer < ::Spree::PaymentSource
+      def actions
+        %w[credit]
+      end
+
+      def self.display_name
+        Spree.t(:bank_transfer)
+      end
+
+      def name
+        Spree.t(:bank_transfer)
+      end
+    end
+  end
+end

data/app/models/spree_stripe/payment_sources/sepa_debit.rb

@@ -8,6 +8,10 @@ module SpreeStripe
       def self.display_name
         'SEPA Debit'
       end
+
+      def name
+        'SEPA Debit'
+      end
     end
   end
 end

data/app/models/spree_stripe/shipment_decorator.rb

@@ -0,0 +1,21 @@
+module SpreeStripe
+  module ShipmentDecorator
+    def self.prepended(base)
+      base.state_machine.after_transition to: :shipped, do: :create_tax_transaction_async
+    end
+
+    private
+
+    def create_tax_transaction_async
+      return unless order.fully_shipped?
+      return if order.stripe_tax_calculation_id.blank?
+
+      payment_intent = order.payment_intents.last
+      return if payment_intent.blank?
+
+      SpreeStripe::CreateTaxTransactionJob.perform_later(order.store_id, payment_intent.stripe_id, order.stripe_tax_calculation_id)
+    end
+  end
+end
+
+Spree::Shipment.prepend(SpreeStripe::ShipmentDecorator) if Spree::Shipment.included_modules.exclude?(SpreeStripe::ShipmentDecorator)

data/app/presenters/spree_stripe/payment_intent_presenter.rb

@@ -1,7 +1,6 @@
 module SpreeStripe
   class PaymentIntentPresenter
     SETUP_FUTURE_USAGE = 'off_session'
-    STATEMENT_DESCRIPTOR_MAX_CHARACTERS = 22
 
     def initialize(amount:, order:, customer: nil, payment_method_id: nil, off_session: false)
       @amount = amount
@@ -50,12 +49,14 @@ module SpreeStripe
 
     private
 
+    attr_reader :order, :amount, :customer, :ship_address, :payment_method_id
+
     def basic_payload
       {
         amount: amount,
         customer: customer,
         currency: order.currency,
-        statement_descriptor_suffix: statement_descriptor,
+        statement_descriptor_suffix: statement_descriptor_suffix,
         automatic_payment_methods: {
           enabled: true
         },
@@ -66,18 +67,8 @@ module SpreeStripe
       }
     end
 
-    def statement_descriptor
-      billing_name = order.store.billing_name
-      descriptor = "#{order.number} #{billing_name}".strip
-
-      if descriptor.length > STATEMENT_DESCRIPTOR_MAX_CHARACTERS
-        additional_char_count = descriptor.length - STATEMENT_DESCRIPTOR_MAX_CHARACTERS + 1
-        short_billing_name = billing_name[0...-additional_char_count]
-
-        descriptor = "#{order.number} #{short_billing_name}".strip
-      end
-
-      descriptor
+    def statement_descriptor_suffix
+      SpreeStripe::StatementDescriptorSuffixPresenter.new(order_description: order.number).call
     end
 
     def new_payment_method_payload
@@ -85,6 +76,9 @@ module SpreeStripe
         payment_method_options: {
           card: {
             setup_future_usage: SETUP_FUTURE_USAGE
+          },
+          sepa_debit: {
+            setup_future_usage: SETUP_FUTURE_USAGE
           }
         }
       }
@@ -97,7 +91,5 @@ module SpreeStripe
         confirm: @off_session # confirm is required for off_session payments
       }
     end
-
-    attr_reader :order, :amount, :customer, :ship_address, :payment_method_id
   end
 end

data/app/presenters/spree_stripe/statement_descriptor_suffix_presenter.rb

@@ -0,0 +1,35 @@
+module SpreeStripe
+  class StatementDescriptorSuffixPresenter
+    STATEMENT_DESCRIPTOR_MAX_CHARS = 10
+    STATEMENT_DESCRIPTOR_NOT_ALLOWED_CHARS = /[<>'"*\\]/.freeze
+    STATEMENT_PREFIX = 'O#'
+
+    def initialize(order_description:)
+      @order_description = order_description.to_s
+    end
+
+    def call
+      return if stripped_order_description.blank?
+
+      if stripped_order_description.count("A-Z") > 0
+        stripped_order_description
+      else
+        "#{STATEMENT_PREFIX}#{stripped_order_description}"[0...STATEMENT_DESCRIPTOR_MAX_CHARS].strip
+      end
+    end
+
+    private
+
+    attr_reader :order_description
+
+    def stripped_order_description
+      @stripped_order_description ||= begin
+        AnyAscii.transliterate(order_description)
+                .gsub(STATEMENT_DESCRIPTOR_NOT_ALLOWED_CHARS, '')
+                .strip
+                .upcase[0...STATEMENT_DESCRIPTOR_MAX_CHARS]
+                .strip
+      end
+    end
+  end
+end

data/app/presenters/spree_stripe/tax_presenter.rb

@@ -0,0 +1,63 @@
+module SpreeStripe
+  class TaxPresenter
+    SHIPPING_TAX_CODE = 'txcd_92010001'.freeze
+    TAX_BEHAVIOR = 'exclusive'.freeze
+
+    def initialize(order:)
+      @order = order
+    end
+
+    attr_reader :order
+
+    def call
+      {
+        currency: order.currency.downcase,
+        line_items: build_line_items_attributes(order.line_items),
+        customer_details: {
+          address: build_address_attributes(order.tax_address),
+          address_source: 'shipping',
+        },
+        shipping_cost: {
+          amount: calculate_shipping_cost(order.shipments),
+          tax_behavior: TAX_BEHAVIOR,
+          tax_code: SHIPPING_TAX_CODE
+        },
+        expand: [
+          'line_items.data.tax_breakdown',
+          'shipping_cost.tax_breakdown'
+        ]
+      }
+    end
+
+    private
+
+    def build_line_items_attributes(line_items)
+      line_items.map do |line_item|
+        {
+          reference: line_item.id,
+          tax_behavior: TAX_BEHAVIOR,
+          amount: Spree::Money.new(line_item.taxable_amount, currency: order.currency).cents,
+          quantity: line_item.quantity
+        }
+      end
+    end
+
+    def build_address_attributes(address)
+      return {} if address.blank?
+
+      {
+        line1: address.address1,
+        city: address.city,
+        state: address.state_text,
+        postal_code: address.zipcode,
+        country: address.country_iso
+      }
+    end
+
+    def calculate_shipping_cost(shipments)
+      zero_money = Spree::Money.new(0, currency: order.currency)
+      shipment_money = shipments.sum(zero_money, &:display_cost)
+      shipment_money.cents
+    end
+  end
+end

data/app/services/spree_stripe/complete_order.rb

@@ -9,7 +9,7 @@ module SpreeStripe
     def call
       order = payment_intent.order
 
-      return order if order.completed? || order.canceled?
+      return order if (order.completed? && order.paid?) || order.canceled?
 
       charge = payment_intent.stripe_charge
 
@@ -21,10 +21,14 @@ module SpreeStripe
         payment = payment_intent.find_or_create_payment!
 
         # process the payment
-        payment.process!
+        if payment_intent.successful?
+          payment.process!
+        else
+          payment.authorize!
+        end
 
         # complete the order
-        Spree::Dependencies.checkout_complete_service.constantize.call(order: order)
+        Spree::Dependencies.checkout_complete_service.constantize.call(order: order) unless order.completed?
       end
 
       order.reload
@@ -34,6 +38,8 @@ module SpreeStripe
 
     # we need to perform this for quick checkout orders which do not have these fields filled
     def add_customer_information(order, charge)
+      return order if charge.blank?
+
       billing_details = charge.billing_details
       address = billing_details.address
 

data/app/services/spree_stripe/create_payment.rb

@@ -19,6 +19,15 @@ module SpreeStripe
           stripe_billing_details: stripe_charge.billing_details,
           gateway: gateway
         ).call
+      elsif payment_intent.charge_not_required?
+        stripe_payment_intent = payment_intent.stripe_payment_intent
+        source = SpreeStripe::CreateSource.new(
+          order: order,
+          stripe_payment_method_details: stripe_payment_intent.payment_method,
+          stripe_payment_method_id: stripe_payment_intent.payment_method.id,
+          stripe_billing_details: nil,
+          gateway: gateway
+        ).call
       end
 
       # sometimes a job is re-tried and creates a double payment record so we need to avoid it!

data/app/services/spree_stripe/create_source.rb

@@ -34,6 +34,8 @@ module SpreeStripe
         SpreeStripe::PaymentSources::Link.create!(source_params)
       when 'affirm'
         SpreeStripe::PaymentSources::Affirm.create!(source_params)
+      when 'customer_balance', 'us_bank_account'
+        SpreeStripe::PaymentSources::BankTransfer.create!(source_params)
       else
         raise "[STRIPE] Unknown payment method #{stripe_payment_method_details.type}"
       end

data/app/services/spree_stripe/webhook_handlers/payment_intent_payment_failed.rb

@@ -2,16 +2,13 @@ module SpreeStripe
   module WebhookHandlers
     class PaymentIntentPaymentFailed
       def call(event)
-        return unless ['affirm', 'afterpay_clearpay'].include?(event.data.object&.last_payment_error&.payment_method&.type)
-
         payment_intent = SpreeStripe::PaymentIntent.find_by(stripe_id: event.data.object.id)
         return if payment_intent.nil?
 
         order = payment_intent.order
-
         return if order.canceled?
 
-        order.cancel!
+        order.cancel! if order.can_cancel?
       end
     end
   end

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

@@ -23,7 +23,8 @@
         checkout_stripe_button_checkout_validate_gift_card_data_path_value: respond_to?(:validate_gift_card_data_api_v2_storefront_checkout_path) ? spree.validate_gift_card_data_api_v2_storefront_checkout_path : nil,
         checkout_stripe_button_checkout_validate_order_for_payment_path_value: spree.validate_order_for_payment_api_v2_storefront_checkout_path,
         checkout_stripe_button_return_url_value: spree.stripe_payment_intent_url(current_stripe_payment_intent),
-        checkout_stripe_button_shipping_required_value: @order.respond_to?(:quick_checkout_require_address?) ? @order.quick_checkout_require_address? : true
+        checkout_stripe_button_shipping_required_value: @order.respond_to?(:quick_checkout_require_address?) ? @order.quick_checkout_require_address? : true,
+        checkout_stripe_button_phone_required_value: Spree::Config[:address_requires_phone]
       } do %>
       <div id="payment-request-button"></div>
 

data/config/initializers/spree.rb

@@ -1,5 +1,6 @@
 Rails.application.config.after_initialize do
   Rails.application.config.spree.payment_methods << SpreeStripe::Gateway
+  Rails.application.config.spree.calculators.tax_rates << SpreeStripe::Calculators::StripeTax
 
   if Rails.application.config.respond_to?(:spree_storefront)
     Rails.application.config.spree_storefront.head_partials << 'spree_stripe/head'

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 ---
 en:
   spree:
+    bank_transfer: Bank Transfer
     stripe:
       payment_intent_errors:
         canceled: Payment intent canceled

data/lib/spree_stripe/engine.rb

@@ -14,9 +14,11 @@ module SpreeStripe
     end
 
     initializer 'spree_stripe.assets' do |app|
-      app.config.assets.paths << root.join('app/javascript')
-      app.config.assets.paths << root.join('vendor/javascript')
-      app.config.assets.precompile += %w[spree_stripe_manifest]
+      if app.config.respond_to?(:assets)
+        app.config.assets.paths << root.join('app/javascript')
+        app.config.assets.paths << root.join('vendor/javascript')
+        app.config.assets.precompile += %w[spree_stripe_manifest]
+      end
     end
 
     initializer 'spree_stripe.importmap', before: 'importmap' do |app|

data/lib/spree_stripe/version.rb

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

data/lib/spree_stripe.rb

@@ -8,7 +8,9 @@ require 'stripe'
 require 'stripe_event'
 
 module SpreeStripe
+  mattr_accessor :queue
+
   def self.queue
-    'spree_stripe'
+    @@queue ||= Spree.queues.default
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spree_stripe
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.4.0
 platform: ruby
 authors:
 - Vendo Connect Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -178,7 +177,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: hello@spreecommerce.org
 executables: []
 extensions: []
@@ -188,7 +186,9 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/spree_stripe_manifest.js
+- app/assets/images/payment_icons/banktransfer.svg
 - app/assets/images/payment_icons/link.svg
+- app/assets/images/payment_icons/sepadebit.svg
 - app/controllers/spree/api/v2/storefront/stripe/base_controller.rb
 - app/controllers/spree/api/v2/storefront/stripe/payment_intents_controller.rb
 - app/controllers/spree/api/v2/storefront/stripe/setup_intents_controller.rb
@@ -197,15 +197,18 @@ files:
 - app/controllers/spree_stripe/store_controller_decorator.rb
 - app/controllers/stripe_event/webhook_controller_decorator.rb
 - app/helpers/spree_stripe/base_helper.rb
+- app/helpers/spree_stripe/checkout_helper_decorator.rb
 - app/javascript/spree_stripe/application.js
 - app/javascript/spree_stripe/controllers/stripe_button_controller.js
 - app/javascript/spree_stripe/controllers/stripe_controller.js
 - app/jobs/spree_stripe/base_job.rb
 - app/jobs/spree_stripe/complete_order_job.rb
+- app/jobs/spree_stripe/create_tax_transaction_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/base.rb
+- app/models/spree_stripe/calculators/stripe_tax.rb
 - app/models/spree_stripe/credit_card_decorator.rb
 - app/models/spree_stripe/custom_domain_decorator.rb
 - app/models/spree_stripe/gateway.rb
@@ -219,16 +222,20 @@ files:
 - app/models/spree_stripe/payment_sources/affirm.rb
 - app/models/spree_stripe/payment_sources/after_pay.rb
 - app/models/spree_stripe/payment_sources/alipay.rb
+- app/models/spree_stripe/payment_sources/bank_transfer.rb
 - app/models/spree_stripe/payment_sources/ideal.rb
 - app/models/spree_stripe/payment_sources/klarna.rb
 - app/models/spree_stripe/payment_sources/link.rb
 - app/models/spree_stripe/payment_sources/przelewy24.rb
 - app/models/spree_stripe/payment_sources/sepa_debit.rb
+- app/models/spree_stripe/shipment_decorator.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
+- app/presenters/spree_stripe/statement_descriptor_suffix_presenter.rb
+- app/presenters/spree_stripe/tax_presenter.rb
 - app/serializers/spree/api/v2/platform/affirm_serializer.rb
 - app/serializers/spree/api/v2/platform/after_pay_serializer.rb
 - app/serializers/spree/api/v2/platform/alipay_serializer.rb
@@ -292,7 +299,6 @@ homepage: https://github.com/spree/spree_stripe
 licenses:
 - AGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -308,8 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 4.0.2
 specification_version: 4
 summary: Official Spree Commerce Stripe payment gateway extension
 test_files: []