From 9c18322d27f11a42348aa9ca1e212b7c1144e90c Mon Sep 17 00:00:00 2001
From: Petr Kadlec <petr.kadlec@shopsys.com>
Date: Fri, 3 Jul 2020 10:04:51 +0200
Subject: [PATCH] order can now be completed when successfull flash message
 exists (#1644)

---
 src/Controller/Front/OrderController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/Front/OrderController.php b/src/Controller/Front/OrderController.php
index 13102db52e..614dc194f4 100644
--- a/src/Controller/Front/OrderController.php
+++ b/src/Controller/Front/OrderController.php
@@ -213,7 +213,7 @@ public function indexAction()
         if ($isValid) {
             if ($orderFlow->nextStep()) {
                 $form = $orderFlow->createForm();
-            } elseif ($this->isFlashMessageBagEmpty()) {
+            } elseif (count($this->getErrorMessages()) === 0 && count($this->getInfoMessages()) === 0) {
                 $deliveryAddress = $orderData->deliveryAddressSameAsBillingAddress === false ? $frontOrderFormData->deliveryAddress : null;
                 $order = $this->orderFacade->createOrderFromFront($orderData, $deliveryAddress);
                 $this->orderFacade->sendHeurekaOrderInfo($order, $frontOrderFormData->disallowHeurekaVerifiedByCustomers);