spree_gateway 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad9aebb297d8d3075838334fa28add9b8d814ff823221b9c45dde589e8ef854
-  data.tar.gz: f31ea14dab0e47a5d046b7890c351c257e5eecdd779300efc1251b63527cf6ef
+  metadata.gz: ab0af879a6877329f9bf577c68c4be1c24970bf5b966f29e1b08f2b00f1072c4
+  data.tar.gz: 8cef017de3de845ac500f50c2e2ee8f67be8c620bff0eb646134730dfe5a79b9
 SHA512:
-  metadata.gz: d88b3801880261fb8ad09ca80549f436c2dd71a6c47319dd4a6f22b5bf6b0dd88300028b4c5f859018fa0f9c221ddaf49e22091da5208d8054b48d10ce05d149
-  data.tar.gz: 2be4ce4186492ad74826a4d58b1f5415078457aa380373e592cbd80dc2116443a9d1de04fec68c0d51abe47af5e2486ea1240524fd3e79cea7a2fd9bb1a9182e
+  metadata.gz: 0e353d5f589c1586bbfb149313f4a222858254415ce6d973a2c371c6ef28780ce07d82723d683d35d4403f2cceb249ff13bff14dee2f6cb9b5e0ca673325d17e
+  data.tar.gz: f8ea33e2365305a84153714ba96fc10c04827aac9140ec36a9c5fe2de6414bfc9742da53cb7b73a7e77c777bf388fe5e73eabc9839a371d367fc1e602afca93a

data/app/models/spree/order_decorator.rb

@@ -1,15 +1,16 @@
-module SpreeGateway
-  module ApplePayOrderDecorator
-    def confirmation_required?
-      return false if paid_with_apple_pay?
+Spree::Order.class_eval do
+  def confirmation_required?
+    return false if paid_with_apple_pay?
 
-      super
-    end
+    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
+  def paid_with_apple_pay?
+    payments.valid.any?(&:apple_pay?)
   end
 end
-
-Spree::Order.prepend SpreeGateway::ApplePayOrderDecorator

data/lib/spree_gateway.rb

@@ -1,4 +1,3 @@
 require 'spree_core'
 require 'spree_gateway/engine'
-require 'sass/rails'
 require 'spree_extension'

data/lib/spree_gateway/engine.rb

@@ -37,12 +37,6 @@ module SpreeGateway
     end
 
     def self.activate
-      if SpreeGateway::Engine.frontend_available?
-        Rails.application.config.assets.precompile += [
-          'lib/assets/javascripts/spree/frontend/spree_gateway.js',
-          'lib/assets/stylesheets/spree/frontend/spree_gateway.css',
-        ]
-      end
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/spree/*_decorator*.rb')) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end

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.0'
+  s.version     = '3.4.1'
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'puma'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'sass-rails', '>= 3.2'
+  s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -288,14 +288,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -399,8 +399,6 @@ files:
 - gemfiles/spree_3_5.gemfile
 - gemfiles/spree_3_6.gemfile
 - gemfiles/spree_master.gemfile
-- lib/assets/javascripts/spree/frontend/spree_gateway.js
-- lib/assets/stylesheets/spree/frontend/spree_gateway.css
 - lib/controllers/spree/apple_pay_domain_verification_controller.rb
 - lib/generators/spree_gateway/install/install_generator.rb
 - lib/spree_gateway.rb
@@ -467,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce

data/lib/assets/javascripts/spree/frontend/spree_gateway.js

@@ -1 +0,0 @@
-//= require spree/frontend

data/lib/assets/stylesheets/spree/frontend/spree_gateway.css

@@ -1,3 +0,0 @@
-/*
- *= require spree/frontend
-*/