From b0fb0fdd437fa5e00df21965d2dd8484f0ccec6e Mon Sep 17 00:00:00 2001
From: touffies <claffont@openstudio.fr>
Date: Thu, 24 Oct 2013 19:39:54 +0200
Subject: [PATCH] I need the route cart.view for the OrderException.php file.

---
 core/lib/Thelia/Config/Resources/routing/front.xml       | 5 +++++
 core/lib/Thelia/Controller/Front/BaseFrontController.php | 2 +-
 core/lib/Thelia/Controller/Front/CustomerController.php  | 2 +-
 core/lib/Thelia/Controller/Front/OrderController.php     | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index 981e8130f..cf7797cc9 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -95,6 +95,11 @@
     <!-- end customer address routes -->
 
     <!-- cart routes -->
+    <route id="cart.view" path="/cart">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">cart</default>
+    </route>
+
     <route id="cart.add.process" path="/cart/add">
         <default key="_controller">Thelia\Controller\Front\CartController::addItem</default>
     </route>
diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php
index 54ac1d703..5892194a4 100755
--- a/core/lib/Thelia/Controller/Front/BaseFrontController.php
+++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php
@@ -64,7 +64,7 @@ class BaseFrontController extends BaseController
     {
         $cart = $this->getSession()->getCart();
         if ($cart===null || $cart->countCartItems() == 0) {
-            $this->redirectToRoute('default', array('view'=>'cart'));
+            $this->redirectToRoute('cart.view');
         }
     }
 
diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php
index a51fb98bc..23f2e0f30 100755
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/core/lib/Thelia/Controller/Front/CustomerController.php
@@ -109,7 +109,7 @@ class CustomerController extends BaseFrontController
 
                 $cart = $this->getCart($this->getRequest());
                 if ($cart->getCartItems()->count() > 0) {
-                    $this->redirectToRoute('default', array('view'=>'cart'));
+                    $this->redirectToRoute('cart.view');
                 } else {
                     $this->redirectSuccess($customerCreation);
                 }
diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php
index 21aa22f4f..d225210ae 100755
--- a/core/lib/Thelia/Controller/Front/OrderController.php
+++ b/core/lib/Thelia/Controller/Front/OrderController.php
@@ -197,7 +197,7 @@ class OrderController extends BaseFrontController
             $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute('order.placed', array('order_id' => $orderEvent->getPlacedOrder()->getId()))));
         } else {
             /* order has not been placed */
-            $this->redirectToRoute('default', array('view'=>'cart'));
+            $this->redirectToRoute('cart.view');
         }
     }
 
@@ -205,7 +205,7 @@ class OrderController extends BaseFrontController
     {
         /* check if the placed order matched the customer */
         $placedOrder = OrderQuery::create()->findPk(
-            $this->getRequest()->attributes->get('order_id')
+            $this->getRequest()->attributes->get('order_id');
         );
 
         if (null === $placedOrder) {