empty cart or delivery exception

core/lib/Thelia/Core/EventListener/ViewListener.php

@@ -28,8 +28,10 @@ use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Router;
 use Thelia\Core\Template\Exception\ResourceNotFoundException;
 use Thelia\Core\Template\ParserInterface;
+use Thelia\Exception\OrderException;
 use Thelia\Tools\Redirect;
 use Thelia\Tools\URL;
 use Thelia\Core\Security\Exception\AuthenticationException;
@@ -87,6 +89,19 @@ class ViewListener implements EventSubscriberInterface
 
             // Redirect to the login template
             Redirect::exec($this->container->get('thelia.url.manager')->viewUrl($ex->getLoginTemplate()));
+        } catch (OrderException $e) {
+            switch($e->getCode()) {
+                case OrderException::CART_EMPTY:
+                    // Redirect to the cart template
+                    Redirect::exec($this->container->get('router.chainRequest')->generate($e->cartRoute, $e->arguments, Router::ABSOLUTE_URL));
+                    break;
+                case OrderException::UNDEFINED_DELIVERY:
+                    // Redirect to the delivery choice template
+                    Redirect::exec($this->container->get('router.chainRequest')->generate($e->orderDeliveryRoute, $e->arguments, Router::ABSOLUTE_URL));
+                    break;
+            }
+
+            throw $e;
         }
     }
 

core/lib/Thelia/Core/HttpFoundation/Session/Session.php

@@ -218,6 +218,9 @@ class Session extends BaseSession
         return $this;
     }
 
+    /**
+     * @return Order
+     */
     public function getOrder()
     {
         return $this->get("thelia.order");

core/lib/Thelia/Core/Routing/RewritingRouter.php

@@ -128,7 +128,7 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
      */
     public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
     {
-        // TODO: Implement generate() method.
+        throw new RouteNotFoundException();
     }
 
     /**

core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php

@@ -78,7 +78,17 @@ class Security extends AbstractSmartyPlugin
     {
         $cart = $this->request->getSession()->getCart();
         if($cart===null || $cart->countCartItems() == 0) {
-            throw new OrderException('Cart must not be empty', OrderException::CART_EMPTY);
+            throw new OrderException('Cart must not be empty', OrderException::CART_EMPTY, array('empty' => 1));
+        }
+
+        return "";
+    }
+
+    public function checkValidDeliveryFunction($params, &$smarty)
+    {
+        $order = $this->request->getSession()->getOrder();
+        if(null === $order || null === $order->chosenDeliveryAddress || null === $order->getDeliveryModuleId()) {
+            throw new OrderException('Delivery must be defined', OrderException::UNDEFINED_DELIVERY, array('missing' => 1));
         }
 
         return "";
@@ -94,6 +104,7 @@ class Security extends AbstractSmartyPlugin
         return array(
             new SmartyPluginDescriptor('function', 'check_auth', $this, 'checkAuthFunction'),
             new SmartyPluginDescriptor('function', 'check_cart_not_empty', $this, 'checkCartNotEmptyFunction'),
+            new SmartyPluginDescriptor('function', 'check_valid_delivery', $this, 'checkValidDeliveryFunction'),
         );
     }
 }