spree_mollie_gateway 2.1.1.pre.beta → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9075e79867a89e0bf6d44a7516fcaa95879972c3653e70c5ebb6fc6b7d81100b
-  data.tar.gz: 96b871637ff0c8c39ca94f6d5a3c0c4325fc7c97e71dab4d5b6bf908db9675d2
+  metadata.gz: f8ef5b2f0a14dc6aba9f5efb47027ebb3ef06713139df9fff7ba31023a35b80d
+  data.tar.gz: 24fc965a4f1e2d7d5436cb7630c7848dc6e36f75ad49f523c76e9afa3da05d5d
 SHA512:
-  metadata.gz: 7ef7af3b49b3b466f2ee09bed75fdd217ae4dea18983dbe97dd03b45053a6242d9ea812db8447125b13c0030e13814951258a566f8f1a00251461cb6c1820d7d
-  data.tar.gz: a9efa30e6c67f83e89c8bfb573a00983a892406d15ff0cf3a48ff1d072ed2b105fec9c552ad0ec86164848730b9017bdab438b0454cfae33cd66d6afe7b618ab
+  metadata.gz: 228957c8173ada1278620058d29a909bca67056fa3b60b67e1e6ebc9a48cf6089f11e619f05f5bb1452e9ecef262e89f909f81e246412ccf02edff3ad8ce8edb
+  data.tar.gz: f9eb642b1d9325db6230d06be1b77bd25706068c001ef4559fa281f147f40d23a586cb3f0a4323420ccc44a901d520672bd4bced95cf40de38e86091d9ae9d2d

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

@@ -214,8 +214,10 @@ module Spree
         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/order_decorator.rb

@@ -8,7 +8,7 @@ Spree::Order.class_eval do
     updater.update_payment_state
     shipments.each do |shipment|
       shipment.update!(self)
-      shipment.finalize!
+      shipment.finalize! if paid?
     end
 
     updater.update_shipment_state

data/app/views/spree/api/v1/orders/complete.v1.rabl

@@ -0,0 +1,7 @@
+child :available_payment_methods => :payment_methods do
+  attributes :id, :name, :method_type
+
+  node :gateways do |payment_method|
+    payment_method.gateways(order: @order)
+  end
+end

data/lib/spree_mollie_gateway/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 2.1.1.pre.beta
+  version: 2.1.1
 platform: ruby
 authors:
 - Vernon de Goede
@@ -308,6 +308,7 @@ files:
 - app/models/spree/user_decorator.rb
 - app/views/spree/admin/payments/source_forms/_molliegateway.html.erb
 - app/views/spree/admin/payments/source_views/_molliegateway.html.erb
+- app/views/spree/api/v1/orders/complete.v1.rabl
 - app/views/spree/api/v1/orders/payment.v1.rabl
 - app/views/spree/checkout/payment/_molliegateway.html.erb
 - app/views/spree/shared/_payment.html.erb
@@ -343,9 +344,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7