solidus_stripe 2.0.0 → 3.2.1

data/lib/generators/solidus_stripe/install/install_generator.rb

@@ -5,11 +5,8 @@ module SolidusStripe
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
 
-      def add_stylesheets
-        filename = 'vendor/assets/stylesheets/spree/frontend/all.css'
-        if File.file? filename
-          inject_into_file filename, " *= require spree/frontend/solidus_stripe\n", before: '*/', verbose: true
-        end
+      def add_javascripts
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_stripe\n"
       end
 
       def add_migrations

data/lib/solidus_stripe/engine.rb

@@ -21,7 +21,6 @@ module SolidusStripe
 
     if SolidusSupport.frontend_available?
       paths["app/views"] << "lib/views/frontend"
-      config.assets.precompile += ['solidus_stripe/stripe-init.js']
     end
 
     if SolidusSupport.api_available?

data/lib/solidus_stripe/version.rb

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

data/lib/views/frontend/spree/checkout/payment/_stripe.html.erb

@@ -1,5 +1,5 @@
 <% if payment_method.v3_elements? %>
-  <%= render 'spree/checkout/payment/v3/stripe', payment_method: payment_method %>
+  <%= render 'spree/checkout/payment/v3/elements', payment_method: payment_method %>
 <% elsif payment_method.v3_intents? %>
   <%= render 'spree/checkout/payment/v3/intents', payment_method: payment_method %>
 <% else %>

data/lib/views/frontend/spree/checkout/payment/v3/_elements.html.erb

@@ -0,0 +1 @@
+<%= render 'spree/checkout/payment/v3/form_elements', payment_method: payment_method, stripe_v3_api: 'elements' %>

data/lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb

@@ -1,4 +1,4 @@
-<div id="payment-request-button" data-stripe-config="<%= payment_method.stripe_config(current_order).to_json %>"></div>
+<div id="payment-request-button" data-stripe-config="<%= payment_method.stripe_config(current_order).to_json %>" data-v3-api="<%= stripe_v3_api %>"></div>
 
 <%= image_tag 'credit_cards/credit_card.gif', id: 'credit-card-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
@@ -38,5 +38,3 @@
 <% end %>
 
 <%= hidden_field_tag "#{param_prefix}[cc_type]", '', id: "cc_type", class: 'ccType' %>
-
-<script src="https://js.stripe.com/v3/"></script>

data/lib/views/frontend/spree/checkout/payment/v3/_intents.html.erb

@@ -1,5 +1 @@
-<%= render 'spree/checkout/payment/v3/form_elements', payment_method: payment_method %>
-
-<%= javascript_include_tag "solidus_stripe/stripe-init.js" %>
-
-<%= render "spree/checkout/payment/v3/intents_js" %>
+<%= render 'spree/checkout/payment/v3/form_elements', payment_method: payment_method, stripe_v3_api: 'payment-intents' %>

data/lib/views/frontend/spree/checkout/payment/v3/_stripe.html.erb

@@ -1,5 +1,2 @@
-<%= render 'spree/checkout/payment/v3/form_elements', payment_method: payment_method %>
-
-<%= javascript_include_tag "solidus_stripe/stripe-init.js" %>
-
-<%= render "spree/checkout/payment/v3/elements_js" %>
+<% ActiveSupport::Deprecation.warn 'Partial `spree/checkout/payment/v3/_stripe.html.erb` is deprecated and will be removed soon. Please use partial `spree/checkout/payment/v3/elements`', caller(1) %>
+<%= render 'spree/checkout/payment/v3/elements', payment_method: payment_method, stripe_v3_api: 'elements' %>

data/lib/views/frontend/spree/orders/_stripe_payment_request_button.html.erb

@@ -1,5 +1,5 @@
 <% if current_order.present? && cart_checkout_payment_method.present? %>
-  <div id="stripe-payment-request" class="stripe-payment-request" style="display:none">
+  <div id="stripe-payment-request" class="stripe-payment-request" data-v3-api="payment-request-button" style="display:none">
     <div id="payment-request-button"
       data-stripe-config="<%= cart_checkout_payment_method.stripe_config(current_order).to_json %>"
       data-order-token="<%= current_order.guest_token %>"
@@ -11,82 +11,4 @@
     <div id="card-errors" class='errorExplanation' role="alert" style="display: none">
     </div>
   </div>
-
-  <script src="https://js.stripe.com/v3/"></script>
-  <%= javascript_include_tag "solidus_stripe/stripe-init" %>
-
-  <script>
-    var paymentRequestConfig = SolidusStripe.paymentMethod.config.payment_request;
-    var errorElement = $('#card-errors');
-
-    if (typeof paymentRequestConfig !== 'undefined') {
-      paymentRequestConfig.requestShipping = true;
-
-      var onPrButtonMounted = function(buttonId, success) {
-        var container = document.getElementById('stripe-payment-request');
-
-        if (success) {
-          container.style.display = '';
-        } else {
-          container.style.display = 'none';
-        }
-      };
-
-      var paymentRequest = setUpPaymentRequest(paymentRequestConfig, onPrButtonMounted);
-
-      function handlePayment(result) {
-        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,
-            authenticity_token: authToken
-          })
-        }).then(function(response) {
-          response.json().then(function(json) {
-            handleServerResponse(json, result);
-          })
-        });
-      };
-
-      function stripeTokenHandler(token) {
-        return {
-          order: {
-            payments_attributes: [
-              {
-                payment_method_id: SolidusStripe.paymentMethod.config.id,
-                source_attributes: {
-                  gateway_payment_profile_id: token.id,
-                  last_digits: token.card.last4,
-                  month: token.card.exp_month,
-                  year: token.card.exp_year
-                }
-              }
-            ]
-          }
-        }
-      };
-
-      function submitPayment(payment) {
-        $.ajax({
-          url : $('[data-submit-url]').data('submit-url'),
-          headers: {
-            'X-Spree-Order-Token': $('[data-order-token]').data('order-token')
-          },
-          type : 'PATCH',
-          contentType: 'application/json',
-          data : JSON.stringify(stripeTokenHandler(payment.paymentMethod)),
-          success: function() {
-            window.location = $('[data-complete-url]').data('complete-url');
-          },
-          error: function(xhr,status,error) {
-            showError(xhr.responseJSON.error);
-          }
-        });
-      };
-    }
-  </script>
 <% 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.0'
+  s.add_dependency 'solidus_support', '~> 0.4'
   # ActiveMerchant v1.58 through v1.59 introduced a breaking change
   # to the stripe gateway.
   #

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)
@@ -41,8 +43,7 @@ RSpec.describe "Stripe checkout", type: :feature do
     expect(page).to have_current_path("/checkout/address")
 
     within("#billing") do
-      fill_in "First Name", with: "Han"
-      fill_in "Last Name", with: "Solo"
+      fill_in_name
       fill_in "Street Address", with: "YT-1300"
       fill_in "City", with: "Mos Eisley"
       select "United States of America", from: "Country"
@@ -100,8 +101,7 @@ RSpec.describe "Stripe checkout", type: :feature do
       expect(page).to have_current_path("/checkout/address")
 
       within("#billing") do
-        fill_in "First Name", with: "Han"
-        fill_in "Last Name", with: "Solo"
+        fill_in_name
         fill_in "Street Address", with: "YT-1300"
         fill_in "City", with: "Mos Eisley"
         select "United States of America", from: "Country"
@@ -264,8 +264,7 @@ RSpec.describe "Stripe checkout", type: :feature do
       expect(page).to have_current_path("/checkout/address")
 
       within("#billing") do
-        fill_in "First Name", with: "Han"
-        fill_in "Last Name", with: "Solo"
+        fill_in_name
         fill_in "Street Address", with: "YT-1300"
         fill_in "City", with: "Mos Eisley"
         select "United States of America", from: "Country"
@@ -304,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")
 
@@ -371,60 +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 "First Name", with: "Han"
-        fill_in "Last Name", with: "Solo"
-        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"
@@ -432,9 +488,28 @@ RSpec.describe "Stripe checkout", type: :feature do
 
   def within_3d_secure_modal
     within_frame "__privateStripeFrame10" do
-      within_frame "challengeFrame" do
-        yield
+      within_frame "__stripeJSChallengeFrame" do
+        within_frame "acsFrame" do
+          yield
+        end
       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

data/spec/spec_helper.rb

@@ -19,4 +19,5 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   FactoryBot.find_definitions
   config.use_transactional_fixtures = false
+  config.include SolidusAddressNameHelper, type: :feature
 end

data/spec/support/solidus_address_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Since https://github.com/solidusio/solidus/pull/3524 was merged,
+# we need to verify if we're using the single "Name" field or the
+# previous first/last name combination.
+module SolidusAddressNameHelper
+  def fill_in_name
+    if Spree::Config.preferences[:use_combined_first_and_last_name_in_address]
+      fill_in "Name", with: "Han Solo"
+    else
+      fill_in "First Name", with: "Han"
+      fill_in "Last Name", with: "Solo"
+    end
+  end
+end