spree_stripe 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ff8503fd4b39888f48c4be858858eb6050eb4949171f498f5f8d1eb5c4b1e2
-  data.tar.gz: 72f161cfc29653e564f12b759954221f6d9c5c4e8803a9f6a148925952da2906
+  metadata.gz: 8f00a93dd9c0c11b0c69e9b860d39366a8d6eef638696cb9139b3afbb1c6236b
+  data.tar.gz: 5bebd64056af8067def43433fe87927f0a2470395a9ea41feae3a4dceadfd59d
 SHA512:
-  metadata.gz: 5ea0227d2b1461807f37babce54421d410f7f582e057821ed845c5a73b4eeb35bb6f1ca74999066852fedc07d1317b6ea6b7d1cee7547b482ccd04020546cb0a
-  data.tar.gz: 5b09ba2480311dcff8609d18471e757e49543ef517eaccce70b89816846504407159db6420f964082c0a23647a265fdea1ac08c3bb459bdae87d8ff8f1a6373b
+  metadata.gz: 222695cc4aaa2c33395c20be310cf2115b3213c6c82b32ed31379acb73f16652a6ab7917b397d8ea79fc1d076e99f76100a2eba5be315b334559b4f3c26af0dd
+  data.tar.gz: 05c8211f7eb45ab8f828f0650bfaf6b650b5f63c33f07306e9f7fc8fb93d7348b7cf1252f5feef499ab0c4e32d68e75bbf73d0b8d10f590df4898f0be4eea1c3

data/README.md

@@ -7,6 +7,10 @@
 
 This is the official Stripe payment gateway extension for [Spree Commerce](https://spreecommerce.org) [open-source eCommerce platform](https://spreecommerce.org/). 
 
+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.
+
 If you like what you see, consider giving this repo a GitHub star :star:
 
 Thank you for supporting Spree open-source :heart:
@@ -52,20 +56,12 @@ Thank you for supporting Spree open-source :heart:
 
 ![Quick payments bypassing checkout 1st step (Apple Pay, Google_Pay, Link)](https://vendo-production-res.cloudinary.com/image/upload/w_2000/q_auto/v1742930027/docs/github/Spree_x_Stripe_-_Apple_Pay_Google_Pay_Link_-_Checkout_payment_step_rxxnr9.jpg)
 
-## Spree 5 Demo
-
-Check out the [Spree Commerce demo](https://demo.spreecommerce.org/) for yourself, including this Stripe integration.
-
-This demo runs on Spree 5 which is the biggest Spree release ever. Stay tuned for the official announcement on all the exciting features and integrations - coming up soon!
-
-![Spree Commerce 5 version](https://vendo-production-res.cloudinary.com/image/upload/w_2000/q_auto/v1742985405/docs/github/Spree_Commerce_open-source_eCommerce_myzurl.jpg)
-
 ## Installation
 
 1. Add this extension to your Gemfile with this line:
 
     ```ruby
-    bundle add spree_stripe --github=spree/spree_stripe
+    bundle add spree_stripe
     ```
 
 2. Run the install generator
@@ -78,6 +74,8 @@ This demo runs on Spree 5 which is the biggest Spree release ever. Stay tuned fo
 
   If your server was running, restart it so that it can find the assets properly.
 
+  This Stripe integration is also bundled in the [Spree Starter](https://github.com/spree/spree_starter/) for your development convenience.
+
 ## Developing
 
 1. Create a dummy app
@@ -130,3 +128,19 @@ Spree Commerce [Enterprise Edition](https://spreecommerce.org/spree-commerce-ver
 - Built-in fraud prevention tools
 
 Feel free to [reach out](https://spreecommerce.org/get-started/) to learn more.
+
+## Spree 5 Announcement & Demo
+
+[![Spree Commerce 5 version](https://vendo-production-res.cloudinary.com/image/upload/w_2000/q_auto/v1742985405/docs/github/Spree_Commerce_open-source_eCommerce_myzurl.jpg)](https://spreecommerce.org/announcing-spree-5-the-biggest-open-source-release-ever/)
+
+We’re thrilled to unveil [Spree 5](https://spreecommerce.org/announcing-spree-5-the-biggest-open-source-release-ever/
+) — the most powerful and feature-packed open-source release in Spree Commerce’s history, including:
+- A completely revamped Admin Dashboard experience: boost your team's productivity 
+- A Mobile-First, No-code Customizable Storefront: raise conversions and loyalty
+- 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/).
+
+Check out the [Spree 5 demo](https://demo.spreecommerce.org/) for yourself, including this Stripe integration.
+

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

@@ -5,7 +5,7 @@ module Spree
         module Stripe
           class PaymentIntentsController < BaseController
             include Spree::Api::V2::Storefront::OrderConcern
-            before_action :ensure_order
+            before_action :ensure_order, except: [:confirm]
 
             # POST /api/v2/storefront/stripe/payment_intents
             def create
@@ -18,7 +18,7 @@ module Spree
                 spree_current_order,
                 stripe_gateway,
                 stripe_payment_method_id: stripe_payment_method_id,
-                off_session: permitted_attributes[:off_session] || false
+                off_session: permitted_attributes[:off_session].to_b || false
               )
 
               render_serialized_payload { serialize_resource(@payment_intent) }
@@ -38,12 +38,37 @@ module Spree
               spree_authorize! :update, spree_current_order, order_token
 
               @payment_intent = spree_current_order.payment_intents.find(params[:id])
-              @payment_intent.attributes = permitted_attributes
+              @payment_intent.attributes = permitted_attributes.except(:off_session)
               @payment_intent.save!
 
               render_serialized_payload { serialize_resource(@payment_intent) }
             end
 
+            def confirm
+              @payment_intent = SpreeStripe::PaymentIntent.find(params[:id])
+
+              stripe_payment_intent = @payment_intent.stripe_payment_intent
+              order = @payment_intent.order
+
+              if order.canceled?
+                render_error_payload(Spree.t('order_canceled'))
+              elsif order.completed?
+                render_error_payload(Spree.t('order_already_completed'))
+              elsif order != spree_current_order
+                raise ActiveRecord::RecordNotFound
+              elsif stripe_payment_intent.status == 'succeeded'
+                spree_authorize! :update, spree_current_order, order_token
+
+                SpreeStripe::CompleteOrder.new(payment_intent: @payment_intent).call
+
+                render_serialized_payload { serialize_resource(@payment_intent) }
+              else
+                render_error_payload(Spree.t("stripe.payment_intent_errors.#{stripe_payment_intent.status}"))
+              end
+            rescue Spree::Core::GatewayError => e
+              render_error_payload(e.message)
+            end
+
             private
 
             def permitted_attributes

data/app/serializers/spree/v2/storefront/payment_intent_serializer.rb

@@ -5,6 +5,10 @@ module Spree
         set_type :payment_intent
 
         attributes :stripe_id, :client_secret, :ephemeral_key_secret, :customer_id, :amount, :stripe_payment_method_id
+
+        belongs_to :order, serializer: Spree::V2::Storefront::OrderSerializer
+        belongs_to :payment_method, serializer: Spree::V2::Storefront::PaymentMethodSerializer
+        has_one :payment, serializer: Spree::V2::Storefront::PaymentSerializer
       end
     end
   end

data/app/services/spree_stripe/create_payment_intent.rb

@@ -33,6 +33,7 @@ module SpreeStripe
         stripe_id: response.authorization,
         client_secret: response.params['client_secret'],
         customer_id: customer&.profile_id,
+        stripe_payment_method_id: stripe_payment_method_id,
         ephemeral_key_secret: ephemeral_key_secret
       )
     end

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

@@ -25,7 +25,7 @@
       <div class="relative group-[.no-separator]:hidden flex py-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(:or_continue_below) %>
+          <%= Spree.t('storefront.checkout.or_continue_below') %>
         </span>
         <div class="flex-grow border-t border-default"></div>
       </div>

data/config/i18n-tasks.yml

@@ -0,0 +1,173 @@
+# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks
+
+# The "main" locale.
+base_locale: en
+## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
+# locales: [es, fr]
+## Reporting locale, default: en. Available: en, ru.
+# internal_locale: en
+
+# Read and write translations.
+data:
+  ## Translations are read from the file system. Supported format: YAML, JSON.
+  ## Provide a custom adapter:
+  # adapter: I18n::Tasks::Data::FileSystem
+
+  # Locale files or `Dir.glob` patterns where translations are read from:
+  read:
+    ## Default:
+    - config/locales/%{locale}.yml
+    ## More files:
+    # - config/locales/**/*.%{locale}.yml
+
+  # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
+  # `i18n-tasks normalize -p` will force move the keys according to these rules
+  write:
+    ## For example, write devise and simple form keys to their respective files:
+    # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
+    ## Catch-all default:
+    # - config/locales/%{locale}.yml
+
+  # External locale data (e.g. gems).
+  # This data is not considered unused and is never written to.
+  external:
+    ## Example (replace %#= with %=):
+    # - "<%#= %x[bundle info vagrant --path].chomp %>/templates/locales/%{locale}.yml"
+    - "<%= %x[bundle info spree_core --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info spree_storefront --path].chomp %>/config/locales/%{locale}.yml"
+  ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
+  # router: conservative_router
+
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+
+  ## Pretty-print JSON:
+  # json:
+  #   write:
+  #     indent: '  '
+  #     space: ' '
+  #     object_nl: "\n"
+  #     array_nl: "\n"
+
+# Find translate calls
+search:
+  ## Paths or `Find.find` patterns to search in:
+  # paths:
+  #  - app/
+
+  ## Root directories for relative keys resolution.
+  # relative_roots:
+  #   - app/controllers
+  #   - app/helpers
+  #   - app/mailers
+  #   - app/presenters
+  #   - app/views
+
+  ## Directories where method names which should not be part of a relative key resolution.
+  # By default, if a relative translation is used inside a method, the name of the method will be considered part of the resolved key.
+  # Directories listed here will not consider the name of the method part of the resolved key
+  #
+  # relative_exclude_method_name_paths:
+  #  -
+
+  ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
+  ##   *.jpg *.jpeg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
+  ##   *.yml *.json *.zip *.tar.gz *.swf *.flv *.mp3 *.wav *.flac *.webm *.mp4 *.ogg *.opus *.webp *.map *.xlsx
+  exclude:
+    - app/assets/images
+    - app/assets/fonts
+    - app/assets/videos
+    - app/assets/builds
+
+  ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
+  ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
+  # only: ["*.rb", "*.html.slim"]
+
+  ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.
+  strict: false
+
+  ## Allows adding ast_matchers for finding translations using the AST-scanners
+  ## The available matchers are:
+  ## - RailsModelMatcher
+  ##     Matches ActiveRecord translations like
+  ##     User.human_attribute_name(:email) and User.model_name.human
+  ## - DefaultI18nSubjectMatcher
+  ##     Matches ActionMailer's default_i18n_subject method
+  ##
+  ## To implement your own, please see `I18n::Tasks::Scanners::AstMatchers::BaseMatcher`.
+  # ast_matchers:
+  #   - 'I18n::Tasks::Scanners::AstMatchers::RailsModelMatcher'
+  #   - 'I18n::Tasks::Scanners::AstMatchers::DefaultI18nSubjectMatcher'
+
+  ## Multiple scanners can be used. Their results are merged.
+  ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.
+  ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
+
+## Translation Services
+# translation:
+#   # Google Translate
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
+#   google_translate_api_key: "AbC-dEf5"
+#   # DeepL Pro Translate
+#   # Get an API key and subscription at https://www.deepl.com/pro to use DeepL Pro
+#   deepl_api_key: "48E92789-57A3-466A-9959-1A1A1A1A1A1A"
+#   # deepl_host: "https://api.deepl.com"
+#   # deepl_version: "v2"
+#   # deepl_glossary_ids:
+#   #   - f28106eb-0e06-489e-82c6-8215d6f95089
+#   #   - 2c6415be-1852-4f54-9e1b-d800463496b4
+#   # add additional options to the DeepL.translate call: https://www.deepl.com/docs-api/translate-text/translate-text/
+#   deepl_options:
+#     formality: prefer_less
+#   # OpenAI
+#   openai_api_key: "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+#   # openai_model: "gpt-3.5-turbo" # see https://platform.openai.com/docs/models
+#   # may contain `%{from}` and `%{to}`, which will be replaced by source and target locale codes, respectively (using `Kernel.format`)
+#   # openai_system_prompt: >-
+#   #   You are a professional translator that translates content from the %{from} locale
+#   #   to the %{to} locale in an i18n locale array.
+#   #
+#   #   The array has a structured format and contains multiple strings. Your task is to translate
+#   #   each of these strings and create a new array with the translated strings.
+#   #
+#   #   HTML markups (enclosed in < and > characters) must not be changed under any circumstance.
+#   #   Variables (starting with %%{ and ending with }) must not be changed under any circumstance.
+#   #
+#   #   Keep in mind the context of all the strings for a more accurate translation.
+
+## Do not consider these keys missing:
+# ignore_missing:
+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+# - '{devise,simple_form}.*'
+
+## Consider these keys used:
+# ignore_unused:
+
+## Exclude these keys from the `i18n-tasks eq-base' report:
+# ignore_eq_base:
+#   all:
+#     - common.ok
+#   fr,es:
+#     - common.brand
+
+## Exclude these keys from the `i18n-tasks check-consistent-interpolations` report:
+# ignore_inconsistent_interpolations:
+# - 'activerecord.attributes.*'
+
+## Ignore these keys completely:
+# ignore:
+#  - kaminari.*
+
+## Sometimes, it isn't possible for i18n-tasks to match the key correctly,
+## e.g. in case of a relative key defined in a helper method.
+## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:
+#
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       only: %w(*.html.haml *.html.slim),
+#       patterns: [['= title\b', '.page_title']] %>
+#
+# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
+#
+<% I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper', patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>

data/config/locales/en.yml

@@ -1,5 +1,12 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
+---
 en:
-  hello: "Hello world"
+  spree:
+    stripe:
+      payment_intent_errors:
+        canceled: Payment intent canceled
+        processing: Payment intent processing
+        requires_action: Payment intent requires action
+        requires_capture: Payment intent requires capture
+        requires_confirmation: Payment intent requires confirmation
+        requires_payment_method: Payment intent requires payment method
+        succeeded: Payment intent succeeded

data/config/routes.rb

@@ -16,7 +16,11 @@ Spree::Core::Engine.add_routes do
       namespace :storefront do
         namespace :stripe do
           resources :setup_intents, only: %i[create]
-          resources :payment_intents, only: %i[show create update]
+          resources :payment_intents, only: %i[show create update] do
+            member do
+              patch :confirm
+            end
+          end
         end
       end
     end

data/lib/spree_stripe/version.rb

@@ -1,5 +1,5 @@
 module SpreeStripe
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.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.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: hello@spreecommerce.org
 executables: []
@@ -244,6 +258,7 @@ files:
 - app/views/spree/checkout/payment/_spree_stripe.html.erb
 - app/views/spree_stripe/_head.html.erb
 - app/views/spree_stripe/_quick_checkout.html.erb
+- config/i18n-tasks.yml
 - config/importmap.rb
 - config/initializers/spree.rb
 - config/initializers/stripe.rb
@@ -288,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.5.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Official Spree Commerce Stripe payment gateway extension