spree_stripe 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1395fdcc4bb553b8cf0391c06098131b0c5529c397e60c0c1f17cc476f80bb
-  data.tar.gz: 7d97dde52f20fbc99547b66484ee54800a682835d5a10c7a222c5828cbf73a0c
+  metadata.gz: e37d17d73e754ef2f8526777041be558487592f42818dbe3a554dc663fb0eb97
+  data.tar.gz: c139162cc9fece31518aad3c5ac849de9c392648ee005693f3aa131ea4a98963
 SHA512:
-  metadata.gz: fa7713aa1cd16ff77a28bdc7dc53e127d95370c58e6fbd14efef8dc6d44c2520c5e4dce52457151c8ffa97b3e8337a52761e78b78423a9183dd7b8b51feeb813
-  data.tar.gz: 993d3bf730afeeb71e8f50606df34ff6363eb43ebe6428b097f467e611e1a81b4a94b67a620ed536bfc57fcecf9e2ba89bab720dea84329c5993c80bbaf83f54
+  metadata.gz: 857e2aecfe5e8860da213246d1098819eca5ab56060c4d91bebe1ac49af3b6207a279d1f86239f263488d8c878ef94a76dafa1a3b4cab0a8279e30b8bb2b49c8
+  data.tar.gz: d2770b0f50b05d0e8f91b52fbc79c321108464c791ca356248d5361913f54c160fb6cf4ea08170c3055a56d2843c2abcabf3ddcac22916e5426a3b10761c5867

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

@@ -23,6 +23,7 @@ export default class extends Controller {
     checkoutSelectShippingMethodPath: String,
     checkoutValidateGiftCardDataPath: String,
     checkoutValidateOrderForPaymentPath: String,
+    shippingRequired: { type: Boolean, default: true },
     returnUrl: String,
   }
 
@@ -103,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 },
@@ -116,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))
   }
@@ -157,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()
@@ -229,7 +237,7 @@ 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
     }
@@ -256,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 })
       }
     )
 
@@ -285,18 +294,7 @@ 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
     }
@@ -310,49 +308,51 @@ export default class extends Controller {
       body: JSON.stringify(orderUpdatePayload)
     })
 
-    if (updateResponse.status === 200) {
-      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 (updateResponse.status !== 200) {
+      ev.paymentFailed()
+      return
+    }
+
+    const advanceResponse = await fetch(this.checkoutAdvancePathValue, {
+      method: 'PATCH',
+      headers: {
+        'X-Spree-Order-Token': this.orderTokenValue,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        state: 'payment',
+        shipping_method_id: shippingRateId
       })
+    })
 
-      if (advanceResponse.status === 200) {
-        try {
-          const { error: paymentMethodError, paymentMethod } = await this.stripe.createPaymentMethod({
-            elements: this.elements
-          })
+    if (advanceResponse.status !== 200) {
+      ev.paymentFailed()
+      return
+    }
 
-          if (paymentMethodError) {
-            showFlashMessage(error, 'error')
-            return
-          }
+    try {
+      const { error: paymentMethodError, paymentMethod } = await this.stripe.createPaymentMethod({
+        elements: this.elements
+      })
 
-          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)
+      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)
     }
   }
 
@@ -453,4 +453,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

@@ -205,11 +205,12 @@ 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`, {
+    if (this.billingAddressCheckbox?.checked) {
+      const response = await fetch(this.checkoutPathValue, {
         method: 'PATCH',
         headers: this.spreeApiHeaders,
         body: JSON.stringify({
+          include: 'billing_address',
           order: {
             use_shipping: true
           }
@@ -230,10 +231,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]"),

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

@@ -22,7 +22,8 @@
         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_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.3'.freeze
+  VERSION = '1.2.5'.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.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree