Merge pull request #62 from Oldharlem/preserve_order_state

Preserve order state when a payment expires on a paid order

app/models/spree/mollie/payment_state_updater.rb

@@ -28,8 +28,12 @@ def update
           @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 @@ def transition_to_paid!
 
       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
 

app/models/spree/order_decorator.rb

@@ -26,10 +26,26 @@ def finalize!
     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