spree_stripe 1.2.7 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28c5ddd2fd7eb2275fa2849ffc6a5eb72c741877f5ebcacf5486d9bfd873eb4
-  data.tar.gz: e7486c7ae9c566a8362d9a6031be7ba6ac43e5d655a59d7527a6cb6d769a9131
+  metadata.gz: 9f99142efe129494bc6d2bd1690e85dfae817eb652833217b24d14055811d778
+  data.tar.gz: 9916be21b249554ec30e9b46e014634626a2763d1881d8808b14eb87079bc228
 SHA512:
-  metadata.gz: ae13960a5deba6d50b233e4a8a659ee26ab90a6db2e2706c5a6773fb0599951b5d957c654f1b2561153bf65abe89aba3aeb375b865fad22c1751238a7a0699b0
-  data.tar.gz: d0d51d696f41240dfe9809e17c20960302469e3d5451101a317ad95db63053fd1958225531ad334dcd1e5b73929bf006a9dbe455da2aa3dbce719833fb9bb6a9
+  metadata.gz: 5791e797836bf0b150915a01b61649ca3da6e5b4f758ec446842d1503919c59f4aaabc09767651e50e5d7c4deaa9bdda3bdb491529bbed20226331cca7fb15bf
+  data.tar.gz: 9ec61e460685afd67d0f19aaba2af8d5a33716397e9f56d9939b4b24020cd569a7d11322e7489345bd0be8b1250d777bc69bead40e944de120db58177ea6cec2

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

@@ -271,6 +271,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

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/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
@@ -97,7 +88,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/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/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.7'.freeze
+  VERSION = '1.3.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,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_stripe
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.0
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 2025-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -197,16 +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/address_decorator.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
@@ -225,11 +227,14 @@ files:
 - 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

data/app/models/spree_stripe/address_decorator.rb

@@ -1,17 +0,0 @@
-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
-
-Spree::Address.prepend(SpreeStripe::AddressDecorator)