From db94749dc0bdc4c1f99f1d7d0049b3759a69cc87 Mon Sep 17 00:00:00 2001
From: Guillaume Barral <gbarral@openstudio.fr>
Date: Mon, 19 May 2014 09:43:42 +0200
Subject: [PATCH 1/3] set the placedOrder in the createManual function

---
 core/lib/Thelia/Action/Order.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index bd8534219..dfefc652c 100644
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -302,13 +302,15 @@ class Order extends BaseAction implements EventSubscriberInterface
      */
     public function createManual(OrderManualEvent $event)
     {
-        $this->createOrder(
-            $event->getDispatcher(),
-            $event->getOrder(),
-            $event->getCurrency(),
-            $event->getLang(),
-            $event->getCart(),
-            $event->getCustomer()
+        $event->setPlacedOrder(
+            $this->createOrder(
+                $event->getDispatcher(),
+                $event->getOrder(),
+                $event->getCurrency(),
+                $event->getLang(),
+                $event->getCart(),
+                $event->getCustomer()
+            )
         );
     }
 

From c4be881ab84f2965cba566945c132dc561212fb7 Mon Sep 17 00:00:00 2001
From: Guillaume Barral <guillaume.barral@hotmail.fr>
Date: Mon, 19 May 2014 11:01:19 +0200
Subject: [PATCH 2/3] add the test of a non null order in the $event object in
 createManual function

---
 core/lib/Thelia/Action/Order.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index dfefc652c..da173f63a 100644
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -302,6 +302,9 @@ class Order extends BaseAction implements EventSubscriberInterface
      */
     public function createManual(OrderManualEvent $event)
     {
+        if(!$event->getOrder())
+            $event->setOrder(new \Thelia\Model\Order());
+
         $event->setPlacedOrder(
             $this->createOrder(
                 $event->getDispatcher(),

From bcd817f9d924927cc1d61666e270d26f71fd5eac Mon Sep 17 00:00:00 2001
From: Guillaume Barral <guillaume.barral@hotmail.fr>
Date: Mon, 19 May 2014 11:06:19 +0200
Subject: [PATCH 3/3] initialize the order in the $event object in the
 createManual function. We need to initialize it because we have to  use the
 placedOrder instead

---
 core/lib/Thelia/Action/Order.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index da173f63a..65fe76b75 100644
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -302,9 +302,6 @@ class Order extends BaseAction implements EventSubscriberInterface
      */
     public function createManual(OrderManualEvent $event)
     {
-        if(!$event->getOrder())
-            $event->setOrder(new \Thelia\Model\Order());
-
         $event->setPlacedOrder(
             $this->createOrder(
                 $event->getDispatcher(),
@@ -315,6 +312,8 @@ class Order extends BaseAction implements EventSubscriberInterface
                 $event->getCustomer()
             )
         );
+
+        $event->setOrder(new \Thelia\Model\Order());
     }
 
     /**