TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55 from thelia/frontend

Browse Source 
Frontend
This commit is contained in:
Manuel Raynaud
2013-10-24 12:31:42 -07:00
parent b8751b26a5 29c7d077c6
commit a85c0a75cf
7 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Config/Resources/routing/front.xml
View File

@@ -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>

2
core/lib/Thelia/Controller/Front/BaseFrontController.php
View File

@@ -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');
}
}

2
core/lib/Thelia/Controller/Front/CustomerController.php
View File

@@ -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);
}

2
core/lib/Thelia/Controller/Front/OrderController.php
View File

@@ -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');
}
}