solidus_stripe 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a9c4fef33f8a78362d726cdd997b494a5127c0dd5ae3a7298fda3e5e7a8efb1
-  data.tar.gz: a7ef47465e84012d7c9e1f873381ce3f761bb65810d997ac2eae4ef04f5d1428
+  metadata.gz: 38e979d7eecd9e20f5d763ad5e2bec33312f0877b2cec287604801b483dcb006
+  data.tar.gz: 19a4708081571dbba8c34c7d0173c1a1704ff12df54902e488add9572c4a9080
 SHA512:
-  metadata.gz: 72f01baad84dfb2e9ebe654e0fbb4f5fa8d8f00b8debf04caab1deb94b48a1dc6c2dcde4508b5c195c4f6a30b24abe6292f5f500c922d562a2a19eeb83aa1fef
-  data.tar.gz: 2bc6f12bd539f13b17a7c754b9259aa0fd3110b2db2abd938a1558b733c15bd133efd80be78964964b83f600d6eeb434214c4387a8862d70689b887d99d1e442
+  metadata.gz: 6cf3fd35258a8e0c300d0b2ca18d131d9ee3e2b74cc8522e911c8fe7a94fa7e987b66c445d52dace4df580ecf3c54eeec14be421f4f06d1e823d7705eb6c5ae3
+  data.tar.gz: d868652e26e2c4c3813e1f2438c4e2cbedc3f2e4de51a21e7eaafdb1e8fe37d35c4152e1e1ce215ba550be5a1b3d4caa15f4d4dc23f51446708f49c0d21c3f4d

data/CHANGELOG.md

@@ -7,6 +7,7 @@
 **Fixed bugs:**
 
 - Duplicates charges with Payment Intents [\#44](https://github.com/solidusio/solidus_stripe/issues/44)
+- Send form data also when paying with payment request button [\#47](https://github.com/solidusio/solidus_stripe/pull/47) ([spaghetticode](https://github.com/spaghetticode))
 - 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:**
@@ -17,6 +18,7 @@
 
 **Merged pull requests:**
 
+- 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))

data/README.md

@@ -107,6 +107,25 @@ Spree.config do |config|
 end
 ```
 
+When using the Payment Intents API, be aware that the charge flow will be a bit
+different than when using the old V2 API or Elements. It's advisable that all
+Payment Intents charges are captured only by using the Solidus backend, as it is
+the final source of truth in regards of Solidus orders payments.
+
+A Payment Intent is created as soon as the customer enters their credit card
+data. A tentative charge will be created on Stripe, easily recognizable by its
+description: `Solidus Order ID: R987654321 (pending)`. As soon as the credit
+card is confirmed (ie. when the customer passes the 3DSecure authorization, when
+required) then the charge description gets updated to include the Solidus payment
+number: `Solidus Order ID: R987654321-Z4VYUDB3`.
+
+These charges are created `uncaptured` and will need to be captured in Solidus
+backend later, after the customer confirms the order. If the customer never
+completes the checkout, that charge must remain uncaptured. If the customer
+decides to change their payment method after creating a Payment Request, then
+that Payment Request charge will be canceled.
+
+
 Apple Pay and Google Pay
 -----------------------
 
@@ -210,13 +229,13 @@ You can also style your element containers directly by using CSS rules like this
 
 ### Customizing individual input fields
 
-If you want to customize individual input fields, you can override these methods 
+If you want to customize individual input fields, you can override these methods
 
 * `SolidusStripe.Elements.prototype.cardNumberElementOptions`
 * `SolidusStripe.Elements.prototype.cardExpiryElementOptions`
 * `SolidusStripe.Elements.prototype.cardCvcElementOptions`
 
-and return a valid [options object](https://stripe.com/docs/js/elements_object/create_element?type=cardNumber) for the corresponding field type. For example, this code sets a custom placeholder and enables the credit card icon for the card number field 
+and return a valid [options object](https://stripe.com/docs/js/elements_object/create_element?type=cardNumber) for the corresponding field type. For example, this code sets a custom placeholder and enables the credit card icon for the card number field
 
 ```js
 SolidusStripe.Elements.prototype.cardNumberElementOptions = function () {
@@ -230,7 +249,7 @@ SolidusStripe.Elements.prototype.cardNumberElementOptions = function () {
 
 ### Passing options to the Stripe Elements instance
 
-By overriding the `SolidusStripe.Payment.prototype.elementsBaseOptions` method and returning a [valid options object](https://stripe.com/docs/js/elements_object/create), you can pass custom options to the Stripe Elements instance. 
+By overriding the `SolidusStripe.Payment.prototype.elementsBaseOptions` method and returning a [valid options object](https://stripe.com/docs/js/elements_object/create), you can pass custom options to the Stripe Elements instance.
 
 Note that in order to use web fonts with Stripe Elements, you must specify the fonts when creating the Stripe Elements instance. Here's an example specifying a custom web font and locale:
 

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

@@ -16,11 +16,14 @@ SolidusStripe.CartPageCheckout.prototype.init = function() {
 };
 
 SolidusStripe.CartPageCheckout.prototype.showError = function(error) {
-  this.errorElement.text(error).show();
+  var message = error.message || error;
+
+  this.errorElement.text(message).show();
 };
 
 SolidusStripe.CartPageCheckout.prototype.submitPayment = function(payment) {
   var showError = this.showError.bind(this);
+  var prTokenHandler = this.prTokenHandler.bind(this);
 
   $.ajax({
     url: $('[data-submit-url]').data('submit-url'),
@@ -29,7 +32,7 @@ SolidusStripe.CartPageCheckout.prototype.submitPayment = function(payment) {
     },
     type: 'PATCH',
     contentType: 'application/json',
-    data: JSON.stringify(this.prTokenHandler(payment.paymentMethod)),
+    data: JSON.stringify(prTokenHandler(payment.paymentMethod)),
     success: function() {
       window.location = $('[data-complete-url]').data('complete-url');
     },
@@ -39,26 +42,56 @@ SolidusStripe.CartPageCheckout.prototype.submitPayment = function(payment) {
   });
 };
 
-SolidusStripe.CartPageCheckout.prototype.onPrPayment = function(result) {
-  var handleServerResponse = this.handleServerResponse.bind(this);
+SolidusStripe.CartPageCheckout.prototype.onPrPayment = function(payment) {
+  var createIntent = this.createIntent.bind(this);
 
   fetch('/stripe/update_order', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
-      shipping_address: result.shippingAddress,
-      shipping_option: result.shippingOption,
-      email: result.payerEmail,
-      name: result.payerName,
+      shipping_address: payment.shippingAddress,
+      shipping_option: payment.shippingOption,
+      email: payment.payerEmail,
+      name: payment.payerName,
       authenticity_token: this.authToken
     })
   }).then(function(response) {
     response.json().then(function(json) {
-      handleServerResponse(json, result);
+      createIntent(json, payment);
     })
   });
 };
 
+SolidusStripe.CartPageCheckout.prototype.createIntent = function(result, payment) {
+  var handleServerResponse = this.handleServerResponse.bind(this);
+
+  if (result.error) {
+    this.completePaymentRequest(payment, 'fail');
+    this.showError(result.error);
+  } else {
+    if (payment.error) {
+      this.showError(payment.error.message);
+    } else {
+      fetch('/stripe/create_intent', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          form_data: payment.shippingAddress,
+          spree_payment_method_id: this.config.id,
+          stripe_payment_method_id: payment.paymentMethod.id,
+          authenticity_token: this.authToken
+        })
+      }).then(function(response) {
+        response.json().then(function(result) {
+          handleServerResponse(result, payment)
+        })
+      });
+    }
+  }
+};
+
 SolidusStripe.CartPageCheckout.prototype.onPrButtonMounted = function(buttonId, success) {
   var container = document.getElementById(buttonId).parentElement;
 

data/app/assets/javascripts/spree/frontend/solidus_stripe/stripe-payment-intents.js

@@ -21,7 +21,7 @@ SolidusStripe.PaymentIntents.prototype.onPrPayment = function(payment) {
     var that = this;
 
     this.elementsTokenHandler(payment.paymentMethod);
-    fetch('/stripe/confirm_intents', {
+    fetch('/stripe/create_intent', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'
@@ -64,7 +64,7 @@ SolidusStripe.PaymentIntents.prototype.onIntentsPayment = function(payment) {
     var that = this;
 
     this.elementsTokenHandler(payment.paymentMethod);
-    fetch('/stripe/confirm_intents', {
+    fetch('/stripe/create_intent', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'

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

@@ -83,37 +83,73 @@
         this.showError(response.error);
         this.completePaymentRequest(payment, 'fail');
       } else if (response.requires_action) {
-        this.stripe.handleCardAction(
-          response.stripe_payment_intent_client_secret
-        ).then(this.onIntentsClientSecret.bind(this));
+        var clientSecret = response.stripe_payment_intent_client_secret;
+        var onConfirmCardPayment = this.onConfirmCardPayment.bind(this);
+
+        this.stripe.confirmCardPayment(
+          clientSecret,
+          {payment_method: payment.paymentMethod.id},
+          {handleActions: false}
+        ).then(function(confirmResult) {
+          onConfirmCardPayment(confirmResult, payment, clientSecret)
+        });
       } else {
-        this.completePaymentRequest(payment, 'success');
-        this.submitPayment(payment);
+        this.completePayment(payment, response.stripe_payment_intent_id)
       }
     },
 
-    onIntentsClientSecret: function(result) {
-      if (result.error) {
-        this.showError(result.error);
+    onConfirmCardPayment: function(confirmResult, payment, clientSecret) {
+      onStripeResponse = function(response, payment) {
+        if (response.error) {
+          this.showError(response.error);
+        } else {
+          this.completePayment(payment, response.paymentIntent.id)
+        }
+      }.bind(this);
+
+      if (confirmResult.error) {
+        this.completePaymentRequest(payment, 'fail');
+        this.showError(confirmResult.error);
       } else {
-        fetch('/stripe/confirm_intents', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            form_data: this.form.serialize(),
-            spree_payment_method_id: this.config.id,
-            stripe_payment_intent_id: result.paymentIntent.id,
-            authenticity_token: this.authToken
-          })
-        }).then(function(confirmResult) {
-          return confirmResult.json();
-        }).then(this.handleServerResponse.bind(this));
+        this.completePaymentRequest(payment, 'success');
+        this.stripe.confirmCardPayment(clientSecret).then(function(response) {
+          onStripeResponse(response, payment);
+        });
       }
     },
 
+    completePayment: function(payment, stripePaymentIntentId) {
+      var onCreateBackendPayment = function (response) {
+        if (response.error) {
+          this.completePaymentRequest(payment, 'fail');
+          this.showError(response.error);
+        } else {
+          this.completePaymentRequest(payment, 'success');
+          this.submitPayment(payment);
+        }
+      }.bind(this);
+
+      fetch('/stripe/create_payment', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          form_data: this.form ? this.form.serialize() : payment.shippingAddress,
+          spree_payment_method_id: this.config.id,
+          stripe_payment_intent_id: stripePaymentIntentId,
+          authenticity_token: this.authToken
+        })
+      }).then(function(solidusPaymentResponse) {
+        return solidusPaymentResponse.json();
+      }).then(onCreateBackendPayment)
+    },
+
     completePaymentRequest: function(payment, state) {
       if (payment && typeof payment.complete === 'function') {
         payment.complete(state);
+        if (state === 'fail') {
+          // restart the button (required in order to force address choice)
+          new SolidusStripe.CartPageCheckout().init();
+        }
       }
     }
   };

data/app/controllers/solidus_stripe/intents_controller.rb

@@ -4,15 +4,9 @@ module SolidusStripe
   class IntentsController < Spree::BaseController
     include Spree::Core::ControllerHelpers::Order
 
-    def confirm
+    def create_intent
       begin
-        @intent = begin
-          if params[:stripe_payment_method_id].present?
-            create_intent
-          elsif params[:stripe_payment_intent_id].present?
-            stripe.confirm_intent(params[:stripe_payment_intent_id], nil)
-          end
-        end
+        @intent = create_payment_intent
       rescue Stripe::CardError => e
         render json: { error: e.message }, status: 500
         return
@@ -21,6 +15,20 @@ module SolidusStripe
       generate_payment_response
     end
 
+    def create_payment
+      create_payment_service = SolidusStripe::CreateIntentsPaymentService.new(
+        params[:stripe_payment_intent_id],
+        stripe,
+        self
+      )
+
+      if create_payment_service.call
+        render json: { success: true }
+      else
+        render json: { error: "Could not create payment" }, status: 500
+      end
+    end
+
     private
 
     def stripe
@@ -37,20 +45,23 @@ module SolidusStripe
           stripe_payment_intent_client_secret: response['client_secret']
         }
       elsif response['status'] == 'requires_capture'
-        SolidusStripe::CreateIntentsOrderService.new(@intent, stripe, self).call
-        render json: { success: true }
+        render json: {
+          success: true,
+          requires_capture: true,
+          stripe_payment_intent_id: response['id']
+        }
       else
         render json: { error: response['error']['message'] }, status: 500
       end
     end
 
-    def create_intent
+    def create_payment_intent
       stripe.create_intent(
         (current_order.total * 100).to_i,
         params[:stripe_payment_method_id],
         description: "Solidus Order ID: #{current_order.number} (pending)",
         currency: current_order.currency,
-        confirmation_method: 'manual',
+        confirmation_method: 'automatic',
         capture_method: 'manual',
         confirm: true,
         setup_future_usage: 'off_session',

data/app/models/solidus_stripe/address_from_params_service.rb

@@ -4,7 +4,7 @@ module SolidusStripe
   class AddressFromParamsService
     attr_reader :address_params, :user
 
-    def initialize(address_params, user)
+    def initialize(address_params, user = nil)
       @address_params, @user = address_params, user
     end
 

data/app/models/solidus_stripe/create_intents_payment_service.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+module SolidusStripe
+  class CreateIntentsPaymentService
+    attr_reader :intent_id, :stripe, :controller
+
+    delegate :request, :current_order, :params, to: :controller
+
+    def initialize(intent_id, stripe, controller)
+      @intent_id, @stripe, @controller = intent_id, stripe, controller
+    end
+
+    def call
+      invalidate_previous_payment_intents_payments
+      if (payment = create_payment)
+        description = "Solidus Order ID: #{payment.gateway_order_identifier}"
+        stripe.update_intent(nil, intent_id, nil, description: description)
+        true
+      else
+        invalidate_current_payment_intent
+        false
+      end
+    end
+
+    private
+
+    def intent
+      @intent ||= stripe.show_intent(intent_id, {})
+    end
+
+    def invalidate_current_payment_intent
+      stripe.cancel(intent_id)
+    end
+
+    def invalidate_previous_payment_intents_payments
+      if stripe.v3_intents?
+        current_order.payments.pending.where(payment_method: stripe).each(&:void_transaction!)
+      end
+    end
+
+    def create_payment
+      Spree::OrderUpdateAttributes.new(
+        current_order,
+        payment_params,
+        request_env: request.headers.env
+      ).apply
+
+      created_payment = Spree::Payment.find_by(response_code: intent_id)
+      created_payment&.tap { |payment| payment.update!(state: :pending) }
+    end
+
+    def payment_params
+      {
+        payments_attributes: [{
+          payment_method_id: stripe.id,
+          amount: current_order.total,
+          response_code: intent_id,
+          source_attributes: {
+            month: intent_card['exp_month'],
+            year: intent_card['exp_year'],
+            cc_type: intent_card['brand'],
+            last_digits: intent_card['last4'],
+            gateway_payment_profile_id: intent_customer_profile,
+            name: address_full_name,
+            address_attributes: address_attributes
+          }
+        }]
+      }
+    end
+
+    def intent_card
+      intent.params['charges']['data'][0]['payment_method_details']['card']
+    end
+
+    def intent_customer_profile
+      intent.params['payment_method']
+    end
+
+    def form_data
+      params[:form_data]
+    end
+
+    def address_attributes
+      if form_data.is_a?(String)
+        data = Rack::Utils.parse_nested_query(form_data)
+        data['payment_source'][stripe.id.to_s]['address_attributes']
+      else
+        SolidusStripe::AddressFromParamsService.new(form_data).call.attributes
+      end
+    end
+
+    def address_full_name
+      current_order.bill_address&.full_name || form_data[:recipient]
+    end
+
+    def update_stripe_payment_description
+      description = "Solidus Order ID: #{payment.gateway_order_identifier}"
+      stripe.update_intent(nil, intent_id, nil, description: description)
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ module Spree
         'Visa' => 'visa'
       }
 
-      delegate :create_intent, :update_intent, :confirm_intent, to: :gateway
+      delegate :create_intent, :update_intent, :confirm_intent, :show_intent, to: :gateway
 
       def stripe_config(order)
         {

data/config/routes.rb

@@ -3,7 +3,8 @@ Spree::Core::Engine.routes.draw do
   post '/stripe/confirm_payment', to: 'stripe#confirm_payment'
 
   # payment intents routes:
-  post '/stripe/confirm_intents', to: '/solidus_stripe/intents#confirm'
+  post '/stripe/create_intent', to: '/solidus_stripe/intents#create_intent'
+  post '/stripe/create_payment', to: '/solidus_stripe/intents#create_payment'
 
   # payment request routes:
   post '/stripe/shipping_rates', to: '/solidus_stripe/payment_request#shipping_rates'

data/lib/solidus_stripe/engine.rb

@@ -4,7 +4,7 @@ require 'spree/core'
 
 module SolidusStripe
   class Engine < Rails::Engine
-    include SolidusSupport::EngineExtensions::Decorators
+    include SolidusSupport::EngineExtensions
 
     isolate_namespace Spree
 

data/lib/solidus_stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusStripe
-  VERSION = "3.2.1"
+  VERSION = "4.0.0"
 end

data/solidus_stripe.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'solidus_core', ['>= 2.3', '< 3']
-  s.add_dependency 'solidus_support', '~> 0.4'
+  s.add_dependency 'solidus_support', '~> 0.5'
   # ActiveMerchant v1.58 through v1.59 introduced a breaking change
   # to the stripe gateway.
   #

data/spec/features/stripe_checkout_spec.rb

@@ -487,11 +487,9 @@ RSpec.describe "Stripe checkout", type: :feature do
   end
 
   def within_3d_secure_modal
-    within_frame "__privateStripeFrame10" do
+    within_frame "__privateStripeFrame11" do
       within_frame "__stripeJSChallengeFrame" do
-        within_frame "acsFrame" do
-          yield
-        end
+        yield
       end
     end
   end

data/spec/models/solidus_stripe/create_intents_payment_service_spec.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusStripe::CreateIntentsPaymentService do
+  let(:service) { described_class.new(intent_id, stripe, controller) }
+
+  let(:stripe) {
+    Spree::PaymentMethod::StripeCreditCard.create!(
+      name: "Stripe",
+      preferred_secret_key: "sk_test_VCZnDv3GLU15TRvn8i2EsaAN",
+      preferred_publishable_key: "pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg",
+      preferred_v3_elements: false,
+      preferred_v3_intents: true
+    )
+  }
+
+  let(:order) { create :order, state: :payment, total: 19.99 }
+
+  let(:intent_id) { "pi_123123ABC" }
+  let(:controller) { double(current_order: order.reload, params: params, request: spy) }
+
+  let(:params) do
+    {
+      spree_payment_method_id: stripe.id,
+      stripe_payment_intent_id: intent_id,
+      form_data: {
+        addressLine: ["31 Cotton Rd"],
+        city: "San Diego",
+        country: "US",
+        phone: "+188836412312",
+        postalCode: "12345",
+        recipient: "James Edwards",
+        region: "CA"
+      }
+    }
+  end
+
+  let(:intent) do
+    double(params: {
+      "id" => intent_id,
+      "charges" => {
+        "data" => [{
+          "payment_method_details" => {
+            "card" => {
+              "brand" => "visa",
+              "exp_month" => 1,
+              "exp_year" => 2022,
+              "last4" => "4242"
+            },
+          }
+        }]
+      }
+    })
+  end
+
+  describe '#call' do
+    subject { service.call }
+
+    before do
+      allow(stripe).to receive(:show_intent) { intent }
+      allow_any_instance_of(Spree::CreditCard).to receive(:require_card_numbers?) { false }
+      allow_any_instance_of(Spree::PaymentMethod::StripeCreditCard).to receive(:create_profile) { true }
+    end
+
+    it { expect(subject).to be true }
+
+    it "creates a new pending payment" do
+      expect { subject }.to change { order.payments.count }
+      expect(order.payments.last.reload).to be_pending
+    end
+
+    context "when for any reason the payment could not be created" do
+      before { params[:form_data].delete(:city) }
+
+      it "returns false" do
+        expect(subject).to be false
+      end
+    end
+
+    context "when there are previous pending payments" do
+      let!(:payment) do
+        create(:payment, order: order).tap do |payment|
+          payment.update!(state: :pending)
+        end
+      end
+
+      before do
+        response = double(success?: true, authorization: payment.response_code)
+        allow_any_instance_of(Spree::PaymentMethod::StripeCreditCard).to receive(:void) { response }
+      end
+
+      context "when one of them is a Payment Intent" do
+        before do
+          payment.update!(payment_method: stripe)
+          payment.source.update!(payment_method: stripe)
+        end
+
+        it "invalidates it" do
+          expect { subject }.to change { payment.reload.state }.to 'void'
+        end
+      end
+
+      context "when none is a Payment Intent" do
+        it "does not invalidate them" do
+          expect { subject }.not_to change { payment.reload.state }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ files:
 - app/decorators/models/spree/order_update_attributes_decorator.rb
 - app/decorators/models/spree/payment_decorator.rb
 - app/models/solidus_stripe/address_from_params_service.rb
-- app/models/solidus_stripe/create_intents_order_service.rb
+- app/models/solidus_stripe/create_intents_payment_service.rb
 - app/models/solidus_stripe/prepare_order_for_payment_service.rb
 - app/models/solidus_stripe/shipping_rates_service.rb
 - app/models/spree/payment_method/stripe_credit_card.rb
@@ -135,6 +135,7 @@ files:
 - solidus_stripe.gemspec
 - spec/features/stripe_checkout_spec.rb
 - spec/models/solidus_stripe/address_from_params_service_spec.rb
+- spec/models/solidus_stripe/create_intents_payment_service_spec.rb
 - spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb
@@ -162,13 +163,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Stripe Payment Method for Solidus
 test_files:
 - spec/features/stripe_checkout_spec.rb
 - spec/models/solidus_stripe/address_from_params_service_spec.rb
+- spec/models/solidus_stripe/create_intents_payment_service_spec.rb
 - spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb

data/app/models/solidus_stripe/create_intents_order_service.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusStripe
-  class CreateIntentsOrderService
-    attr_reader :intent, :stripe, :controller
-
-    delegate :request, :current_order, :params, to: :controller
-
-    def initialize(intent, stripe, controller)
-      @intent, @stripe, @controller = intent, stripe, controller
-    end
-
-    def call
-      invalidate_previous_payment_intents_payments
-      payment = create_payment
-      description = "Solidus Order ID: #{payment.gateway_order_identifier}"
-      stripe.update_intent(nil, response['id'], nil, description: description)
-    end
-
-    private
-
-    def invalidate_previous_payment_intents_payments
-      if stripe.v3_intents?
-        current_order.payments.pending.where(payment_method: stripe).each(&:void_transaction!)
-      end
-    end
-
-    def create_payment
-      Spree::OrderUpdateAttributes.new(
-        current_order,
-        payment_params,
-        request_env: request.headers.env
-      ).apply
-
-      Spree::Payment.find_by(response_code: response['id']).tap do |payment|
-        payment.update!(state: :pending)
-      end
-    end
-
-    def payment_params
-      card = response['charges']['data'][0]['payment_method_details']['card']
-      address_attributes = form_data['payment_source'][stripe.id.to_s]['address_attributes']
-
-      {
-        payments_attributes: [{
-          payment_method_id: stripe.id,
-          amount: current_order.total,
-          response_code: response['id'],
-          source_attributes: {
-            month: card['exp_month'],
-            year: card['exp_year'],
-            cc_type: card['brand'],
-            gateway_payment_profile_id: response['payment_method'],
-            last_digits: card['last4'],
-            name: current_order.bill_address.full_name,
-            address_attributes: address_attributes
-          }
-        }]
-      }
-    end
-
-    def response
-      intent.params
-    end
-
-    def form_data
-      Rack::Utils.parse_nested_query(params[:form_data])
-    end
-  end
-end