solidus_stripe 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e6ec7ddfb05d802b145edb2e2e50d58510148be740c085dd0a7eb99a8e367b
-  data.tar.gz: c6598070cbe6c6e18504f27ab999ef0ca6d1b331ecdee9e1838434c261fe699d
+  metadata.gz: 929c7fff2fc949fe3979ae7a9403903b563a3ef67c5c8588f171c9bf42181ce6
+  data.tar.gz: a00f65c3222947871e6a97e5fd3e7d72eb7e5edc134128e300578ff68b13f876
 SHA512:
-  metadata.gz: 8faba0fdc2be35b90a936273a8d3aedf2411a10e8c01489c5a66b5859fbbcccb38ffcfec3e9d2a34dcdbf065228396b3047210cdbcbb0818c495ff2abf76f098
-  data.tar.gz: 82f01e68ff9a5fa8bcc74c759c3974d78cf05411b83cb732ca0ef32553d62d920697093db371a174c826d3391ca19908f0e4a35a4ae152863c61a94ae595f2c4
+  metadata.gz: 8090f338dfefc83e121000e88d467eabc6631e6501eea750b2103c31d285a1a28364e01968c0586f564099780d69bde29f736cc2bf4b34f9456b7bf02ea84501
+  data.tar.gz: d7e5b50dd60a80c74754acd3bbcc0552af926c04d05f380995319a0336daf2aa37f8c127966d68dcecf8bb308d7ef6607ff5d948bc2e23a1544179a41c93fac5

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [Unreleased](https://github.com/solidusio/solidus_stripe/tree/HEAD)
+
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.0.0...HEAD)
+
+**Closed issues:**
+
+- Pay with Apple Pay from cart page [\#23](https://github.com/solidusio/solidus_stripe/issues/23)
+
+## [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)
+
+**Implemented enhancements:**
+
+- Rename v3/stripe partial as v3/elements [\#30](https://github.com/solidusio/solidus_stripe/pull/30) ([spaghetticode](https://github.com/spaghetticode))
+
+**Merged pull requests:**
+
+- Allow to customize Stripe Elements styles via JS [\#34](https://github.com/solidusio/solidus_stripe/pull/34) ([spaghetticode](https://github.com/spaghetticode))
+- Stop injecting css in host app while installing [\#33](https://github.com/solidusio/solidus_stripe/pull/33) ([kennyadsl](https://github.com/kennyadsl))
+- Manage Stripe V3 JS code via Sprokets [\#32](https://github.com/solidusio/solidus_stripe/pull/32) ([spaghetticode](https://github.com/spaghetticode))
+
+## [v2.1.0](https://github.com/solidusio/solidus_stripe/tree/v2.1.0) (2020-03-11)
+
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v2.0.0...v2.1.0)
+
+**Closed issues:**
+
+- Preference :stripe\_country is not defined on Spree::PaymentMethod::StripeCreditCard \(RuntimeError\) [\#27](https://github.com/solidusio/solidus_stripe/issues/27)
+
+**Merged pull requests:**
+
+- Refactor Stripe V3 Intents, Elements and cart checkout JS code [\#31](https://github.com/solidusio/solidus_stripe/pull/31) ([spaghetticode](https://github.com/spaghetticode))
+
 ## [v2.0.0](https://github.com/solidusio/solidus_stripe/tree/v2.0.0) (2020-03-03)
 
 [Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v1.2.0...v2.0.0)

data/README.md

@@ -13,7 +13,7 @@ Installation
 In your Gemfile:
 
 ```ruby
-gem 'solidus_stripe', '~> 1.0.0'
+gem 'solidus_stripe', '~> 3.0'
 ```
 
 Then run from the command line:
@@ -155,13 +155,13 @@ SolidusStripe.CartPageCheckout.prototype.onPrButtonMounted = function(id, result
 }
 ```
 
-Styling Stripe Elements
+Customizing Stripe Elements
 -----------------------
 
-The Elements feature built in this gem come with some standard styles. If you want
-to customize it, you can override the `SolidusStripe.Elements.prototype.baseStyle`
-method and make it return a valid [Stripe Style](https://stripe.com/docs/js/appendix/style)
-object:
+### Styling input fields
+
+The default style this gem provides for Stripe Elements input fields is defined in `SolidusStripe.Elements.prototype.baseStyle`. You can override this method to return your own custom style (make sure it returns a valid [Stripe Style](https://stripe.com/docs/js/appendix/style)
+object):
 
 ```js
 SolidusStripe.Elements.prototype.baseStyle = function () {
@@ -208,6 +208,46 @@ 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 
+
+* `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 
+
+```js
+SolidusStripe.Elements.prototype.cardNumberElementOptions = function () {
+  return {
+    style: this.baseStyle(),
+    showIcon: true,
+    placeholder: "I'm a custom placeholder!"
+  }
+}
+```
+
+### 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. 
+
+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:
+
+```js
+SolidusStripe.Payment.prototype.elementsBaseOptions = function () {
+  return {
+    locale: 'de',
+    fonts: [
+      {
+        cssSrc: 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600'
+      }
+    ]
+  };
+};
+```
+
+
 Migrating from solidus_gateway
 ------------------------------
 

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

@@ -18,29 +18,45 @@ SolidusStripe.Elements.prototype.init = function() {
 };
 
 SolidusStripe.Elements.prototype.initElements = function() {
-  var buildElements = function(elements) {
-    var style = this.baseStyle();
+  var cardExpiry = this.elements.create('cardExpiry', this.cardExpiryElementOptions());
+  cardExpiry.mount('#card_expiry');
 
-    elements.create('cardExpiry', {style: style}).mount('#card_expiry');
-    elements.create('cardCvc', {style: style}).mount('#card_cvc');
+  var cardCvc = this.elements.create('cardCvc', this.cardCvcElementOptions());
+  cardCvc.mount('#card_cvc');
 
-    var cardNumber = elements.create('cardNumber', {style: style});
-    cardNumber.mount('#card_number');
+  this.cardNumber = this.elements.create('cardNumber', this.cardNumberElementOptions());
+  this.cardNumber.mount('#card_number');
 
-    return cardNumber;
-  }.bind(this);
-
-  this.cardNumber = buildElements(this.elements);
-
-  var cardChange = function(event) {
-    if (event.error) {
-      this.showError(event.error.message);
-    } else {
-      this.errorElement.hide().text('');
-    }
-  };
-  this.cardNumber.addEventListener('change', cardChange.bind(this));
   this.form.bind('submit', this.onFormSubmit.bind(this));
+
+  // Listen for errors from each input field.
+  // Adapted from https://github.com/stripe/elements-examples/blob/master/js/index.js
+  var savedErrors = {};
+  [cardExpiry, cardCvc, this.cardNumber].forEach(function(element, idx) {
+    element.on('change', function(event) {
+      if (event.error) {
+        savedErrors[idx] = event.error.message;
+        this.showError(event.error.message);
+      } else {
+        savedErrors[idx] = null;
+
+        // Loop over the saved errors and find the first one, if any.
+        var nextError = Object.keys(savedErrors)
+          .sort()
+          .reduce(function(maybeFoundError, key) {
+            return maybeFoundError || savedErrors[key];
+          }, null);
+
+        if (nextError) {
+          // Now that they've fixed the current error, show another one.
+          this.showError(nextError);
+        } else {
+          // The user fixed the last error; no more errors.
+          this.errorElement.hide().text('');
+        }
+      }
+    }.bind(this));
+  }.bind(this));
 };
 
 SolidusStripe.Elements.prototype.baseStyle = function () {
@@ -61,6 +77,24 @@ SolidusStripe.Elements.prototype.baseStyle = function () {
   };
 };
 
+SolidusStripe.Elements.prototype.cardNumberElementOptions = function () {
+  return {
+    style: this.baseStyle()
+  }
+}
+
+SolidusStripe.Elements.prototype.cardExpiryElementOptions = function () {
+  return {
+    style: this.baseStyle()
+  }
+}
+
+SolidusStripe.Elements.prototype.cardCvcElementOptions = function () {
+  return {
+    style: this.baseStyle()
+  }
+}
+
 SolidusStripe.Elements.prototype.showError = function(error) {
   var message = error.message || error;
 
@@ -87,18 +121,20 @@ SolidusStripe.Elements.prototype.onFormSubmit = function(event) {
 
 SolidusStripe.Elements.prototype.elementsTokenHandler = function(token) {
   var mapCC = function(ccType) {
-    if (ccType === 'MasterCard') {
+    if (ccType === 'MasterCard' || ccType === 'mastercard') {
       return 'mastercard';
-    } else if (ccType === 'Visa') {
+    } else if (ccType === 'Visa' || ccType === 'visa') {
       return 'visa';
-    } else if (ccType === 'American Express') {
+    } else if (ccType === 'American Express' || ccType === 'amex') {
       return 'amex';
-    } else if (ccType === 'Discover') {
+    } else if (ccType === 'Discover' || ccType === 'discover') {
       return 'discover';
-    } else if (ccType === 'Diners Club') {
+    } else if (ccType === 'Diners Club' || ccType === 'diners') {
       return 'dinersclub';
-    } else if (ccType === 'JCB') {
+    } else if (ccType === 'JCB' || ccType === 'jcb') {
       return 'jcb';
+    } else if (ccType === 'Unionpay' || ccType === 'unionpay') {
+      return 'unionpay';
     }
   };
 

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

@@ -69,6 +69,7 @@ SolidusStripe.PaymentIntents.prototype.onIntentsPayment = function(payment) {
         'Content-Type': 'application/json'
       },
       body: JSON.stringify({
+        form_data: this.form.serialize(),
         spree_payment_method_id: this.config.id,
         stripe_payment_method_id: payment.paymentMethod.id,
         authenticity_token: this.authToken

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

@@ -100,6 +100,7 @@
           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

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

@@ -6,5 +6,11 @@ SolidusStripe.Payment = function() {
   this.authToken = $('meta[name="csrf-token"]').attr('content');
 
   this.stripe = Stripe(this.config.publishable_key);
-  this.elements = this.stripe.elements({locale: 'en'});
+  this.elements = this.stripe.elements(this.elementsBaseOptions());
+};
+
+SolidusStripe.Payment.prototype.elementsBaseOptions = function () {
+  return {
+    locale: 'en'
+  };
 };

data/app/controllers/solidus_stripe/intents_controller.rb

@@ -6,25 +6,19 @@ module SolidusStripe
 
     def confirm
       begin
-        if params[:stripe_payment_method_id].present?
-          intent = stripe.create_intent(
-            (current_order.total * 100).to_i,
-            params[:stripe_payment_method_id],
-            currency: current_order.currency,
-            confirmation_method: 'manual',
-            confirm: true,
-            setup_future_usage: 'on_session',
-            metadata: { order_id: current_order.id }
-          )
-        elsif params[:stripe_payment_intent_id].present?
-          intent = stripe.confirm_intent(params[:stripe_payment_intent_id], nil)
+        @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
       rescue Stripe::CardError => e
         render json: { error: e.message }, status: 500
         return
       end
 
-      generate_payment_response(intent)
+      generate_payment_response
     end
 
     private
@@ -33,20 +27,35 @@ module SolidusStripe
       @stripe ||= Spree::PaymentMethod::StripeCreditCard.find(params[:spree_payment_method_id])
     end
 
-    def generate_payment_response(intent)
-      response = intent.params
+    def generate_payment_response
+      response = @intent.params
       # Note that if your API version is before 2019-02-11, 'requires_action'
       # appears as 'requires_source_action'.
       if %w[requires_source_action requires_action].include?(response['status']) && response['next_action']['type'] == 'use_stripe_sdk'
-          render json: {
-            requires_action: true,
-            stripe_payment_intent_client_secret: response['client_secret']
-          }
-      elsif response['status'] == 'succeeded'
+        render json: {
+          requires_action: true,
+          stripe_payment_intent_client_secret: response['client_secret']
+        }
+      elsif response['status'] == 'requires_capture'
+        SolidusStripe::CreateIntentsOrderService.new(@intent, stripe, self).call
         render json: { success: true }
       else
         render json: { error: response['error']['message'] }, status: 500
       end
     end
+
+    def create_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',
+        capture_method: 'manual',
+        confirm: true,
+        setup_future_usage: 'off_session',
+        metadata: { order_id: current_order.id }
+      )
+    end
   end
 end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Spree
+  module OrderUpdateAttributesDecorator
+    def assign_payments_attributes
+      return if payments_attributes.empty?
+      return if adding_new_stripe_payment_intents_card?
+
+      stripe_intents_pending_payments.each(&:void_transaction!)
+
+      super
+    end
+
+    private
+
+    def adding_new_stripe_payment_intents_card?
+      paying_with_stripe_intents? && stripe_intents_pending_payments.any?
+    end
+
+    def stripe_intents_pending_payments
+      @stripe_intents_pending_payments ||= order.payments.valid.select do |payment|
+        payment_method = payment.payment_method
+        payment.pending? && stripe_intents?(payment_method)
+      end
+    end
+
+    def paying_with_stripe_intents?
+      if id = payments_attributes.first&.dig(:payment_method_id)
+        stripe_intents?(Spree::PaymentMethod.find(id))
+      end
+    end
+
+    def stripe_intents?(payment_method)
+      payment_method.respond_to?(:v3_intents?) && payment_method.v3_intents?
+    end
+
+    ::Spree::OrderUpdateAttributes.prepend(self)
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spree
+  module PaymentDecorator
+    def gateway_order_identifier
+      gateway_order_id
+    end
+
+    ::Spree::Payment.prepend(self)
+  end
+end

data/app/models/solidus_stripe/create_intents_order_service.rb

@@ -0,0 +1,70 @@
+# 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

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

@@ -15,6 +15,8 @@ module Spree
         'Visa' => 'visa'
       }
 
+      delegate :create_intent, :update_intent, :confirm_intent, to: :gateway
+
       def stripe_config(order)
         {
           id: id,
@@ -59,14 +61,6 @@ module Spree
         true
       end
 
-      def create_intent(*args)
-        gateway.create_intent(*args)
-      end
-
-      def confirm_intent(*args)
-        gateway.confirm_intent(*args)
-      end
-
       def purchase(money, creditcard, transaction_options)
         gateway.purchase(*options_for_purchase_or_auth(money, creditcard, transaction_options))
       end
@@ -140,8 +134,9 @@ module Spree
 
       def options_for_purchase_or_auth(money, creditcard, transaction_options)
         options = {}
-        options[:description] = "Spree Order ID: #{transaction_options[:order_id]}"
+        options[:description] = "Solidus Order ID: #{transaction_options[:order_id]}"
         options[:currency] = transaction_options[:currency]
+        options[:off_session] = true if v3_intents?
 
         if customer = creditcard.gateway_customer_profile_id
           options[:customer] = customer

data/lib/solidus_stripe/version.rb

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

data/spec/features/stripe_checkout_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe "Stripe checkout", type: :feature do
   let(:zone) { FactoryBot.create(:zone) }
   let(:country) { FactoryBot.create(:country) }
 
+  let(:card_3d_secure) { "4000 0025 0000 3155" }
+
   before do
     FactoryBot.create(:store)
     zone.members << Spree::ZoneMember.create!(zoneable: country)
@@ -301,24 +303,8 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
 
     context "when using a valid 3D Secure card" do
-      let(:card_number) { "4000 0027 6000 3184" }
-
       it "successfully completes the checkout" do
-        within_frame find('#card_number iframe') do
-          card_number.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-        end
-        within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-        within_frame(find '#card_expiry iframe') do
-          '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-        end
-
-        click_button "Save and Continue"
-
-        within_3d_secure_modal do
-          expect(page).to have_content '$19.99 using 3D Secure'
-
-          click_button 'Complete authentication'
-        end
+        authenticate_3d_secure_card(card_3d_secure)
 
         expect(page).to have_current_path("/checkout/confirm")
 
@@ -368,59 +354,133 @@ RSpec.describe "Stripe checkout", type: :feature do
       end
     end
 
-    it "can re-use saved cards" do
-      within_frame find('#card_number iframe') do
-        "4000 0027 6000 3184".split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-      end
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-      within_frame(find '#card_expiry iframe') do
-        '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-      end
-      click_button "Save and Continue"
+    context "when reusing a card" do
+      stub_authorization!
 
-      within_3d_secure_modal do
-        click_button 'Complete authentication'
+      it "succesfully creates a second payment that can be captured in the backend" do
+        authenticate_3d_secure_card(card_3d_secure)
+
+        expect(page).to have_current_path("/checkout/confirm")
+        click_button "Place Order"
+        expect(page).to have_content("Your order has been processed successfully")
+
+        visit spree.root_path
+        click_link "DL-44"
+        click_button "Add To Cart"
+
+        expect(page).to have_current_path("/cart")
+        click_button "Checkout"
+
+        # Address
+        expect(page).to have_current_path("/checkout/address")
+
+        within("#billing") do
+          fill_in_name
+          fill_in "Street Address", with: "YT-1300"
+          fill_in "City", with: "Mos Eisley"
+          select "United States of America", from: "Country"
+          select country.states.first.name, from: "order_bill_address_attributes_state_id"
+          fill_in "Zip", with: "12010"
+          fill_in "Phone", with: "(555) 555-5555"
+        end
+        click_on "Save and Continue"
+
+        # Delivery
+        expect(page).to have_current_path("/checkout/delivery")
+        expect(page).to have_content("UPS Ground")
+        click_on "Save and Continue"
+
+        # Payment
+        expect(page).to have_current_path("/checkout/payment")
+        choose "Use an existing card on file"
+        click_button "Save and Continue"
+
+        # Confirm
+        expect(page).to have_current_path("/checkout/confirm")
+        click_button "Place Order"
+        expect(page).to have_content("Your order has been processed successfully")
+
+        # Capture in backend
+        Spree::Order.complete.each do |order|
+          visit spree.admin_path
+
+          expect(page).to have_selector("#listing_orders tbody tr", count: 2)
+
+          click_link order.number
+
+          click_link "Payments"
+          find(".fa-capture").click
+
+          expect(page).to have_content "Payment Updated"
+          expect(find("table#payments")).to have_content "Completed"
+        end
       end
+    end
 
-      expect(page).to have_current_path("/checkout/confirm")
-      click_button "Place Order"
-      expect(page).to have_content("Your order has been processed successfully")
+    context "when paying with multiple payment methods" do
+      stub_authorization!
 
-      visit spree.root_path
-      click_link "DL-44"
-      click_button "Add To Cart"
+      context "when paying first with regular card, then with 3D-Secure card" do
+        let(:regular_card) { "4242 4242 4242 4242"}
 
-      expect(page).to have_current_path("/cart")
-      click_button "Checkout"
+        it "voids the first stripe payment and successfully pays with 3DS card" do
+          within_frame find('#card_number iframe') do
+            regular_card.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
+          end
+          within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
+          within_frame(find '#card_expiry iframe') do
+            '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
+          end
+          click_button "Save and Continue"
 
-      # Address
-      expect(page).to have_current_path("/checkout/address")
+          expect(page).to have_content "Ending in 4242"
 
-      within("#billing") do
-        fill_in_name
-        fill_in "Street Address", with: "YT-1300"
-        fill_in "City", with: "Mos Eisley"
-        select "United States of America", from: "Country"
-        select country.states.first.name, from: "order_bill_address_attributes_state_id"
-        fill_in "Zip", with: "12010"
-        fill_in "Phone", with: "(555) 555-5555"
+          click_link "Payment"
+
+          authenticate_3d_secure_card(card_3d_secure)
+          click_button "Place Order"
+          expect(page).to have_content "Your order has been processed successfully"
+
+          visit spree.admin_path
+          click_link Spree::Order.complete.first.number
+          click_link "Payments"
+
+          payments = all('table#payments tbody tr')
+
+          expect(payments.first).to have_content "Stripe"
+          expect(payments.first).to have_content "Void"
+
+          expect(payments.last).to have_content "Stripe"
+          expect(payments.last).to have_content "Pending"
+        end
       end
-      click_on "Save and Continue"
 
-      # Delivery
-      expect(page).to have_current_path("/checkout/delivery")
-      expect(page).to have_content("UPS Ground")
-      click_on "Save and Continue"
+      context "when paying first with 3D-Secure card, then with check" do
+        before { create :check_payment_method }
 
-      # Payment
-      expect(page).to have_current_path("/checkout/payment")
-      choose "Use an existing card on file"
-      click_button "Save and Continue"
+        it "voids the stripe payment and successfully pays with check" do
+          authenticate_3d_secure_card(card_3d_secure)
+          expect(page).to have_current_path("/checkout/confirm")
 
-      # Confirm
-      expect(page).to have_current_path("/checkout/confirm")
-      click_button "Place Order"
-      expect(page).to have_content("Your order has been processed successfully")
+          click_link "Payment"
+          choose "Check"
+          click_button "Save and Continue"
+          expect(find(".payment-info")).to have_content "Check"
+          expect(page).to have_content "Your order has been processed successfully"
+
+          visit spree.admin_path
+          click_link Spree::Order.complete.first.number
+          click_link "Payments"
+          payments = all('table#payments tbody tr')
+
+          stripe_payment = payments.first
+          expect(stripe_payment).to have_content "Stripe"
+          expect(stripe_payment).to have_content "Void"
+
+          check_payment = payments.last
+          expect(check_payment).to have_content "Check"
+        end
+      end
     end
 
     it_behaves_like "Stripe Elements invalid payments"
@@ -433,4 +493,21 @@ RSpec.describe "Stripe checkout", type: :feature do
       end
     end
   end
+
+  def authenticate_3d_secure_card(card_number)
+    within_frame find('#card_number iframe') do
+      card_number.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
+    end
+    within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
+    within_frame(find '#card_expiry iframe') do
+      '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
+    end
+    click_button "Save and Continue"
+
+    within_3d_secure_modal do
+      expect(page).to have_content '$19.99 using 3D Secure'
+
+      click_button 'Complete authentication'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -101,7 +101,10 @@ files:
 - app/controllers/solidus_stripe/intents_controller.rb
 - app/controllers/solidus_stripe/payment_request_controller.rb
 - app/controllers/spree/stripe_controller.rb
+- 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/prepare_order_for_payment_service.rb
 - app/models/solidus_stripe/shipping_rates_service.rb
 - app/models/spree/payment_method/stripe_credit_card.rb