spree_gateway 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3d2209f70f1e1ef9d3dfbaaf18dd0b738f54822839f5b4e37d4cd301fd8d7a
-  data.tar.gz: da9c496a55da549b4fa7927788c5d1986e0593a150e3d049fa0dda685a07eab0
+  metadata.gz: b832706f129c2b7908c038c47257bad79e6d85461dcbf7f8866d3826758d03be
+  data.tar.gz: a40bd794bba10b1e0d5607d9819f3380c8cdf6e75fff2e349babc89696a25cd4
 SHA512:
-  metadata.gz: 5d60b875f026e7cda13735c783e2ab2c83ff2a03a035827f3be3857b085c299161c69aba30fb3c57757e7dfa3f907afa7159b1fbd06667cabe0fc446820b7179
-  data.tar.gz: bdcc15e27afd248137fbcbec3a0eb01ca5ecbb3f0feb662ae2e3290d777b47417722c341f25d35ce87fc8766d436d05d71e8125e5072a7eb0ffe8b29edc9da4f
+  metadata.gz: 50776548c2b0c3c3e1dcd9558137f8b8967f0147fba3655f37ff9bce37b13209a3c41b550c2f9a9fb84e5cd6add08ab1cc091f8ca99b843c7794572a27cf25e1
+  data.tar.gz: b47c03b664274987c52660429a327596450c8fd6594c511a33596e19d7e776beb2dc46f2f9388eed710603c21050843c7362dad64b0383a3c69b5860d27ef056

data/lib/spree_gateway/version.rb

@@ -1,5 +1,5 @@
 module SpreeGateway
   def self.version
-    '3.7.2'
+    '3.7.3'
   end
 end

data/lib/views/backend/spree/admin/payments/source_forms/_stripe_elements.html.erb

@@ -0,0 +1,79 @@
+<%= render "spree/admin/payments/source_forms/gateway", payment_method: payment_method, previous_cards: payment_method.reusable_sources(@order) %>
+
+<script type="text/javascript" src="https://js.stripe.com/v2/"></script>
+<script type="text/javascript">
+  Stripe.setPublishableKey("<%= payment_method.preferred_publishable_key %>");
+</script>
+
+<script>
+  var mapCC, stripeElementResponseHandler;
+
+  mapCC = function(ccType) {
+    if (ccType === 'MasterCard') {
+      return 'mastercard';
+    } else if (ccType === 'Visa') {
+      return 'visa';
+    } else if (ccType === 'American Express') {
+      return 'amex';
+    } else if (ccType === 'Discover') {
+      return 'discover';
+    } else if (ccType === 'Diners Club') {
+      return 'dinersclub';
+    } else if (ccType === 'JCB') {
+      return 'jcb';
+    }
+  };
+  stripeElementResponseHandler = function(status, response) {
+    var paymentMethodId, token;
+    if (response.error) {
+      $('#stripeError').html(response.error.message);
+      var param_map = {
+        number:    '#card_number',
+        exp_month: '#card_expiry',
+        exp_year:  '#card_expiry',
+        cvc:       '#card_code'
+      }
+      if (response.error.param) {
+        errorField = Spree.stripeElementsPaymentMethod.find(param_map[response.error.param])
+        errorField.addClass('error');
+        errorField.parent().addClass('has-error');
+      }
+      return $('#stripeError').show();
+    } else {
+      Spree.stripeElementsPaymentMethod.find('#card_number<%= payment_method.id %>, #card_expiry<%= payment_method.id %>, #card_code<%= payment_method.id %>').prop("disabled", true);
+      Spree.stripeElementsPaymentMethod.find(".ccType").prop("disabled", false);
+      Spree.stripeElementsPaymentMethod.find(".ccType").val(mapCC(response.card.brand));
+      token = response['id'];
+      paymentMethodId = Spree.stripeElementsPaymentMethod.prop('id').split("_")[2];
+      Spree.stripeElementsPaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][gateway_payment_profile_id]' value='" + token + "'/>");
+      Spree.stripeElementsPaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][last_digits]' value='" + response.card.last4 + "'/>");
+      Spree.stripeElementsPaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][month]' value='" + response.card.exp_month + "'/>");
+      Spree.stripeElementsPaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][year]' value='" + response.card.exp_year + "'/>");
+      return Spree.stripeElementsPaymentMethod.parents("form").trigger('submit');
+    }
+  };
+
+  window.addEventListener('DOMContentLoaded', function() {
+    Spree.stripeElementsPaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+
+    Spree.ready(function() {
+      Spree.stripeElementsPaymentMethod.prepend("<div id='stripeError' class='errorExplanation alert alert-danger' style='display:none'></div>");
+      return $('#new_payment [data-hook=buttons]').click(function() {
+        var expiration, params;
+        $('#stripeError').hide();
+        Spree.stripeElementsPaymentMethod.find('#card_number, #card_expiry, #card_code').removeClass('error');
+        if (Spree.stripeElementsPaymentMethod.is(':visible')) {
+          expiration = $('.cardExpiry:visible').payment('cardExpiryVal');
+          params = $.extend({
+            number: $('.cardNumber:visible').val(),
+            cvc: $('.cardCode:visible').val(),
+            exp_month: expiration.month || 0,
+            exp_year: expiration.year || 0
+          }, Spree.stripeAdditionalInfo);
+          Stripe.card.createToken(params, stripeElementResponseHandler);
+          return false;
+        }
+      });
+    });
+  });
+</script>

data/spec/features/admin/stripe_elements_payment_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe 'Admin Panel Stripe elements payment', type: :feature, :js => true do
+  stub_authorization!
+
+  let!(:country)         { create(:country, :states_required => true) }
+  let!(:state)           { create(:state, :country => country) }
+  let!(:shipping_method) { create(:shipping_method) }
+  let!(:stock_location)  { create(:stock_location) }
+  let!(:mug)             { create(:product, :name => 'RoR Mug') }
+  let!(:zone)            { create(:zone) }
+  let!(:stripe_elements_payment_method) do
+    Spree::Gateway::StripeElementsGateway.create!(
+      :name => 'Stripe Element',
+      :preferred_secret_key => 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
+      :preferred_publishable_key => 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg'
+    )
+  end
+  
+  let!(:order) { OrderWalkthrough.up_to(:payment) }
+  before { visit spree.new_admin_order_payment_path(order.number) }
+
+  it 'can process a valid payment' do
+    fill_in_stripe_payment
+    wait_for { !page.has_current_path?(spree.admin_order_payments_path(order.number)) }
+    
+    expect(page.body).to have_content('Payment has been successfully created!')
+    expect(page).to have_current_path spree.admin_order_payments_path(order.number)
+  end
+  
+  if Spree.version.to_f >= 4.1
+    it 'shows an error with an invalid card name' do
+      fill_in_stripe_payment(true)
+
+      expect(page).to have_content("Credit card Name can't be blank")
+      expect(page).to have_current_path spree.admin_order_payments_path(order.number)
+    end
+  else
+    it 'can proces valid payment with invalid card name' do
+      fill_in_stripe_payment(true)
+      wait_for { !page.has_current_path?(spree.admin_order_payments_path(order.number)) }
+
+      expect(page.body).to have_content('Payment has been successfully created!')
+      expect(page).to have_current_path spree.admin_order_payments_path(order.number)
+    end
+  end
+
+  it 'shows an error with an invalid card number' do
+    fill_in_stripe_payment(false, true)
+    
+    expect(page).to have_content('The card number is not a valid credit card number.')
+    expect(page).to have_current_path spree.new_admin_order_payment_path(order.number)
+  end
+
+  it 'shows an error with an invalid card code' do
+    fill_in_stripe_payment(false, false, true)
+
+    expect(page).to have_content("Your card's security code is invalid.")
+    expect(page).to have_current_path spree.new_admin_order_payment_path(order.number)
+  end
+
+  it 'shows an error with an invalid card expiration' do
+    fill_in_stripe_payment(false, false, false, true)
+
+    if Spree.version.to_f >= 4.1
+      expect(page).to have_content('Credit card Month is not a number')
+      expect(page).to have_content('Credit card Year is not a number')
+      expect(page).to have_current_path spree.admin_order_payments_path(order.number)
+    else
+      expect(page).to have_content("Your card's expiration year is invalid.")
+      expect(page).to have_current_path spree.new_admin_order_payment_path(order.number)
+    end
+  end
+
+  def fill_in_stripe_payment(invalid_name = false, invalid_number = false, invalid_code = false, invalid_expiration = false)
+    fill_in 'Name *', with: invalid_name ? '' : 'Stripe Elements Gateway Payment'
+    fill_in_card_number(invalid_number)
+    fill_in 'Card Code *', with: invalid_code ? '1' : '123'
+    fill_in_card_expiration(invalid_expiration)
+
+    click_button "Update"
+  end
+
+  def fill_in_card_number(invalid_number)
+    number = invalid_number ? '123' : '4242 4242 4242 4242'
+    fill_in_field('Card Number *', '#card_number1', number)
+  end
+
+  def fill_in_card_expiration(invalid_expiration)
+    card_expiry = invalid_expiration ? '01 / ' : "01 / #{Time.current.year + 1}"
+    fill_in_field('Expiration *', '#card_expiry1', card_expiry)
+  end
+
+  def fill_in_field(field_name, field_id, number)
+    until page.find(field_id).value == number
+      fill_in field_name, with: number
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,6 +23,7 @@ require 'spree/testing_support/factories'
 require 'spree/testing_support/order_walkthrough'
 require 'spree/testing_support/preferences'
 require 'spree/testing_support/capybara_ext'
+require 'spree/testing_support/authorization_helpers'
 
 FactoryBot.find_definitions
 

data/spec/support/capybara_helper.rb

@@ -0,0 +1,15 @@
+if Spree.version.to_f < 3.7
+  module CapybaraHelper
+      def wait_for(options = {})
+        default_options = { error: nil, seconds: 5 }.merge(options)
+
+        Selenium::WebDriver::Wait.new(timeout: default_options[:seconds]).until { yield }
+      rescue Selenium::WebDriver::Error::TimeOutError
+        default_options[:error].nil? ? false : raise(default_options[:error])
+      end
+    end
+
+  RSpec.configure do |config|
+    config.include CapybaraHelper, type: :feature
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -410,7 +410,6 @@ files:
 - db/migrate/20130415222802_update_balanced_payment_method_type.rb
 - db/migrate/20131008221012_update_paypal_payment_method_type.rb
 - db/migrate/20131112133401_migrate_stripe_preferences.rb
-- gemfiles/spree_3_2.gemfile
 - gemfiles/spree_3_5.gemfile
 - gemfiles/spree_3_7.gemfile
 - gemfiles/spree_4_0.gemfile
@@ -425,12 +424,14 @@ files:
 - lib/views/backend/spree/admin/log_entries/_stripe.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_stripe.html.erb
+- lib/views/backend/spree/admin/payments/source_forms/_stripe_elements.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe_additional_info.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe_apple_pay.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe_elements.html.erb
 - script/rails
+- spec/features/admin/stripe_elements_payment_spec.rb
 - spec/features/stripe_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
@@ -460,6 +461,7 @@ files:
 - spec/models/spree/order_spec.rb
 - spec/requests/apple_pay_domain_verification.rb
 - spec/spec_helper.rb
+- spec/support/capybara_helper.rb
 - spec/support/wait_for_stripe.rb
 - spree_gateway.gemspec
 homepage: https://spreecommerce.org
@@ -487,6 +489,7 @@ signing_key:
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce
 test_files:
+- spec/features/admin/stripe_elements_payment_spec.rb
 - spec/features/stripe_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
@@ -516,4 +519,5 @@ test_files:
 - spec/models/spree/order_spec.rb
 - spec/requests/apple_pay_domain_verification.rb
 - spec/spec_helper.rb
+- spec/support/capybara_helper.rb
 - spec/support/wait_for_stripe.rb

data/gemfiles/spree_3_2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails-controller-testing"
-gem "spree", "~> 3.2.0"
-
-gemspec path: "../"