spree_stripe 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde218d7699681e3ca1686627494c10f7ba74c68c05cd7ed712e26454592c043
-  data.tar.gz: 7e956a2740e2ad931ce6243b6a2dba8d4345f8e7a67fa214e394c3f401a64c54
+  metadata.gz: 1fc16c4c66625cd297cb6b34950212f80282a391bcfd8504f5bdca3fb965e3b6
+  data.tar.gz: c375e87b7aa96d0ff378b181b0db2585cfb16a8c207e859c1d7d266cf8de3116
 SHA512:
-  metadata.gz: 7e780d1ab73b6947a1922f0d5b070f907e3629bb87284879b6a716597107faa4c923b90af18c6d5796c1f89f879c8e561ce0578f1f5350ca0d63f117ff654154
-  data.tar.gz: 884a713f6ed9782940e1ab45aab1ed2a68a406a02ca8db8b81659c3fedc420c637912def17fff3c593143bf0a24a602e206f6b0cae1207ff430825164894cf81
+  metadata.gz: f75ae1f8dafbf9be2c134b8689fdeddc9dd1a05e66b77b1cb315fb40627493c91ee035aa30555e6f8d1f8c48b24bf05a3338b0c9eba5e31ceeeead9b803518d1
+  data.tar.gz: 5577ee9f5e556bca74158eefe15091778a67099d7a9b44936fd778a11fcfaf62a3b268dfd30394790ffe825fa38361feab4b9c761e09156e228fc7d3512c9fcf

data/README.md

@@ -9,7 +9,7 @@ This is the official Stripe payment gateway extension for [Spree Commerce](https
 
 This Stripe integration is bundled in the [Spree Starter](https://github.com/spree/spree_starter/) for your development convenience. 
 
-Or you could follow the [installation instructions](https://github.com/spree/spree_stripe/edit/main/README.md#installation) below.
+Or you could follow the [installation instructions](https://spreecommerce.org/docs/integrations/payments/stripe).
 
 If you like what you see, consider giving this repo a GitHub star :star:
 

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

@@ -18,7 +18,12 @@ export default class extends Controller {
     maxRows: Number,
     maxColumns: Number,
     buttonWidth: Number,
-    storeUrl: String,
+    checkoutPath: String,
+    checkoutAdvancePath: String,
+    checkoutSelectShippingMethodPath: String,
+    checkoutValidateGiftCardDataPath: String,
+    checkoutValidateOrderForPaymentPath: String,
+    shippingRequired: { type: Boolean, default: true },
     returnUrl: String,
   }
 
@@ -99,10 +104,10 @@ export default class extends Controller {
 
       event.resolve({
         emailRequired: true,
-        shippingAddressRequired: true,
+        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
-        shippingRates: [{ id: 'loading', displayName: 'Loading...', amount: 0 }],
+        shippingRates: this.shippingRequiredValue ? [{ id: 'loading', displayName: 'Loading...', amount: 0 }] : [],
         lineItems: [
           { name: 'Subtotal', amount: 0 },
           { name: 'Shipping', amount: 0 },
@@ -112,8 +117,10 @@ export default class extends Controller {
         ]
       })
     })
-    prButton.on('shippingaddresschange', this.handleAddressChange.bind(this))
-    prButton.on('shippingratechange', this.handleShippingOptionChange.bind(this))
+    if (this.shippingRequiredValue) {
+      prButton.on('shippingaddresschange', this.handleAddressChange.bind(this))
+      prButton.on('shippingratechange', this.handleShippingOptionChange.bind(this))
+    }
     prButton.on('confirm', this.handleFinalizePayment.bind(this))
     prButton.on('cancel', this.handleCancelPayment.bind(this))
   }
@@ -139,7 +146,7 @@ export default class extends Controller {
     }
 
     // 1st we need to persist the address to the order
-    const saveAddressResponse = await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout`, {
+    const saveAddressResponse = await fetch(this.checkoutPathValue, {
       method: 'PATCH',
       headers: {
         'X-Spree-Order-Token': this.orderTokenValue,
@@ -153,7 +160,7 @@ export default class extends Controller {
       // In case of any error here we have to allow user try again
       try {
         const response = await fetch(
-          `${this.storeUrlValue}/api/v2/storefront/checkout/advance?state=delivery&include=shipments.shipping_rates,line_items.vendor`,
+          `${this.checkoutAdvancePathValue}?state=delivery&include=shipments.shipping_rates,line_items.vendor`,
           {
             method: 'PATCH',
             headers: {
@@ -197,7 +204,7 @@ export default class extends Controller {
 
       this.currentShippingOptionId = shippingRateId
 
-      const response = await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout/select_shipping_method`, {
+      const response = await fetch(this.checkoutSelectShippingMethodPathValue, {
         method: 'PATCH',
         headers: {
           'X-Spree-Order-Token': this.orderTokenValue,
@@ -225,14 +232,14 @@ export default class extends Controller {
       shippingRateId = String(shippingRateId).replace(/_google_pay_\d+/, '')
     }
 
-    if (!shippingRateId || shippingRateId === 'loading') {
+    if (this.shippingRequiredValue && (!shippingRateId || shippingRateId === 'loading')) {
       ev.paymentFailed({ reason: 'invalid_shipping_address' })
       return
     }
 
-    if (this.giftCardCodeValue && this.giftCardAmountValue) {
+    if (this.giftCardCodeValue && this.giftCardAmountValue && this.checkoutValidateGiftCardDataPathValue) {
       const giftCardValidationResponse = await fetch(
-        `${this.storeUrlValue}/api/v2/storefront/checkout/validate_gift_card_data`,
+        this.checkoutValidateGiftCardDataPathValue,
         {
           method: 'POST',
           headers: {
@@ -252,7 +259,7 @@ export default class extends Controller {
     }
 
     const validationResponse = await fetch(
-      `${this.storeUrlValue}/api/v2/storefront/checkout/validate_order_for_payment?skip_state=true`,
+      `${this.checkoutValidateOrderForPaymentPathValue}?skip_state=true`,
       {
         method: 'POST',
         headers: {
@@ -281,23 +288,12 @@ export default class extends Controller {
     const orderUpdatePayload = {
       order: {
         email: ev.billingDetails.email,
-        ship_address_attributes: {
-          quick_checkout: true,
-          firstname: ev.shippingAddress.name.split(' ')[0],
-          lastname: ev.shippingAddress.name.split(' ')[1],
-          address1: ev.shippingAddress.address.line1,
-          address2: ev.shippingAddress.address.line2,
-          city: ev.shippingAddress.address.city,
-          zipcode: ev.shippingAddress.address.postal_code,
-          country_iso: ev.shippingAddress.address.country,
-          state_name: ev.shippingAddress.address.state,
-          phone: ev.billingDetails.phone
-        }
+        ship_address_attributes: this.ShipAddressAttributes(ev)
       },
       do_not_change_state: true
     }
 
-    const updateResponse = await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout`, {
+    const updateResponse = await fetch(this.checkoutPathValue, {
       method: 'PATCH',
       headers: {
         'X-Spree-Order-Token': this.orderTokenValue,
@@ -306,49 +302,48 @@ export default class extends Controller {
       body: JSON.stringify(orderUpdatePayload)
     })
 
-    if (updateResponse.status === 200) {
-      const advanceResponse = await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout/advance?state=payment`, {
-        method: 'PATCH',
-        headers: {
-          'X-Spree-Order-Token': this.orderTokenValue,
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ shipping_method_id: shippingRateId })
-      })
+    if (updateResponse.status !== 200) {
+      ev.paymentFailed()
+      return
+    }
 
-      if (advanceResponse.status === 200) {
-        try {
-          const { error: paymentMethodError, paymentMethod } = await this.stripe.createPaymentMethod({
-            elements: this.elements
-          })
+    const advanceResponse = await fetch(`${this.checkoutAdvancePathValue}?state=payment`, {
+      method: 'PATCH',
+      headers: {
+        'X-Spree-Order-Token': this.orderTokenValue,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({ shipping_method_id: shippingRateId })
+    })
 
-          if (paymentMethodError) {
-            showFlashMessage(error, 'error')
-            return
-          }
+    if (advanceResponse.status !== 200) {
+      ev.paymentFailed()
+      return
+    }
 
-          const { error } = await this.stripe.confirmPayment({
-            clientSecret: this.clientSecretValue,
-            confirmParams: {
-              payment_method: paymentMethod.id,
-              // Stripe will automatically add `payment_intent` and `payment_intent_client_secret` params
-              return_url: this.returnUrlValue
-            }
-          })
-          if (error) {
-            if (error.length > 0) {
-              showFlashMessage(error, 'error')
-            }
-            return
-          }
-        } catch (e) {
-          console.log(e)
+    try {
+      const { error: paymentMethodError, paymentMethod } = await this.stripe.createPaymentMethod({
+        elements: this.elements
+      })
+
+      if (paymentMethodError) {
+        showFlashMessage(paymentMethodError, 'error')
+        return
+      }
+
+      const { error } = await this.stripe.confirmPayment({
+        clientSecret: this.clientSecretValue,
+        confirmParams: {
+          payment_method: paymentMethod.id,
+          // Stripe will automatically add `payment_intent` and `payment_intent_client_secret` params
+          return_url: this.returnUrlValue
         }
-      } else {
-        ev.paymentFailed()
+      })
+      if (error?.length > 0) {
+        showFlashMessage(error, 'error')
       }
-    } else {
-      ev.paymentFailed()
+    } catch (e) {
+      console.log(e)
     }
   }
 
@@ -369,7 +364,7 @@ export default class extends Controller {
 
     if (this.shippingRates?.length > 1 && this.currentShippingOptionId !== defaultShippingMethodId) {
       // reset shipping choice
-      await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout/select_shipping_method`, {
+      await fetch(this.checkoutSelectShippingMethodPathValue, {
         method: 'PATCH',
         headers: {
           'X-Spree-Order-Token': this.orderTokenValue,
@@ -380,7 +375,7 @@ export default class extends Controller {
     }
 
     // reset addresses
-    await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout`, {
+    await fetch(this.checkoutPathValue, {
       method: 'PATCH',
       headers: {
         'X-Spree-Order-Token': this.orderTokenValue,
@@ -449,4 +444,26 @@ export default class extends Controller {
 
     return { name: 'Tax', amount: amount }
   }
+
+  ShipAddressAttributes(ev) {
+    if (ev.shippingAddress) {
+      return {
+        quick_checkout: true,
+        firstname: ev.shippingAddress.name.split(' ')[0],
+        lastname: ev.shippingAddress.name.split(' ')[1],
+        address1: ev.shippingAddress.address.line1,
+        address2: ev.shippingAddress.address.line2,
+        city: ev.shippingAddress.address.city,
+        zipcode: ev.shippingAddress.address.postal_code,
+        country_iso: ev.shippingAddress.address.country,
+        state_name: ev.shippingAddress.address.state,
+        phone: ev.billingDetails.phone
+      }
+    }
+    else {
+      return {
+        quick_checkout: true,
+      }
+    }
+  }
 }

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

@@ -11,7 +11,9 @@ export default class extends Controller {
     colorPrimary: String,
     colorBackground: String,
     colorText: String,
-    storeUrl: String
+    paymentIntentPath: String,
+    checkoutPath: String,
+    checkoutValidateOrderForPaymentPath: String
   }
 
   static targets = [
@@ -53,7 +55,7 @@ export default class extends Controller {
     }
 
     const response = await fetch(
-      `${this.storeUrlValue}/api/v2/storefront/stripe/payment_intents/${this.paymentIntentValue.id}`,
+      this.paymentIntentPathValue,
       {
         method: 'PATCH',
         headers: this.spreeApiHeaders,
@@ -179,7 +181,7 @@ export default class extends Controller {
 
   async validateOrderForPayment() {
     const response = await fetch(
-      `${this.storeUrlValue}/api/v2/storefront/checkout/validate_order_for_payment`,
+      this.checkoutValidateOrderForPaymentPathValue,
       {
         method: 'POST',
         headers: this.spreeApiHeaders
@@ -203,8 +205,8 @@ export default class extends Controller {
 
   async updateBillingAddress() {
     // billing address same as shipping address
-    if (this.billingAddressCheckbox.checked) {
-      const response = await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout?include=billing_address`, {
+    if (this.billingAddressCheckbox?.checked) {
+      const response = await fetch(`${this.checkoutPathValue}?include=billing_address`, {
         method: 'PATCH',
         headers: this.spreeApiHeaders,
         body: JSON.stringify({
@@ -228,7 +230,7 @@ export default class extends Controller {
     if (this.billingAddressForm.checkValidity()) {
       const formData = new FormData(this.billingAddressForm);
 
-      const response = await fetch(`${this.storeUrlValue}/api/v2/storefront/checkout?include=billing_address`, {
+      const response = await fetch(`${this.checkoutPathValue}?include=billing_address`, {
         method: 'PATCH',
         headers: this.spreeApiHeaders,
         body: JSON.stringify({

data/app/views/spree/checkout/payment/_spree_stripe.html.erb

@@ -7,7 +7,9 @@
   data-checkout-stripe-order-email-value="<%= @order.email %>"
   data-checkout-stripe-color-primary-value="<%= hex_color_to_rgb(theme_setting(:primary_color)) %>"
   data-checkout-stripe-color-text-value="<%= hex_color_to_rgb(theme_setting(:text_color)) %>"
-  data-checkout-stripe-store-url-value="<%= current_store.formatted_url_or_custom_domain %>"
+  data-checkout-stripe-payment-intent-path-value="<%= spree.api_v2_storefront_stripe_payment_intent_path(current_stripe_payment_intent.id) %>"
+  data-checkout-stripe-checkout-path-value="<%= spree.api_v2_storefront_checkout_path %>"
+  data-checkout-stripe-checkout-validate-order-for-payment-path-value="<%= spree.validate_order_for_payment_api_v2_storefront_checkout_path %>"
 >
   <% payment_sources = checkout_payment_sources(payment_method) %>
 

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

@@ -17,8 +17,13 @@
         checkout_stripe_button_max_rows_value: defined?(max_rows) ? max_rows : nil,
         checkout_stripe_button_max_columns_value: defined?(max_columns) ? max_columns : nil,
         checkout_stripe_button_button_width_value: defined?(button_width) ? button_width : nil,
-        checkout_stripe_button_store_url_value: current_store.formatted_url_or_custom_domain,
-        checkout_stripe_button_return_url_value: spree.stripe_payment_intent_url(current_stripe_payment_intent)
+        checkout_stripe_button_checkout_path_value: spree.api_v2_storefront_checkout_path,
+        checkout_stripe_button_checkout_advance_path_value: spree.advance_api_v2_storefront_checkout_path,
+        checkout_stripe_button_checkout_select_shipping_method_path_value: spree.select_shipping_method_api_v2_storefront_checkout_path,
+        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
       } do %>
       <div id="payment-request-button"></div>
 

data/lib/spree_stripe/version.rb

@@ -1,5 +1,5 @@
 module SpreeStripe
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.4'.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.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -279,7 +279,6 @@ files:
 - lib/spree_stripe/testing_support/factories/klarna_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/link_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/payment_intent_factory.rb
-- lib/spree_stripe/testing_support/factories/payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/przelewy24_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/sepa_debit_payment_source_factory.rb
 - lib/spree_stripe/testing_support/factories/webhook_key_factory.rb
@@ -305,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.3.26
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Official Spree Commerce Stripe payment gateway extension

data/lib/spree_stripe/testing_support/factories/payment_source_factory.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :payment_source, class: Spree::PaymentSource do
-    association :payment_method, factory: :payment_method
-    gateway_payment_profile_id { 'pm_1adfg34fgfdf5245' }
-    type { 'SpreeStripe::PaymentSources::Alipay' }
-    user
-  end
-end