From edbc63bb53c5970843909eafe3cd381848e4ba57 Mon Sep 17 00:00:00 2001
From: Franck Allimant <franck@cqfdev.fr>
Date: Fri, 24 Jan 2014 15:18:50 +0100
Subject: [PATCH] Fixed Customer namespace problem

---
 core/lib/Thelia/Action/Order.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 3b7dfbd85..cf4a88432 100644
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -23,33 +23,30 @@
 
 namespace Thelia\Action;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Cart\CartTrait;
 use Thelia\Core\Event\Cart\CartEvent;
 use Thelia\Core\Event\Order\OrderAddressEvent;
 use Thelia\Core\Event\Order\OrderEvent;
+use Thelia\Core\Event\Order\OrderManualEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Exception\TheliaProcessException;
 use Thelia\Model\AddressQuery;
+use Thelia\Model\Cart as CartModel;
 use Thelia\Model\ConfigQuery;
-use Thelia\Model\MessageQuery;
-use Thelia\Model\OrderProductAttributeCombination;
-use Thelia\Model\ModuleQuery;
-use Thelia\Model\OrderProduct;
-use Thelia\Model\OrderStatus;
+use Thelia\Model\Currency;
+use Thelia\Model\Customer as CustomerModel;
+use Thelia\Model\Lang;
 use Thelia\Model\Map\OrderTableMap;
+use Thelia\Model\MessageQuery;
+use Thelia\Model\ModuleQuery;
+use Thelia\Model\Order as ModelOrder;
 use Thelia\Model\OrderAddress;
+use Thelia\Model\OrderProduct;
+use Thelia\Model\OrderProductAttributeCombination;
+use Thelia\Model\OrderStatus;
 use Thelia\Model\OrderStatusQuery;
 use Thelia\Tools\I18n;
-use Thelia\Model\Currency;
-use Thelia\Model\Lang;
-use Thelia\Model\Country;
-use Thelia\Model\Customer;
-use Thelia\Core\Event\Order\OrderManualEvent;
-
-use Thelia\Model\Cart as CartModel;
-use Thelia\Model\Order as ModelOrder;
 
 /**
  *
@@ -121,7 +118,7 @@ class Order extends BaseAction implements EventSubscriberInterface
         $event->setOrder($order);
     }
 
-    protected function createOrder(ModelOrder $sessionOrder, Currency $currency, Lang $lang, CartModel $cart, Customer $customer)
+    protected function createOrder(ModelOrder $sessionOrder, Currency $currency, Lang $lang, CartModel $cart, CustomerModel $customer)
     {
         $con = \Propel\Runtime\Propel::getConnection(
                 OrderTableMap::DATABASE_NAME
@@ -129,7 +126,7 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         $con->beginTransaction();
 
-        /* use a copy to avoid errored reccord in session */
+        /* use a copy to avoid errored record in session */
         $placedOrder = $sessionOrder->copy();
         $placedOrder->setDispatcher($this->getDispatcher());
 
@@ -319,7 +316,7 @@ class Order extends BaseAction implements EventSubscriberInterface
         /* but memorize placed order */
         $event->setOrder(new \Thelia\Model\Order());
         $event->setPlacedOrder($placedOrder);
-
+var_dump($placedOrder);
         /* empty cart */
         $this->getDispatcher()->dispatch(TheliaEvents::CART_CLEAR, new CartEvent($this->getCart($this->getRequest())));