spree_gateway 3.4.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0af879a6877329f9bf577c68c4be1c24970bf5b966f29e1b08f2b00f1072c4
-  data.tar.gz: 8cef017de3de845ac500f50c2e2ee8f67be8c620bff0eb646134730dfe5a79b9
+  metadata.gz: 1a46b08f61300dc52d37b71bd1bc6357f9f0d28ce952ed6885c73a1f176d228d
+  data.tar.gz: 6fd7292e92776ad777132602e67b4d9711dac6668fc72105177af6e71a113bb1
 SHA512:
-  metadata.gz: 0e353d5f589c1586bbfb149313f4a222858254415ce6d973a2c371c6ef28780ce07d82723d683d35d4403f2cceb249ff13bff14dee2f6cb9b5e0ca673325d17e
-  data.tar.gz: f8ea33e2365305a84153714ba96fc10c04827aac9140ec36a9c5fe2de6414bfc9742da53cb7b73a7e77c777bf388fe5e73eabc9839a371d367fc1e602afca93a
+  metadata.gz: e2d0959d8367e402e3a7245a80bb00d5d13fb1da36c97d09089750e3f5740ee3231fccaede466f15d37dfe9b524a70b0842886f95a0b24e5ed842baa9b13d284
+  data.tar.gz: facedd67685ede7e306d8e3a46f57f1d07c8f39371ab8b771ab82b92bf509d8c7efe1d6cbe3459c2571c9a2a05abd1c46d491e407aa4473017ae6ba1130b6b44

data/.travis.yml

@@ -5,15 +5,16 @@ language: ruby
 
 addons:
   chrome: stable
+  postgresql: 9.4
 
 env:
   - DB=postgres
   - DB=mysql
 
 gemfile:
-  - gemfiles/spree_3_2.gemfile
+  # - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_6.gemfile
+  - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_master.gemfile
 
 script:
@@ -27,7 +28,16 @@ rvm:
 
 matrix:
     allow_failures:
-          - gemfile: gemfiles/spree_master.gemfile
+      - gemfile: gemfiles/spree_master.gemfile
+    exclude:
+      - rvm: 2.3.7
+        gemfile: gemfiles/spree_master.gemfile
+      - rvm: 2.4.4
+        gemfile: gemfiles/spree_master.gemfile
+      - rvm: 2.5.1
+        gemfile: gemfiles/spree_3_2.gemfile
+      - rvm: 2.4.4
+        gemfile: gemfiles/spree_3_2.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

data/Appraisals

@@ -8,8 +8,9 @@ appraise 'spree-3-5' do
   gem 'rails-controller-testing'
 end
 
-appraise 'spree-3-6' do
-  gem 'spree', '~> 3.6.0'
+appraise 'spree-3-7' do
+  gem 'spree', '~> 3.7.0'
+  gem 'sass-rails'
   gem 'rails-controller-testing'
 end
 

data/README.md

@@ -25,7 +25,7 @@ Supported payment gateways:
 * QuickPay
 * sage Pay
 * SecurePay
-* Spreadly
+* Spreedly
 * Stripe (with Stripe Elements)
 * USAePay
 * Worldpay (previously Cardsave)

data/app/models/spree/apple_pay_order_decorator.rb

@@ -0,0 +1,20 @@
+module Spree
+  module ApplePayOrderDecorator
+    def confirmation_required?
+      return false if paid_with_apple_pay?
+
+      # Little hacky fix for #4117
+      # If this wasn't here, order would transition to address state on confirm failure
+      # because there would be no valid payments any more.
+      Spree::Config[:always_include_confirm_step] ||
+        payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||
+        confirm?
+    end
+
+    def paid_with_apple_pay?
+      payments.valid.any?(&:apple_pay?)
+    end
+  end
+end
+
+Spree::Order.prepend Spree::ApplePayOrderDecorator

data/app/models/spree/{payment_decorator.rb → apple_pay_payment_decorator.rb}

@@ -1,4 +1,4 @@
-module SpreeGateway
+module Spree
   module ApplePayPaymentDecorator
     def apple_pay?
       payment_method.is_a? Spree::Gateway::StripeApplePayGateway
@@ -6,4 +6,4 @@ module SpreeGateway
   end
 end
 
-Spree::Payment.prepend SpreeGateway::ApplePayPaymentDecorator
+Spree::Payment.prepend Spree::ApplePayPaymentDecorator

data/gemfiles/{spree_3_6.gemfile → spree_3_7.gemfile}

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.6.0"
+gem "spree", "~> 3.7.0"
+gem "sass-rails"
 
 gemspec path: "../"

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

@@ -1 +1,75 @@
-<%= render "spree/admin/payments/source_forms/gateway", payment_method: payment_method, previous_cards: payment_method.reusable_sources(@order) %>
+<%= 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>
+  Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+  var mapCC, stripeResponseHandler;
+  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';
+    }
+  };
+  stripeResponseHandler = 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.stripePaymentMethod.find(param_map[response.error.param])
+        errorField.addClass('error');
+        errorField.parent().addClass('has-error');
+      }
+      return $('#stripeError').show();
+    } else {
+      Spree.stripePaymentMethod.find('#card_number<%= payment_method.id %>, #card_expiry<%= payment_method.id %>, #card_code<%= payment_method.id %>').prop("disabled", true);
+      Spree.stripePaymentMethod.find(".ccType").prop("disabled", false);
+      Spree.stripePaymentMethod.find(".ccType").val(mapCC(response.card.brand));
+      token = response['id'];
+      paymentMethodId = Spree.stripePaymentMethod.prop('id').split("_")[2];
+      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][gateway_payment_profile_id]' value='" + token + "'/>");
+      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][last_digits]' value='" + response.card.last4 + "'/>");
+      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][month]' value='" + response.card.exp_month + "'/>");
+      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][year]' value='" + response.card.exp_year + "'/>");
+      return Spree.stripePaymentMethod.parents("form").trigger('submit');
+    }
+  };
+
+  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/spree_gateway.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_gateway'
-  s.version     = '3.4.1'
+  s.version     = '3.6.0'
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 3.1.0', '< 4.0'
+  spree_version = '>= 3.1.0', '< 5.0'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_extension'
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_bot'
+  s.add_development_dependency 'factory_bot', '~> 4.7'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'launchy'
@@ -40,5 +40,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sqlite3', '~> 1.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -19,7 +19,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -146,16 +146,16 @@ dependencies:
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -328,16 +328,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 description: Additional Payment Gateways for Spree Commerce
 email: gems@spreecommerce.com
 executables: []
@@ -353,6 +353,8 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- app/models/spree/apple_pay_order_decorator.rb
+- app/models/spree/apple_pay_payment_decorator.rb
 - app/models/spree/billing_integration.rb
 - app/models/spree/gateway/authorize_net.rb
 - app/models/spree/gateway/authorize_net_cim.rb
@@ -383,8 +385,6 @@ files:
 - app/models/spree/gateway/stripe_gateway.rb
 - app/models/spree/gateway/usa_epay_transaction.rb
 - app/models/spree/gateway/worldpay.rb
-- app/models/spree/order_decorator.rb
-- app/models/spree/payment_decorator.rb
 - config/locales/bg.yml
 - config/locales/de.yml
 - config/locales/en.yml
@@ -397,7 +397,7 @@ files:
 - db/migrate/20131112133401_migrate_stripe_preferences.rb
 - gemfiles/spree_3_2.gemfile
 - gemfiles/spree_3_5.gemfile
-- gemfiles/spree_3_6.gemfile
+- gemfiles/spree_3_7.gemfile
 - gemfiles/spree_master.gemfile
 - lib/controllers/spree/apple_pay_domain_verification_controller.rb
 - lib/generators/spree_gateway/install/install_generator.rb
@@ -464,8 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce

data/app/models/spree/order_decorator.rb

@@ -1,16 +0,0 @@
-Spree::Order.class_eval do
-  def confirmation_required?
-    return false if paid_with_apple_pay?
-
-    Spree::Config[:always_include_confirm_step] ||
-        payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||
-        # Little hacky fix for #4117
-        # If this wasn't here, order would transition to address state on confirm failure
-        # because there would be no valid payments any more.
-    confirm?    
-  end
-
-  def paid_with_apple_pay?
-    payments.valid.any?(&:apple_pay?)
-  end
-end