spree_mollie_gateway 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6749beb7795bf09ac3127a8cb795b6a614441ca70713d4ff253df8907c5a46
-  data.tar.gz: e104df4591e9cdd0f89e34b8922c2f1c49aafa694a7aa6564b5da3dad0764fbe
+  metadata.gz: 32d7000b5df3e9c1692a377c76a02eb027f5a23c327caab3501ed33738e53b41
+  data.tar.gz: 264ac25b2cabd240940ef786fdf1ce073ba5123f474a404317c85d5e34ec3413
 SHA512:
-  metadata.gz: 71ddd793c5e0391bfce434d18b6bb2f91cbd56daa9aa33882d9641b344a527096f8fa82ef578643c91f899cd05a9fd76bbc15bb0cb27708fe0211c0e6221554c
-  data.tar.gz: 35ba15747c8c489ec7a7452d08b2343c790a4a4cc171a1ce5481f34be6f57b0584367cbcc39bbeaa349da4da27ddd40e5cab50bac523eb8d3dfc2d422acb24e0
+  metadata.gz: b05f422beb1c93fd37666ee8623da192ad579ea47a4c4d4d17ab14a7c8e732f9732b05e469c0ce777eabfef681558aff500b8f1fb980fc7070492268a16fad6d
+  data.tar.gz: feafb23e5e1071e06c5136685192f979da76749b5e780dfd3388f099188867cd3f186d06950a2291cb4c53a94d90c72897d9c36fcecc4be154096fa805613fbf

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-- 2.2.7
+- 2.3.0
 before_install: gem install bundler -v 1.16.1
 deploy:
   provider: rubygems

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
@@ -168,15 +168,22 @@ module Spree
     end
 
     def cancel(transaction_id)
+      MollieLogger.debug("Starting cancelation for #{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')
+        if mollie_payment.cancelable?
+          mollie_payment.delete(transaction_id)
+          ActiveMerchant::Billing::Response.new(true, 'Mollie payment has been cancelled')
+        else
+          MollieLogger.debug("Molie payment #{transaction_id} is not cancelable. Skipping any further updates.")
+          ActiveMerchant::Billing::Response.new(true, 'Mollie payment has not been cancelled because it is not cancelable')
+        end
       rescue Mollie::Exception => e
-        MollieLogger.debug("Payment could not be canceled #{transaction_id}: #{e.message}")
+        MollieLogger.debug("Payment #{transaction_id} could not be canceled: #{e.message}")
         ActiveMerchant::Billing::Response.new(false, 'Payment cancellation unsuccessful')
       end
     end
@@ -215,23 +222,35 @@ module Spree
           api_key: get_preference(:api_key)
       )
 
-      MollieLogger.debug("Updating order state for payment. Payment has state #{mollie_payment.status}")
-
+      MollieLogger.debug("Checking Mollie payment status. Mollie payment has status #{mollie_payment.status}")
       update_by_mollie_status!(mollie_payment, payment)
     end
 
     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'
+        # If Mollie payment is already paid and refunded amount is more than 0, don't update payment
+        if mollie_payment.paid? && mollie_payment.amount_refunded.value > 0
+          MollieLogger.debug('Payment is refunded. Not updating the payment status within Spree.')
+          return
+        end
+
+        if payment.completed?
+          MollieLogger.debug('Payment is already completed. Not updating the payment status within Spree.')
+          return
+        end
+
+        # If order is already paid for, don't mark it as complete again.
+        payment.complete!
+        payment.order.finalize!
+        payment.order.update_attributes(:state => 'complete', :completed_at => Time.now)
+        MollieLogger.debug('Payment is paid and will transition to completed. Order will be finalized.')
+      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/lib/spree_mollie_gateway/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core