spree_mollie_gateway 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8ef5b2f0a14dc6aba9f5efb47027ebb3ef06713139df9fff7ba31023a35b80d
-  data.tar.gz: 24fc965a4f1e2d7d5436cb7630c7848dc6e36f75ad49f523c76e9afa3da05d5d
+  metadata.gz: 9f6749beb7795bf09ac3127a8cb795b6a614441ca70713d4ff253df8907c5a46
+  data.tar.gz: e104df4591e9cdd0f89e34b8922c2f1c49aafa694a7aa6564b5da3dad0764fbe
 SHA512:
-  metadata.gz: 228957c8173ada1278620058d29a909bca67056fa3b60b67e1e6ebc9a48cf6089f11e619f05f5bb1452e9ecef262e89f909f81e246412ccf02edff3ad8ce8edb
-  data.tar.gz: f9eb642b1d9325db6230d06be1b77bd25706068c001ef4559fa281f147f40d23a586cb3f0a4323420ccc44a901d520672bd4bced95cf40de38e86091d9ae9d2d
+  metadata.gz: 71ddd793c5e0391bfce434d18b6bb2f91cbd56daa9aa33882d9641b344a527096f8fa82ef578643c91f899cd05a9fd76bbc15bb0cb27708fe0211c0e6221554c
+  data.tar.gz: 35ba15747c8c489ec7a7452d08b2343c790a4a4cc171a1ce5481f34be6f57b0584367cbcc39bbeaa349da4da27ddd40e5cab50bac523eb8d3dfc2d422acb24e0

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.0.0'
+gem 'mollie-api-ruby', '~> 4.1.1'
 
 # Specify your gem's dependencies in spree_mollie_gateway.gemspec
 gemspec

data/app/models/spree/gateway/mollie_gateway.rb

@@ -75,7 +75,7 @@ module Spree
       customer = Mollie::Customer.create(
           email: user.email,
           api_key: get_preference(:api_key),
-      )
+          )
       MollieLogger.debug("Created a Mollie Customer for Spree user with ID #{customer.id}")
       customer
     end
@@ -167,6 +167,20 @@ module Spree
       end
     end
 
+    def cancel(transaction_id)
+      begin
+        mollie_payment = ::Mollie::Payment.get(
+            transaction_id,
+            api_key: get_preference(:api_key)
+        )
+        mollie_payment.delete(transaction_id) if mollie_payment.cancelable?
+        ActiveMerchant::Billing::Response.new(true, 'Payment canceled successful')
+      rescue Mollie::Exception => e
+        MollieLogger.debug("Payment could not be canceled #{transaction_id}: #{e.message}")
+        ActiveMerchant::Billing::Response.new(false, 'Payment cancellation unsuccessful')
+      end
+    end
+
     def available_methods(params = nil)
       method_params = {
           api_key: get_preference(:api_key),
@@ -208,16 +222,16 @@ module Spree
 
     def update_by_mollie_status!(mollie_payment, payment)
       case mollie_payment.status
-      when 'paid'
-        payment.complete! unless payment.completed?
-        payment.order.finalize!
-        payment.order.update_attributes(:state => 'complete', :completed_at => Time.now)
-      when 'canceled', 'expired', 'failed'
-        payment.failure! unless payment.failed?
-        payment.order.update_attributes(:state => 'payment', :completed_at => nil)
-      else
-        MollieLogger.debug('Unhandled Mollie payment state received. Therefore we did not update the payment state.')
-        payment.order.update_attributes(state: 'payment', completed_at: nil)
+        when 'paid'
+          payment.complete! unless payment.completed?
+          payment.order.finalize!
+          payment.order.update_attributes(:state => 'complete', :completed_at => Time.now)
+        when 'canceled', 'expired', 'failed'
+          payment.failure! unless payment.failed?
+          payment.order.update_attributes(:state => 'payment', :completed_at => nil)
+        else
+          MollieLogger.debug('Unhandled Mollie payment state received. Therefore we did not update the payment state.')
+          payment.order.update_attributes(state: 'payment', completed_at: nil)
       end
 
       payment.source.update(status: payment.state)

data/app/models/spree/payment/processing_decorator.rb

@@ -7,8 +7,26 @@ Spree::Payment::Processing.module_eval do
     end
   end
 
+  def cancel!
+    if payment_method.is_a? Spree::Gateway::MollieGateway
+      cancel_with_mollie
+    else
+      cancel_with_spree
+    end
+  end
+
   private
 
+  def cancel_with_spree
+    response = payment_method.cancel(response_code)
+    handle_response(response, :void, :failure)
+  end
+
+  def cancel_with_mollie
+    response = payment_method.cancel(transaction_id)
+    handle_response(response, :void, :failure)
+  end
+
   def process_with_spree
     if payment_method && payment_method.auto_capture?
       purchase!

data/lib/spree_mollie_gateway/version.rb

@@ -1,3 +1,3 @@
 module SpreeMollieGateway
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spree_mollie_gateway.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spree_version = '>= 3.6.3', '< 4.0'
+  spree_version = '~> 3.6.3'
   spec.add_dependency 'spree_core', spree_version
   spec.add_dependency 'spree_backend', spree_version
   spec.add_dependency 'spree_frontend', spree_version
@@ -50,5 +50,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coffee-rails'
   spec.add_development_dependency 'database_cleaner'
 
-  spec.add_runtime_dependency 'mollie-api-ruby', '~> 4.0.0'
+  spec.add_runtime_dependency 'mollie-api-ruby', '~> 4.1.1'
 end

metadata

@@ -1,75 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: spree_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -272,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.1
 description: Mollie payment gateway for Spree Commerce.
 email:
 - vernon@mollie.com