solidus_stripe 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb4f65f220249d05424544fea63ae4b7ee065a735d9ad75d30212f90f11c2e9
-  data.tar.gz: 0167d591c1bad084130963d11dc0d823d51e9fb7b26d04964634ba87d79f7a8f
+  metadata.gz: b92e606bb4ada8e49087a97ffeff9be982f8cc0110cd7c8c0721d73220adeb3c
+  data.tar.gz: 6c0b61f704f0faab2e16ef827879e86efde9bf7123eadc7a968c7810452956bc
 SHA512:
-  metadata.gz: 5006bc7738c469e4d00f0f709c51691f56dad323a418283b0d361d04728140a4bf1069be861ff5d08df98b06e3147d0fa91ea004fe741e5c8229e720702b6c8a
-  data.tar.gz: 2dfea9b20b5dabc2f1199256fb04a3911e811f62d97de95e07cb5f675ba3c70105c81ff8b6ea8fb34f6cf19eb4b1e380a0ae8fd28acccad715c45f8cd9064b56
+  metadata.gz: 0daa283258eb4c1fb7dc0c41444e0e0ebaf8a439a91f7597d1ec4d941c9fd7badc0d043aec6a98e9b2c3e1bef131e4222d9bcc931c508546fee67b7d679a48ad
+  data.tar.gz: f10627a842fff35f6ef69e7cfcf8643ec4e7fb961cab9f9f2aba28217068afd62babe3d6048396d781794457c3f0fa2bdbad278f2a8865a13b0a41ee4397dd94

data/.circleci/config.yml

@@ -16,12 +16,17 @@ jobs:
     executor: solidusio_extensions/mysql
     steps:
       - solidusio_extensions/run-tests
+  lint-code:
+    executor: solidusio_extensions/sqlite-memory
+    steps:
+      - solidusio_extensions/lint-code
 
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
       - run-specs-with-postgres
       - run-specs-with-mysql
+
   "Weekly run specs against master":
     triggers:
       - schedule:

data/.gem_release.yml

@@ -1,5 +1,5 @@
 bump:
   recurse: false
   file: 'lib/solidus_stripe/version.rb'
-  message: Bump Solidus Stripe to %{version}
+  message: Bump SolidusStripe to %{version}
   tag: true

data/.github/stale.yml

@@ -1,17 +1,17 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 60
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: false
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned
   - security
 # Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
+  recent activity. It might be closed if no further activity occurs. Thank you
   for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false

data/.github_changelog_generator

@@ -0,0 +1,2 @@
+issues=false
+exclude-labels=infrastructure

data/.gitignore

@@ -5,8 +5,6 @@
 .DS_Store
 .idea
 .project
-.ruby-version
-.rvmrc
 .sass-cache
 coverage
 Gemfile.lock
@@ -17,3 +15,6 @@ pkg
 spec/dummy
 spec/examples.txt
 /sandbox
+.rvmrc
+.ruby-version
+.ruby-gemset

data/.rubocop.yml

@@ -2,6 +2,4 @@ require:
   - solidus_dev_support/rubocop
 
 AllCops:
-  Exclude:
-    - sandbox/**/*
-    - spec/dummy/**/*
+  NewCops: disable

data/CHANGELOG.md

@@ -1,15 +1,69 @@
 # Changelog
 
+## [v4.3.0](https://github.com/solidusio/solidus_stripe/tree/v4.3.0) (2021-10-19)
+
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v4.2.0...v4.3.0)
+
+**Implemented enhancements:**
+
+- Remove Solidus 2.x deprecation to allow 3.0 usage [\#99](https://github.com/solidusio/solidus_stripe/pull/99) ([kennyadsl](https://github.com/kennyadsl))
+- Update gem with the latest dev\_support [\#97](https://github.com/solidusio/solidus_stripe/pull/97) ([kennyadsl](https://github.com/kennyadsl))
+
+**Fixed bugs:**
+
+- Fix 3DS iframe selection [\#86](https://github.com/solidusio/solidus_stripe/pull/86) ([spaghetticode](https://github.com/spaghetticode))
+
+**Closed issues:**
+
+- Could not create payment [\#111](https://github.com/solidusio/solidus_stripe/issues/111)
+- statement\_descriptor\_suffix [\#107](https://github.com/solidusio/solidus_stripe/issues/107)
+- Shipping cost payment refund rejected from Stripe API because of negative charge value [\#101](https://github.com/solidusio/solidus_stripe/issues/101)
+- Remove Solidus 2.x deprecations [\#98](https://github.com/solidusio/solidus_stripe/issues/98)
+- about LICENSE [\#59](https://github.com/solidusio/solidus_stripe/issues/59)
+
+**Merged pull requests:**
+
+- Add statement\_descriptor\_suffix support to options\_for\_purchase\_or\_auth [\#106](https://github.com/solidusio/solidus_stripe/pull/106) ([torukMnk](https://github.com/torukMnk))
+- Update install instructions [\#105](https://github.com/solidusio/solidus_stripe/pull/105) ([kennyadsl](https://github.com/kennyadsl))
+- Allow Solidus 3 [\#104](https://github.com/solidusio/solidus_stripe/pull/104) ([kennyadsl](https://github.com/kennyadsl))
+- Bump minimum solidus\_support version requirement [\#102](https://github.com/solidusio/solidus_stripe/pull/102) ([filippoliverani](https://github.com/filippoliverani))
+-  Relax Ruby required version to support Ruby 3.0+ [\#96](https://github.com/solidusio/solidus_stripe/pull/96) ([filippoliverani](https://github.com/filippoliverani))
+- Update refund\_decorator.rb prepend namespacing [\#91](https://github.com/solidusio/solidus_stripe/pull/91) ([brchristian](https://github.com/brchristian))
+- Retrieve phone number paying with digital wallets [\#90](https://github.com/solidusio/solidus_stripe/pull/90) ([kennyadsl](https://github.com/kennyadsl))
+- Fix Intents API link in README [\#87](https://github.com/solidusio/solidus_stripe/pull/87) ([kennyadsl](https://github.com/kennyadsl))
+- Add missing 'var' [\#85](https://github.com/solidusio/solidus_stripe/pull/85) ([willread](https://github.com/willread))
+- Fixes Rails 6.1 load warnings [\#84](https://github.com/solidusio/solidus_stripe/pull/84) ([marcrohloff](https://github.com/marcrohloff))
+- Dedupe common code in stripe\_checkout\_spec.rb [\#80](https://github.com/solidusio/solidus_stripe/pull/80) ([brchristian](https://github.com/brchristian))
+- Refactor spec with fill\_in\_card helper [\#78](https://github.com/solidusio/solidus_stripe/pull/78) ([brchristian](https://github.com/brchristian))
+- Fix non-breaking space character in comment [\#76](https://github.com/solidusio/solidus_stripe/pull/76) ([brchristian](https://github.com/brchristian))
+- Fix Copyright in README [\#73](https://github.com/solidusio/solidus_stripe/pull/73) ([kennyadsl](https://github.com/kennyadsl))
+- Remove server and test\_mode from README [\#66](https://github.com/solidusio/solidus_stripe/pull/66) ([adammathys](https://github.com/adammathys))
+
+## [v4.2.0](https://github.com/solidusio/solidus_stripe/tree/v4.2.0) (2020-07-20)
+
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v4.1.0...v4.2.0)
+
+**Fixed bugs:**
+
+- Fix StripeCreditCard\#try\_void with Elements/V2 API [\#75](https://github.com/solidusio/solidus_stripe/pull/75) ([spaghetticode](https://github.com/spaghetticode))
+
+**Closed issues:**
+
+- A token may not be passed in as a PaymentMethod. Instead, create a PaymentMethod or convert your token to a PaymentMethod by setting the `card[token]` parameter to  [\#71](https://github.com/solidusio/solidus_stripe/issues/71)
+
+**Merged pull requests:**
+
+- Fix 3DS modal amount verification [\#72](https://github.com/solidusio/solidus_stripe/pull/72) ([spaghetticode](https://github.com/spaghetticode))
+
 ## [v4.1.0](https://github.com/solidusio/solidus_stripe/tree/v4.1.0) (2020-07-01)
 
-[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v4.0.0...v4.1.0)
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.2.1...v4.1.0)
 
 **Fixed bugs:**
 
 - Card name ignored when adding new card to an order during checkout [\#68](https://github.com/solidusio/solidus_stripe/issues/68)
 - Try to find address state also by name [\#65](https://github.com/solidusio/solidus_stripe/pull/65) ([spaghetticode](https://github.com/spaghetticode))
 - Fix order cancel with Payment Intents captured payment [\#57](https://github.com/solidusio/solidus_stripe/pull/57) ([spaghetticode](https://github.com/spaghetticode))
-- \[ADMIN\] Order cancel doen't work with Payment Intents captured payments [\#56](https://github.com/solidusio/solidus_stripe/issues/56)
 
 **Merged pull requests:**
 
@@ -20,6 +74,14 @@
 - Update gemspec URLs [\#54](https://github.com/solidusio/solidus_stripe/pull/54) ([elia](https://github.com/elia))
 - fix typo [\#51](https://github.com/solidusio/solidus_stripe/pull/51) ([ccarruitero](https://github.com/ccarruitero))
 
+## [v3.2.1](https://github.com/solidusio/solidus_stripe/tree/v3.2.1) (2020-06-29)
+
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v4.0.0...v3.2.1)
+
+**Fixed bugs:**
+
+- \[ADMIN\] Order cancel doen't work with Payment Intents captured payments [\#56](https://github.com/solidusio/solidus_stripe/issues/56)
+
 **Closed issues:**
 
 - Could not find generator 'solidus\_stripe:install' [\#60](https://github.com/solidusio/solidus_stripe/issues/60)
@@ -29,41 +91,56 @@
 
 ## [v4.0.0](https://github.com/solidusio/solidus_stripe/tree/v4.0.0) (2020-04-29)
 
-[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.0.0...v4.0.0)
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.2.0...v4.0.0)
 
 **Fixed bugs:**
 
-- Duplicates charges with Payment Intents [\#44](https://github.com/solidusio/solidus_stripe/issues/44)
 - Fix for 3D-Secure payments on cart page checkout [\#49](https://github.com/solidusio/solidus_stripe/pull/49) ([spaghetticode](https://github.com/spaghetticode))
+
+**Closed issues:**
+
+- Custom stripe element field options \(e.g for showing a credit card icon\) [\#41](https://github.com/solidusio/solidus_stripe/issues/41)
+- Clearer documentation on how to implement [\#15](https://github.com/solidusio/solidus_stripe/issues/15)
+
+**Merged pull requests:**
+
+- Relax solidus\_support dependency [\#48](https://github.com/solidusio/solidus_stripe/pull/48) ([kennyadsl](https://github.com/kennyadsl))
+
+## [v3.2.0](https://github.com/solidusio/solidus_stripe/tree/v3.2.0) (2020-04-10)
+
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.1.0...v3.2.0)
+
+**Fixed bugs:**
+
 - Send form data also when paying with payment request button [\#47](https://github.com/solidusio/solidus_stripe/pull/47) ([spaghetticode](https://github.com/spaghetticode))
+
+**Merged pull requests:**
+
+- Replace deprecated route `/stripe/confirm_payment` [\#46](https://github.com/solidusio/solidus_stripe/pull/46) ([spaghetticode](https://github.com/spaghetticode))
+
+## [v3.1.0](https://github.com/solidusio/solidus_stripe/tree/v3.1.0) (2020-04-10)
+
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.0.0...v3.1.0)
+
+**Fixed bugs:**
+
+- Duplicates charges with Payment Intents [\#44](https://github.com/solidusio/solidus_stripe/issues/44)
 - Create a single charge when using Stripe Payment Intents [\#45](https://github.com/solidusio/solidus_stripe/pull/45) ([spaghetticode](https://github.com/spaghetticode))
 
 **Closed issues:**
 
-- Custom stripe element field options \(e.g for showing a credit card icon\) [\#41](https://github.com/solidusio/solidus_stripe/issues/41)
 - Stripe Elements submit button stuck in disabled state. [\#39](https://github.com/solidusio/solidus_stripe/issues/39)
 - Visa credit card type is blank [\#36](https://github.com/solidusio/solidus_stripe/issues/36)
 - Pay with Apple Pay from cart page [\#23](https://github.com/solidusio/solidus_stripe/issues/23)
-- Clearer documentation on how to implement [\#15](https://github.com/solidusio/solidus_stripe/issues/15)
 
 **Merged pull requests:**
 
-- Relax solidus\_support dependency [\#48](https://github.com/solidusio/solidus_stripe/pull/48) ([kennyadsl](https://github.com/kennyadsl))
-- Replace deprecated route `/stripe/confirm\_payment` [\#46](https://github.com/solidusio/solidus_stripe/pull/46) ([spaghetticode](https://github.com/spaghetticode))
 - Custom Stripe Elements field options [\#42](https://github.com/solidusio/solidus_stripe/pull/42) ([stuffmatic](https://github.com/stuffmatic))
 - Improve the way Stripe Elements validation errors are displayed [\#40](https://github.com/solidusio/solidus_stripe/pull/40) ([stuffmatic](https://github.com/stuffmatic))
 - Fix stripe-to-solidus card type mapping [\#38](https://github.com/solidusio/solidus_stripe/pull/38) ([stuffmatic](https://github.com/stuffmatic))
 - Add hook to provide custom Stripe Elements options [\#37](https://github.com/solidusio/solidus_stripe/pull/37) ([stuffmatic](https://github.com/stuffmatic))
 - Change order description that we pass to Stripe [\#35](https://github.com/solidusio/solidus_stripe/pull/35) ([kennyadsl](https://github.com/kennyadsl))
 
-## [v3.2.1](https://github.com/solidusio/solidus_stripe/tree/v3.2.1) (2020-06-29)
-
-[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.2.0...v3.2.1)
-
-**Merged pull requests:**
-
-- Relax solidus\_support version dependency [\#70](https://github.com/solidusio/solidus_stripe/pull/70) ([spaghetticode](https://github.com/spaghetticode))
-
 ## [v3.0.0](https://github.com/solidusio/solidus_stripe/tree/v3.0.0) (2020-03-11)
 
 [Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v2.1.0...v3.0.0)
@@ -111,7 +188,7 @@
 **Merged pull requests:**
 
 - Remove ERB from Elements and Intents JS code [\#28](https://github.com/solidusio/solidus_stripe/pull/28) ([spaghetticode](https://github.com/spaghetticode))
-- Remove `update\_attributes!` deprecation [\#24](https://github.com/solidusio/solidus_stripe/pull/24) ([spaghetticode](https://github.com/spaghetticode))
+- Remove `update_attributes!` deprecation [\#24](https://github.com/solidusio/solidus_stripe/pull/24) ([spaghetticode](https://github.com/spaghetticode))
 - Add solidus\_dev\_support gem [\#21](https://github.com/solidusio/solidus_stripe/pull/21) ([spaghetticode](https://github.com/spaghetticode))
 - Fix reusing cards with Stripe v3 [\#17](https://github.com/solidusio/solidus_stripe/pull/17) ([kennyadsl](https://github.com/kennyadsl))
 - Extension maintenance [\#14](https://github.com/solidusio/solidus_stripe/pull/14) ([kennyadsl](https://github.com/kennyadsl))

data/Gemfile

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem "solidus", github: "solidusio/solidus", branch: branch
+gem 'solidus', github: 'solidusio/solidus', branch: branch
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
@@ -12,7 +12,7 @@ gem "solidus", github: "solidusio/solidus", branch: branch
 gem 'rails', '>0.a'
 
 # Provides basic authentication functionality for testing parts of your engine
-gem "solidus_auth_devise"
+gem 'solidus_auth_devise'
 
 case ENV['DB']
 when 'mysql'
@@ -23,12 +23,6 @@ else
   gem 'sqlite3'
 end
 
-group :development, :test do
-  gem "pry-rails"
-  gem "ffaker"
-  gem "rails-controller-testing"
-end
-
 gemspec
 
 # Use a local Gemfile to include development dependencies that might not be

data/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2014 Spree Commerce Inc. and other contributors.
+Copyright (c) 2021 Solidus Team and other contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -9,7 +10,7 @@ are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
+    * Neither the name Solidus nor the names of its contributors may be used to
       endorse or promote products derived from this software without specific
       prior written permission.
 

data/README.md

@@ -1,7 +1,7 @@
-Solidus Stripe
-===============
+# Solidus Stripe
 
-[![CircleCI](https://circleci.com/gh/solidusio/solidus_stripe.svg?style=svg)](https://circleci.com/gh/solidusio/solidus_stripe)
+[![CircleCI](https://circleci.com/gh/solidusio/solidus_stripe.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_stripe)
+[![codecov](https://codecov.io/gh/solidusio/solidus_stripe/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_stripe)
 
 Stripe Payment Method for Solidus. It works as a wrapper for the ActiveMerchant Stripe gateway.
 
@@ -10,18 +10,11 @@ Stripe Payment Method for Solidus. It works as a wrapper for the ActiveMerchant
 Installation
 ------------
 
-In your Gemfile:
-
-```ruby
-gem 'solidus_stripe', '~> 3.0'
-```
-
-Then run from the command line:
+Run from the command line:
 
 ```shell
-bundle install
+bundle add solidus_stripe
 bundle exec rails g solidus_stripe:install
-bundle exec rails db:migrate
 ```
 
 Usage
@@ -56,9 +49,7 @@ Spree.config do |config|
     publishable_key: ENV['STRIPE_PUBLISHABLE_KEY'],
     stripe_country: 'US',
     v3_elements: false,
-    v3_intents: false,
-    server: Rails.env.production? ? 'production' : 'test',
-    test_mode: !Rails.env.production?
+    v3_intents: false
   )
 end
 ```
@@ -82,7 +73,7 @@ account. Conversely, if you need to disable the button you can simply remove
 the `stripe_country` preference.
 
 Please refer to Stripe official
-[documentation](https://stripe.com/docs/stripe-js/elements/payment-request-button)
+[documentation](https://stripe.com/docs/payments/payment-intents)
 for further instructions on how to make this work properly.
 
 The following configuration will use both Payment Intents and the
@@ -100,9 +91,7 @@ Spree.config do |config|
     publishable_key: ENV['STRIPE_PUBLISHABLE_KEY'],
     stripe_country: 'US',
     v3_elements: false,
-    v3_intents: true,
-    server: Rails.env.production? ? 'production' : 'test',
-    test_mode: !Rails.env.production?
+    v3_intents: true
   )
 end
 ```
@@ -263,52 +252,68 @@ SolidusStripe.Payment.prototype.elementsBaseOptions = function () {
 };
 ```
 
-
-Migrating from solidus_gateway
-------------------------------
+## Migrating from solidus_gateway
 
 If you were previously using `solidus_gateway` gem you might want to
 check out our [Wiki page](https://github.com/solidusio/solidus_stripe/wiki/Migrating-from-solidus_gateway)
 that describes how to handle this migration.
 
-Testing
--------
+## Development
 
-Then just run the following to automatically build a dummy app if necessary and
-run the tests:
+### Testing the extension
+
+First bundle your dependencies, then run `bin/rake`. `bin/rake` will default to building the dummy
+app if it does not exist, then it will run specs. The dummy app can be regenerated by using
+`bin/rake extension:test_app`.
 
 ```shell
-bundle exec rake
+bin/rake
 ```
 
-Releasing
----------
+To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
 
-We use [gem-release](https://github.com/svenfuchs/gem-release) to release this
-extension with ease.
+```shell
+bundle exec rubocop
+```
 
-Supposing you are on the master branch and you are working on a fork of this
-extension, `upstream` is the main remote and you have write access to it, you
-can simply run:
+When testing your application's integration with this extension you may use its factories.
+Simply add this require statement to your spec_helper:
 
-```
-gem bump --version minor --tag --release --remote upstream
+```ruby
+require '<%= file_name %>/factories'
 ```
 
-This command will:
+### Running the sandbox
 
-- bump the gem version to the next minor (changing the `version.rb` file)
-- commit the change and push it to upstream master
-- create a git tag
-- push the tag to the upstream remote
-- release the new version on RubyGems
+To run this extension in a sandboxed Solidus application, you can run `bin/sandbox`. The path for
+the sandbox app is `./sandbox` and `bin/rails` will forward any Rails commands to
+`sandbox/bin/rails`.
 
-Or you can run these commands individually:
+Here's an example:
 
 ```
-gem bump --version minor --remote upstream
-gem tag --remote upstream
-gem release
+$ bin/rails server
+=> Booting Puma
+=> Rails 6.0.2.1 application starting in development
+* Listening on tcp://127.0.0.1:3000
+Use Ctrl-C to stop
+```
+
+### Updating the changelog
+
+Before and after releases the changelog should be updated to reflect the up-to-date status of
+the project:
+
+```shell
+bin/rake changelog
+git add CHANGELOG.md
+git commit -m "Update the changelog"
 ```
 
-Copyright (c) 2020 Spree Commerce Inc., released under the New BSD License
+### Releasing new versions
+
+Please refer to the dedicated [page](https://github.com/solidusio/solidus/wiki/How-to-release-extensions) on Solidus wiki.
+
+## License
+Copyright (c) 2014 Spree Commerce Inc., released under the New BSD License
+Copyright (c) 2021 Solidus Team, released under the New BSD License

data/app/assets/javascripts/spree/frontend/solidus_stripe/stripe-cart-page-checkout.js

@@ -53,6 +53,7 @@ SolidusStripe.CartPageCheckout.prototype.onPrPayment = function(payment) {
       shipping_option: payment.shippingOption,
       email: payment.payerEmail,
       name: payment.payerName,
+      phone: payment.payerPhone,
       authenticity_token: this.authToken
     })
   }).then(function(response) {

data/app/assets/javascripts/spree/frontend/solidus_stripe/stripe-payment-request-button-shared.js

@@ -22,6 +22,7 @@
           },
           requestPayerName: true,
           requestPayerEmail: true,
+          requestPayerPhone: true,
           requestShipping: config.requestShipping,
           shippingOptions: []
         });
@@ -50,7 +51,7 @@
         };
         paymentRequest.on('paymentmethod', onPrPaymentMethod.bind(this));
 
-        onShippingAddressChange = function(ev) {
+        var onShippingAddressChange = function(ev) {
           var showError = this.showError.bind(this);
 
           fetch('/stripe/shipping_rates', {

data/app/controllers/solidus_stripe/payment_request_controller.rb

@@ -22,7 +22,7 @@ module SolidusStripe
       current_order.restart_checkout_flow
 
       address = SolidusStripe::AddressFromParamsService.new(
-        params[:shipping_address],
+        shipping_address_from_params,
         spree_current_user
       ).call
 
@@ -38,5 +38,15 @@ module SolidusStripe
         render json: { success: false, error: address.errors.full_messages.to_sentence }, status: 500
       end
     end
+
+    private
+
+    def shipping_address_from_params
+      return {} unless params[:shipping_address]
+      return params[:shipping_address] if params.dig(:shipping_address, :phone).present?
+
+      params[:shipping_address][:phone] = params[:phone]
+      params[:shipping_address]
+    end
   end
 end

data/app/decorators/models/spree/refund_decorator.rb

@@ -4,6 +4,6 @@ module Spree
   module RefundDecorator
     attr_reader :response
 
-    Spree::Refund.prepend(self)
+    ::Spree::Refund.prepend(self)
   end
 end

data/app/models/solidus_stripe/address_from_params_service.rb

@@ -26,14 +26,26 @@ module SolidusStripe
           lines = address_params[:addressLine]
           names = address_params[:recipient].split(' ')
 
-          attributes.merge!(
-            state_id: state&.id,
-            firstname: names.first,
-            lastname: names.last,
-            phone: phone,
-            address1: lines.first,
-            address2: lines.second
-          ).reject! { |_, value| value.blank? }
+          name_attributes = if SolidusSupport.combined_first_and_last_name_in_address? && Spree::Address.column_names.include?("name")
+            {
+              name: address_params[:recipient]
+            }
+          else
+            {
+              firstname: names.first,
+              lastname: names.last,
+            }
+          end
+
+          attributes
+            .merge!(name_attributes)
+            .merge!(
+              state_id: state&.id,
+              phone: phone,
+              address1: lines.first,
+              address2: lines.second
+            )
+            .reject! { |_, value| value.blank? }
         end
       end
     end

data/app/models/solidus_stripe/create_intents_payment_service.rb

@@ -102,7 +102,8 @@ module SolidusStripe
     end
 
     def address_full_name
-      current_order.bill_address&.full_name || form_data[:recipient]
+      bill_address_name = SolidusSupport.combined_first_and_last_name_in_address? ? current_order.bill_address&.name : current_order.bill_address&.full_name
+      bill_address_name || form_data[:recipient]
     end
 
     def update_stripe_payment_description

data/app/models/spree/payment_method/stripe_credit_card.rb

@@ -87,10 +87,13 @@ module Spree
 
       def try_void(payment)
         if v3_intents? && payment.completed?
-          payment.refunds.create!(
-            amount: payment.credit_allowed,
-            reason: payment_intents_refund_reason
-          ).response
+          refund = perform_refund(payment)
+
+          if refund.respond_to?(:perform_response)
+            refund.perform_response
+          else
+            refund.response
+          end
         else
           void(payment.response_code, nil, nil)
         end
@@ -152,6 +155,7 @@ module Spree
         options[:description] = "Solidus Order ID: #{transaction_options[:order_id]}"
         options[:currency] = transaction_options[:currency]
         options[:off_session] = true if v3_intents?
+        options[:statement_descriptor_suffix] = transaction_options[:statement_descriptor_suffix] if transaction_options[:statement_descriptor_suffix]
 
         if customer = creditcard.gateway_customer_profile_id
           options[:customer] = customer
@@ -190,6 +194,24 @@ module Spree
         source.cc_type = CARD_TYPE_MAPPING[source.cc_type] if CARD_TYPE_MAPPING.include?(source.cc_type)
         source
       end
+
+      def perform_refund(payment)
+        refund = payment.refunds.build(
+          amount: payment.credit_allowed,
+          reason: payment_intents_refund_reason
+        )
+
+        if refund.respond_to?(:perform_after_create)
+          refund.perform_after_create = false
+          refund.save!
+          refund.perform!
+        else
+          refund.save!
+          refund.perform! if Gem::Requirement.new('>= 3.0.0.alpha').satisfied_by?(Spree.solidus_gem_version)
+        end
+
+        refund
+      end
     end
   end
 end

data/bin/rails

@@ -1,15 +1,7 @@
 #!/usr/bin/env ruby
 
-# frozen_string_literal: true
-
-app_root = 'spec/dummy'
-
-unless File.exist? "#{app_root}/bin/rails"
-  system "bin/rake", app_root or begin # rubocop:disable Style/AndOr
-    warn "Automatic creation of the dummy app failed"
-    exit 1
-  end
+if %w[g generate].include? ARGV.first
+  exec "#{__dir__}/rails-engine", *ARGV
+else
+  exec "#{__dir__}/rails-sandbox", *ARGV
 end
-
-Dir.chdir app_root
-exec 'bin/rails', *ARGV