spree_gateway 3.6.7 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863b9b04dd9189173d0382f43bae9b7e5860e6140b1ecf07fb5b818c11ca3178
-  data.tar.gz: fced4c71837f469c500da6b733d902c9f0dd13a1b6d97a29615d8b9c0bfd9956
+  metadata.gz: 5bf7f502de95f41992227df814d11998e447bfe6f302d5654e09f99240b023db
+  data.tar.gz: 38e633ffafb01bb31934dcdec4df4a9c6444f1c728e1f1d41a623f2ec9514689
 SHA512:
-  metadata.gz: a6d568542a74317a781ac77c4c059aea3550370932ea9a0966235fa1d87836512975a59a08b092250a9d9b328ad024b9b34c8854ea8d25924b0b996987b38ff1
-  data.tar.gz: 0acdd438af4eae4f5837d4c4db21ee345e13b49a6ed41e98b1e79484f1f75ecf38be69f39d0c4532993f0ae32e3f5b642398ba46e428c811af4c747266bb9362
+  metadata.gz: 32dfea7c11e4a71f89a75bd092667c381d48b03611e857a86e3c11930100132c0f8d84a44288883d04c96a88557fe02aad27ce43600db56b93c3967ba2021d98
+  data.tar.gz: 9a1f8074d43f5feee5b128c8204edb8916f4eb975a0e3463f76e28e5d1a6825b3f79ba261c470a2039c3d1066fe0aa0337e0ea9ffde7e4c96111244316d79828

data/lib/spree_gateway/version.rb

@@ -1,5 +1,5 @@
 module SpreeGateway
   def self.version
-    '3.6.7'
+    '3.7.0'
   end
 end

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

@@ -6,8 +6,8 @@
 </script>
 
 <script>
-  Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
   var mapCC, stripeResponseHandler;
+
   mapCC = function(ccType) {
     if (ccType === 'MasterCard') {
       return 'mastercard';
@@ -53,23 +53,27 @@
     }
   };
 
-  Spree.ready(function() {
-    Spree.stripePaymentMethod.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.stripePaymentMethod.find('#card_number, #card_expiry, #card_code').removeClass('error');
-      if (Spree.stripePaymentMethod.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, stripeResponseHandler);
-        return false;
-      }
+  window.addEventListener('DOMContentLoaded', function() {
+    Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+
+    Spree.ready(function() {
+      Spree.stripePaymentMethod.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.stripePaymentMethod.find('#card_number, #card_expiry, #card_code').removeClass('error');
+        if (Spree.stripePaymentMethod.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, stripeResponseHandler);
+          return false;
+        }
+      });
     });
   });
 </script>

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

@@ -6,8 +6,6 @@
 </script>
 
 <script>
-  Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
-
   var mapCC, stripeResponseHandler;
 
   mapCC = function(ccType) {
@@ -57,23 +55,27 @@
     }
   };
 
-  Spree.ready(function() {
-    Spree.stripePaymentMethod.prepend("<div id='stripeError' class='errorExplanation alert alert-danger' style='display:none'></div>");
-    return $('#checkout_form_payment [data-hook=buttons]').click(function() {
-      var expiration, params;
-      $('#stripeError').hide();
-      Spree.stripePaymentMethod.find('#card_number, #card_expiry, #card_code').removeClass('error');
-      if (Spree.stripePaymentMethod.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, stripeResponseHandler);
-        return false;
-      }
+  window.addEventListener('DOMContentLoaded', function() {
+    Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+
+    Spree.ready(function() {
+      Spree.stripePaymentMethod.prepend("<div id='stripeError' class='errorExplanation alert alert-danger' style='display:none'></div>");
+      return $('#checkout_form_payment [data-hook=buttons]').click(function() {
+        var expiration, params;
+        $('#stripeError').hide();
+        Spree.stripePaymentMethod.find('#card_number, #card_expiry, #card_code').removeClass('error');
+        if (Spree.stripePaymentMethod.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, stripeResponseHandler);
+          return false;
+        }
+      });
     });
   });
 </script>

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

@@ -1,14 +1,16 @@
 <% bill_address ||= @order.bill_address %>
 <%- if @order.has_checkout_step?('address') -%>
   <script>
-    Spree.stripeAdditionalInfo = {
-      name: "<%= bill_address.full_name %>",
-      address_line1: "<%= bill_address.address1 %>",
-      address_line2: "<%= bill_address.address2 %>",
-      address_city: "<%= bill_address.city %>",
-      address_state: "<%= bill_address.state_text %>",
-      address_zip: "<%= bill_address.zipcode %>",
-      address_country: "<%= bill_address.country %>"
-    }
+    window.addEventListener('DOMContentLoaded', function() {
+      Spree.stripeAdditionalInfo = {
+        name: "<%= bill_address.full_name %>",
+        address_line1: "<%= bill_address.address1 %>",
+        address_line2: "<%= bill_address.address2 %>",
+        address_city: "<%= bill_address.city %>",
+        address_state: "<%= bill_address.state_text %>",
+        address_zip: "<%= bill_address.zipcode %>",
+        address_country: "<%= bill_address.country %>"
+      };
+    });
   </script>
 <%- end -%>

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

@@ -7,7 +7,6 @@
 <script type="text/javascript" src="https://js.stripe.com/v3/"></script>
 
 <script>
-  Spree.stripeApplePayPaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
   var stripeApplePay = Stripe("<%= payment_method.preferred_publishable_key %>");
   var elements = stripeApplePay.elements();
 
@@ -82,14 +81,18 @@
     form.submit();
   });
 
-  Spree.ready(function() {
-    Spree.stripeApplePayPaymentMethod.prepend("<div id='stripeApplePayError' class='errorExplanation alert alert-danger' style='display:none'></div>");
-    var form = document.getElementById('checkout_form_payment');
-    form.addEventListener('submit', function(e) {
-      if (Spree.stripeApplePayPaymentMethod.is(':visible')) {
-        $('#stripeApplePayError').hide();
-        e.preventDefault();
-      }
+  window.addEventListener('DOMContentLoaded', function() {
+    Spree.stripeApplePayPaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+
+    Spree.ready(function() {
+      Spree.stripeApplePayPaymentMethod.prepend("<div id='stripeApplePayError' class='errorExplanation alert alert-danger' style='display:none'></div>");
+      var form = document.getElementById('checkout_form_payment');
+      form.addEventListener('submit', function(e) {
+        if (Spree.stripeApplePayPaymentMethod.is(':visible')) {
+          $('#stripeApplePayError').hide();
+          e.preventDefault();
+        }
+      });
     });
   });
 </script>

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

@@ -24,7 +24,6 @@
 <script type="text/javascript" src="https://js.stripe.com/v3/"></script>
 
 <script>
-  Spree.stripeElementsPaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
   var stripeElements = Stripe("<%= payment_method.preferred_publishable_key %>");
   var elements = stripeElements.elements();
 
@@ -55,6 +54,22 @@
   });
   card.mount('#card-element');
 
+  window.addEventListener('DOMContentLoaded', function() {
+    Spree.stripeElementsPaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+
+    Spree.ready(function() {
+      Spree.stripeElementsPaymentMethod.prepend("<div id='stripeElementsError' class='errorExplanation alert alert-danger' style='display:none'></div>");
+      var form = document.getElementById('checkout_form_payment');
+      form.addEventListener('submit', function(e) {
+        if (Spree.stripeElementsPaymentMethod.is(':visible')) {
+          $('#stripeElementsError').hide();
+          e.preventDefault();
+          createStripeElementsToken();
+        }
+      });
+    });
+  });
+
   function addCreditCardFieldToForm(form, name, value) {
     var hiddenInput = document.createElement('input');
 
@@ -87,18 +102,7 @@
       }
     });
   };
-
-  Spree.ready(function() {
-    Spree.stripeElementsPaymentMethod.prepend("<div id='stripeElementsError' class='errorExplanation alert alert-danger' style='display:none'></div>");
-    var form = document.getElementById('checkout_form_payment');
-    form.addEventListener('submit', function(e) {
-      if (Spree.stripeElementsPaymentMethod.is(':visible')) {
-        $('#stripeElementsError').hide();
-        e.preventDefault();
-        createStripeElementsToken();
-      }
-    });
-  });
+  
 </script>
 
 <%= render 'spree/checkout/payment/stripe_additional_info' %>

data/spec/features/stripe_checkout_spec.rb

@@ -29,6 +29,7 @@ describe "Stripe checkout", type: :feature do
     Spree::CheckoutController.any_instance.stub(:current_order => order)
     Spree::CheckoutController.any_instance.stub(:try_spree_current_user => user)
     Spree::CheckoutController.any_instance.stub(:skip_state_validation? => true)
+    Spree::OrdersController.any_instance.stub(try_spree_current_user: user)
 
     # Capybara should wait up to 10 seconds for async. changes to be applied
     Capybara.default_max_wait_time = 10
@@ -42,34 +43,38 @@ describe "Stripe checkout", type: :feature do
 
   # This will pass the CC data to the server and the StripeGateway class handles it
   it "can process a valid payment (without JS)" do
-    fill_in "Card Number", :with => "4242 4242 4242 4242"
-    fill_in "Card Code", :with => "123"
-    fill_in "Expiration", :with => "01 / #{Time.now.year + 1}"
+    fill_in 'card_number', with: '4242 4242 4242 4242'
+    fill_in 'card_code', with: '123'
+    fill_in 'card_expiry', with: "01 / #{Time.current.year + 1}"
     click_button "Save and Continue"
     expect(page.current_url).to include("/checkout/confirm")
     click_button "Place Order"
-    expect(page).to have_content("Your order has been processed successfully")
+    order = Spree::Order.complete.last
+    expect(page.current_url).to include("/orders/#{order.number}")
+    expect(page).to have_content(order.number)
   end
 
   # This will fetch a token from Stripe.com and then pass that to the webserver.
   # The server then processes the payment using that token.
   it "can process a valid payment (with JS)", :js => true do
-    fill_in "Card Number", :with => "4242 4242 4242 4242"
+    fill_in 'card_number', with: '4242 4242 4242 4242'
     # Otherwise ccType field does not get updated correctly
     page.execute_script("$('.cardNumber').trigger('change')")
-    fill_in "Card Code", :with => "123"
-    fill_in "Expiration", :with => "01 / #{Time.now.year + 1}"
+    fill_in 'card_code', with: '123'
+    fill_in 'card_expiry', with: "01 / #{Time.current.year + 1}"
     click_button "Save and Continue"
     wait_for_stripe # Wait for Stripe API to return + form to submit
     expect(page).to have_css('#checkout_form_confirm')
     expect(page.current_url).to include("/checkout/confirm")
     click_button "Place Order"
-    expect(page).to have_content("Your order has been processed successfully")
+    order = Spree::Order.complete.last
+    expect(page.current_url).to include("/orders/#{order.number}")
+    expect(page).to have_content(order.number)
   end
 
   it "shows an error with an invalid credit card number", :js => true do
     # Card number is NOT valid. Fails Luhn checksum
-    fill_in "Card Number", :with => "4242 4242 4242 4249"
+    fill_in 'card_number', with: '4242 4242 4242 4249'
     click_button "Save and Continue"
     wait_for_stripe
     expect(page).to have_content("Your card number is incorrect")
@@ -77,9 +82,9 @@ describe "Stripe checkout", type: :feature do
   end
 
   it "shows an error with invalid security fields", :js => true do
-    fill_in "Card Number", :with => "4242 4242 4242 4242"
-    fill_in "Expiration", :with => "01 / #{Time.now.year + 1}"
-    fill_in "Card Code", :with => "99"
+    fill_in 'card_number', with: '4242 4242 4242 4242'
+    fill_in 'card_expiry', with: "01 / #{Time.current.year + 1}"
+    fill_in 'card_code', with: '99'
     click_button "Save and Continue"
     wait_for_stripe
     expect(page).to have_content("Your card's security code is invalid.")
@@ -87,9 +92,9 @@ describe "Stripe checkout", type: :feature do
   end
 
   it "shows an error with invalid expiry month field", :js => true do
-    fill_in "Card Number", :with => "4242 4242 4242 4242"
-    fill_in "Expiration", :with => "00 / #{Time.now.year + 1}"
-    fill_in "Card Code", :with => "123"
+    fill_in 'card_number', with: '4242 4242 4242 4242'
+    fill_in 'card_expiry', :with => "00 / #{Time.now.year + 1}"
+    fill_in 'card_code', with: '123'
     click_button "Save and Continue"
     wait_for_stripe
     expect(page).to have_content("Your card's expiration month is invalid.")
@@ -97,9 +102,9 @@ describe "Stripe checkout", type: :feature do
   end
 
   it "shows an error with invalid expiry year field", :js => true do
-    fill_in "Card Number", :with => "4242 4242 4242 4242"
-    fill_in "Expiration", :with => "12 / "
-    fill_in "Card Code", :with => "123"
+    fill_in 'card_number', with: '4242 4242 4242 4242'
+    fill_in 'card_expiry', with: '12 / '
+    fill_in 'card_code', with: '123'
     click_button "Save and Continue"
     wait_for_stripe
     expect(page).to have_content("Your card's expiration year is invalid.")

data/spec/spec_helper.rb

@@ -48,6 +48,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
     DatabaseCleaner.start
     reset_spree_preferences
+    create(:store)
   end
 
   config.after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.7.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core