spree_mollie_gateway 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7670b2cbf5bea5087da07d54d0ca3136e0d64429bf83afeb09030c1fe4533c0f
-  data.tar.gz: 4524d823f88e2c1de00c6fe57988f5e9b6d505dfa7bd3d8acdc126e5d527f7f7
+  metadata.gz: 0d99dc1316999eb3638366a484c34ac0a957c2c60cc0e5a83c458529d6c5e047
+  data.tar.gz: 250ebd469c3ad54569871f72ae750be6c0eefaa531b586d80b42c15758bb68eb
 SHA512:
-  metadata.gz: 2036af6da07847e7816c807163a3c61a1f6d755f6538e697ddaea6ea6db856028f4945aee0d7dafdcc25064e99991ee7f82e5e9a6f14a65854acf5f34851d9a3
-  data.tar.gz: a6273f54097c37d9e14d9ef43121046ea3c25a55e1b9e25a75b3dcc8356c3c8a1330117621466788344c423f53457b1c133c07410a145c8a483d5da0c975d543
+  metadata.gz: 65a3d37600816a59d2d5f6e01843fb637ce8fefe015773108c754fc7f6d8d5091207105859843249588bf70a6e5c30749fafc6af8caf9ee5a44c8ef333f3ff14
+  data.tar.gz: 1a6de43b2782619dacb83a8f5d5e071b377a6126523c9c631202bef29a0ca130fb3b03d3b3d9460aba5f8d52b8040153433bbd170bc47190d8eaf1792c4638fe

data/app/models/spree/shipment_decorator.rb

@@ -6,7 +6,10 @@ module Spree
 
     def after_ship
       super
-      create_mollie_shipment!
+
+      if order.is_paid_with_mollie?
+        create_mollie_shipment!
+      end
     end
 
     def create_mollie_shipment!

data/app/models/spree/user_decorator.rb

@@ -1,20 +1,21 @@
 module Spree::UserDecorator
 
   def self.prepended(base)
-    base.after_create :create_mollie_customer
+    base.after_commit :ensure_mollie_customer, on: %i[create update]
   end
 
+  def ensure_mollie_customer
+    return if try(:mollie_customer_id).present?
 
-  def create_mollie_customer
     # Don't create Mollie customers if spree_auth_devise is not installed.
     return unless defined? Spree::User
 
     mollie_gateway = Spree::PaymentMethod.find_by_type 'Spree::Gateway::MollieGateway'
-    return unless mollie_gateway.present?
+    return unless mollie_gateway&.active?
 
     mollie_customer = mollie_gateway.create_customer(self)
     update mollie_customer_id: mollie_customer.id
   end
 end
 
-Spree.user_class.prepend(Spree::UserDecorator)
+Spree.user_class.prepend(Spree::UserDecorator)

data/app/views/spree/api/v1/orders/complete.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) if @order.present?
+  end
+end

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

@@ -1,7 +1 @@
-child available_payment_methods: :payment_methods do
-  attributes :id, :name, :method_type
-
-  node :gateways do |payment_method|
-    payment_method.gateways(order: @order) if @order.present?
-  end
-end
+extends 'spree/api/v1/orders/complete.rabl'

data/app/views/spree/api/v1/orders/payment.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) if @order.present?
+  end
+end

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

@@ -1,7 +1 @@
-child available_payment_methods: :payment_methods do
-  attributes :id, :name, :method_type
-
-  node :gateways do |payment_method|
-    payment_method.gateways(order: @order) if @order.present?
-  end
-end
+extends 'spree/api/v1/orders/payment.rabl'

data/lib/spree_mollie_gateway/version.rb

@@ -1,3 +1,3 @@
 module SpreeMollieGateway
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/spree_mollie_gateway.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'factory_bot', '~> 4.11.1'
   spec.add_development_dependency 'ffaker'
   spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3', '> 12.3.2'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.7.2'
   spec.add_development_dependency 'rubocop-rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_backend
@@ -188,14 +188,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -350,7 +356,9 @@ files:
 - app/views/spree/admin/payments/source_views/_molliegateway.html.erb
 - app/views/spree/admin/shared/_order_summary.html.erb
 - app/views/spree/admin/shared/_styles.html.erb
+- app/views/spree/api/v1/orders/complete.rabl
 - app/views/spree/api/v1/orders/complete.v1.rabl
+- app/views/spree/api/v1/orders/payment.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
@@ -400,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Mollie payments for Spree Commerce.