spree_mollie_gateway 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c069e4bd370bef6757ea00e6831b4a1505501547407f0ecb9367952ea9b8095
-  data.tar.gz: 1694c20563b96d5825ed22e1e54f6528a8572fce50ed53eb1ab8b8f86ca7c9b4
+  metadata.gz: b16e49392bd3a160b2d95e61bea9144eb0a0dbe6ae90fd1c0538a5c0044fbb2a
+  data.tar.gz: 06a98f8d219b1ac08234e7a47f2b573fd6a36de87007014d6f597532e3aabfd5
 SHA512:
-  metadata.gz: 4e14424f2951612a4397f81d8ad029741b4923eee1295e50c4d169cb71cdf5cc43442609eea6680bc4a6c5dab724c672a97ce3530f170b71a71e624fbc00cb6c
-  data.tar.gz: 277ef361f5467f758e8585ea1f8ebf79d07200c6eec038986bd22db14a9279db4697a6ccb3106a91677dc371ca7f8886b4cbbf86a567de1b60ad786d64441804
+  metadata.gz: b2966a823fec59efdaa8286329e4df43b25a414e51f7b8b38098b4402880c9fd77088056924e1f668e722f7f335ecf06abd32d9e38d8c6f2859a0c523df156fd
+  data.tar.gz: 1b946e26dc6053ac1a8a9662fbfe3cdcc16f189e90fa34f1fb0c7c124400ec7912e052dd8b3696d0d6760892a7867a01a14172d7697e8e1cb82879d169b527ad

data/.travis.yml

@@ -1,10 +1,27 @@
 sudo: false
 dist: trusty
-
 language: ruby
+cache: bundler
 
 rvm:
-  - 2.5.0
+  - 2.3.8
+  - 2.4.4
+  - 2.5.1
+
+gemfile:
+  - gemfiles/spree_3_5.gemfile
+  - gemfiles/spree_3_6.gemfile
+  - gemfiles/spree_3_7.gemfile
+
+# Use legacy bundler (1.x) when using Ruby 2.3.x
+before_install:
+  - if [ "USE_LEGACY_BUNDLER" != "false" ]; then gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true; fi
+  - if [ "USE_LEGACY_BUNDLER" != "false" ]; then gem install bundler -v '< 2'; fi
+
+# Allow failing tests against Spree 3.7.x for now
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/spree_3_7.gemfile
 
 script:
   - bundle exec rake test_app
@@ -16,6 +33,8 @@ deploy:
   on:
     tags: true
     repo: mollie/spree-mollie-gateway
+    rvm: 2.5.1
+    gemfile: gemfiles/spree_3_6.gemfile
   api_key:
     secure: N3+LevY4HZd57cmwfIy6a+E/wX/jCD9Pnqq41/kr6I6iLIMz5xWoU0iDEZEXGhTWmId5O0zxTl2o3w4PiVkH4Onmufv3oLOONexrJeIF5cx/TdWpY36RycA2euVvOGVYMNWGIhslCern4zc8pOTwGpmm8DD8qPTQAV1JPXzbPEiXkxJX0KYm1Vb6v4GTW0q2ghvqY3fzgNaJKVQoEXVrOaXMd/dJDQRjBzbzfF8V2Z779kfOfV5PV/jqheq4bXQYMDBKQUHuTvRMNx0tF4mGgHANp1AXMS4GVbYNyAQNmyd3QnkJHSdKthTTe6nwQoH7oloY4Dbd89fG7Yx7I/kt2Aip3pHMts+4/oVN6QPqe0xe11TeC6yRhi/357I+DCzIk1aRGJ9lkpGQnM+oB54N0yw+htvsd7WE2ac57ixVG0ni39IQciQJ4p3aJzho8z3ui3CNj0p3Y4B4moEIJ3JV3Gg+TEXbzViu9G8j7YIlqw0OpGaaczavfuRSTYkE0QKA4BSqGOG+qsY8ArdvW3KgVohSxHzFR6ubhgT81JvzF6hpS7h7PalOUKA5cr7ha/dB0qL1PYNU6xHQFWiM/ILW5eF6ttQDgzA294U8FoRykG6T9swdVZA5Vd6DZafcu6ofqgyRFGQXzlhq/Hdkocb2W60l5BR4BSq4uoIvmMHXd+8=
 

data/Appraisals

@@ -1,11 +1,13 @@
-appraise 'spree-3-2' do
-  gem 'spree', '~> 3.2.0'
-end
-
 appraise 'spree-3-5' do
+  ENV['USE_LEGACY_BUNDLER'] = 'true'
+
   gem 'spree', '~> 3.5.0'
 end
 
 appraise 'spree-3-6' do
-  gem 'spree', '~> 3.6.1'
+  gem 'spree', '~> 3.6.5'
 end
+
+appraise 'spree-3-7' do
+  gem 'spree', '~> 3.7.2'
+end

data/CONTRIBUTING.md

@@ -1,7 +1,5 @@
 # Contributing
 
-In the spirit of [free software][1], **everyone** is encouraged to help improve this project.
-
 Here are some ways *you* can contribute:
 
 * by using prerelease versions
@@ -25,4 +23,4 @@ Starting point:
 * Submit your pull request
 
 [1]: http://www.fsf.org/licensing/essays/free-sw.html
-[2]: https://github.com/mollie/spree-mollie-gateway/issues
+[2]: https://github.com/mollie/spree-mollie-gateway/issues

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'mollie-api-ruby', '~> 4.1.3'
+gem 'mollie-api-ruby', '~> 4.2.0'
 
 # Specify your gem's dependencies in spree_mollie_gateway.gemspec
 gemspec

data/README.md

@@ -37,7 +37,7 @@ Please go to the [signup page](https://www.mollie.com/signup) to create a new Mo
 * Allow returning customers to <a href="https://www.mollie.com/en/features/checkout" title="One-click payments">use their previous payment details</a> and pay instantly.
 
 ## Requirements
-- Spree 3.3.x or newer.  
+- Spree 3.5 or newer.  
 
 ## Installation
 
@@ -97,7 +97,6 @@ Contact: [www.mollie.com](https://www.mollie.com) — info@mollie.com — +31 20
 + [More information about SOFORT Banking via Mollie](https://www.mollie.com/en/payments/sofort/)
 + [More information about SEPA Bank transfer via Mollie](https://www.mollie.com/en/payments/bank-transfer/)
 + [More information about SEPA Direct debit via Mollie](https://www.mollie.com/en/payments/direct-debit/)
-+ [More information about Bitcoin via Mollie](https://www.mollie.com/en/payments/bitcoin/)
 + [More information about PayPal via Mollie](https://www.mollie.com/en/payments/paypal/)
 + [More information about KBC/CBC Payment Button via Mollie](https://www.mollie.com/en/payments/kbc-cbc/)
 + [More information about Belfius Direct Net via Mollie](https://www.mollie.com/en/payments/belfius)

data/app/models/spree/mollie/order_serializer.rb

@@ -97,7 +97,7 @@ module Spree
 
       def serialize_address(address)
         {
-          streetAndNumber: address[:address1],
+          streetAndNumber: [address[:address1], address[:address2]].join(" "),
           city: address[:city],
           postalCode: address[:zip],
           country: address[:country],

data/app/models/spree/mollie/payment_state_updater.rb

@@ -28,8 +28,12 @@ module Spree
           @spree_payment.source.update(status: @spree_payment.state)
         else
           MollieLogger.debug("Unhandled Mollie payment state received: #{@mollie_order.status}. Therefore we did not update the payment state.")
-          @spree_payment.order.update_attributes(state: 'payment', completed_at: nil)
+          unless @spree_payment.order.paid_or_authorized?
+            @spree_payment.order.update_attributes(state: 'payment', completed_at: nil)
+          end
         end
+
+        @spree_payment.order.update_with_updater!
       end
 
       private
@@ -48,7 +52,7 @@ module Spree
 
       def transition_to_failed!
         @spree_payment.failure! unless @spree_payment.failed?
-        @spree_payment.order.update_attributes(state: 'payment', completed_at: nil)
+        @spree_payment.order.update_attributes(state: 'payment', completed_at: nil) unless @spree_payment.order.paid_or_authorized?
         MollieLogger.debug("Mollie order is #{@mollie_order.status} and will be marked as failed")
       end
 

data/app/models/spree/mollie_payment_source.rb

@@ -27,8 +27,6 @@ module Spree
         'SOFORT Banking'
       when ::Mollie::Method::BANKTRANSFER then
         'Bank transfer'
-      when ::Mollie::Method::BITCOIN then
-        'Bitcoin'
       when ::Mollie::Method::PAYPAL then
         'PayPal'
       when ::Mollie::Method::KBC then
@@ -51,8 +49,11 @@ module Spree
         'Klarna Slice it'
       when ::Mollie::Method::KLARNAPAYLATER then
         'Klarna Pay Later'
+      # As of May 1st 2019, Bitcoin is no longer supported.
+      when 'bitcoin' then
+        'Bitcoin'
       else
-        'Mollie'
+        'Mollie (Unknown method)'
       end
     end
 

data/app/models/spree/order_decorator.rb

@@ -26,10 +26,26 @@ Spree::Order.class_eval do
     consider_risk
   end
 
+  def is_paid_with_mollie?
+    payments.collect(&:payment_method).any? {|pm| pm.type == 'Spree::Gateway::MollieGateway'}
+  end
+
+  def send_confirmation_email!
+    if !confirmation_delivered? && (paid? || authorized?)
+      deliver_order_confirmation_email
+    end
+  end
+
   def mollie_order
     Spree::Mollie::Order.new(self)
   end
 
+  def successful_payment
+    paid? || payments.any? {|p| p.after_pay_method? && p.authorized?}
+  end
+
+  alias paid_or_authorized? successful_payment
+
   def authorized?
     payments.last.authorized?
   end

data/docs/api/methods.md

@@ -285,21 +285,6 @@ Content-Type: application/json; charset=utf-8
       }
     }
   },
-  {
-    "resource": "method",
-    "id": "bitcoin",
-    "description": "Bitcoin",
-    "image": {
-      "size1x": "https://www.mollie.com/images/payscreen/methods/bitcoin.png",
-      "size2x": "https://www.mollie.com/images/payscreen/methods/bitcoin%402x.png"
-    },
-    "_links": {
-      "self": {
-        "href": "https://api.mollie.com/v2/methods/bitcoin",
-        "type": "application/hal+json"
-      }
-    }
-  }
 ]
 
 ```

data/gemfiles/spree_3_5.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'mollie-api-ruby', '~> 4.1.1'
-gem 'spree', '~> 3.5.0'
+gem "mollie-api-ruby", "~> 4.2.0"
+gem "spree", "~> 3.5.0"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/spree_3_6.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'mollie-api-ruby', '~> 4.1.1'
-gem 'spree', '~> 3.6.1'
+gem "mollie-api-ruby", "~> 4.2.0"
+gem "spree", "~> 3.6.5"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/spree_3_7.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mollie-api-ruby", "~> 4.2.0"
+gem "spree", "~> 3.7.2"
+
+gemspec path: "../"

data/lib/spree_mollie_gateway/version.rb

@@ -1,3 +1,3 @@
 module SpreeMollieGateway
-  VERSION = '3.0.4'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/spree_mollie_gateway.gemspec

@@ -3,16 +3,16 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'spree_mollie_gateway/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'spree_mollie_gateway'
-  spec.version       = SpreeMollieGateway::VERSION
-  spec.authors       = ['Vernon de Goede']
-  spec.email         = ['vernon@mollie.com']
+  spec.name = 'spree_mollie_gateway'
+  spec.version = SpreeMollieGateway::VERSION
+  spec.authors = ['Vernon de Goede']
+  spec.email = ['vernon@mollie.com']
 
-  spec.summary       = 'Mollie payments for Spree Commerce.'
-  spec.description   = 'Mollie payment gateway for Spree Commerce.'
-  spec.homepage      = 'https://www.mollie.com'
+  spec.summary = 'Mollie payments for Spree Commerce.'
+  spec.description = 'Mollie payment gateway for Spree Commerce.'
+  spec.homepage = 'https://www.mollie.com'
 
-  spec.licenses      = ['BSD']
+  spec.licenses = ['BSD']
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -26,15 +26,16 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) {|f| File.basename(f)}
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.3.8'
 
-  spree_version = '>= 3.1.0'
+  spree_version = '>= 3.5.0', '< 5.0'
   spec.add_dependency 'spree_backend', spree_version
   spec.add_dependency 'spree_core', spree_version
-  spec.add_dependency 'spree_extension'
   spec.add_dependency 'spree_frontend', spree_version
+  spec.add_dependency 'spree_extension'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '~> 1.16'
@@ -52,5 +53,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
 
-  spec.add_runtime_dependency 'mollie-api-ruby', '~> 4.1.3'
+  spec.add_runtime_dependency 'mollie-api-ruby', '~> 4.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_backend
@@ -16,56 +16,74 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: spree_extension
+  name: spree_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: spree_frontend
+  name: spree_extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +300,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.2.0
 description: Mollie payment gateway for Spree Commerce.
 email:
 - vernon@mollie.com
@@ -346,14 +364,9 @@ files:
 - docs/api/readme.md
 - docs/debugging.md
 - docs/migration_v1_x.md
-- gemfiles/spree_3_1.gemfile
-- gemfiles/spree_3_1.gemfile.lock
-- gemfiles/spree_3_2.gemfile
-- gemfiles/spree_3_2.gemfile.lock
 - gemfiles/spree_3_5.gemfile
-- gemfiles/spree_3_5.gemfile.lock
 - gemfiles/spree_3_6.gemfile
-- gemfiles/spree_3_6.gemfile.lock
+- gemfiles/spree_3_7.gemfile
 - lib/generators/spree_mollie_gateway/install/install_generator.rb
 - lib/spree_mollie_gateway.rb
 - lib/spree_mollie_gateway/engine.rb
@@ -373,14 +386,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mollie payments for Spree Commerce.