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

Restored previous version

Browse Source
This commit is contained in:
Franck Allimant
2014-04-18 00:00:25 +02:00
parent 52ecfe7dad
commit 917b05b65e
1 changed files with 173 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
local/modules/Front/Controller/CartController.php
View File

@@ -31,7 +31,6 @@ use Thelia\Core\Event\TheliaEvents;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Thelia\Form\CartAdd; use Thelia\Form\CartAdd;
use Thelia\Model\AddressQuery; use Thelia\Model\AddressQuery;
use Thelia\Module\Exception\DeliveryException;
class CartController extends BaseFrontController class CartController extends BaseFrontController
{ {
@@ -161,24 +160,13 @@ class CartController extends BaseFrontController
if (null !== $deliveryModule && null !== $deliveryAddress) { if (null !== $deliveryModule && null !== $deliveryAddress) {
$moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode())); $moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode()));
$orderEvent = new OrderEvent($order);
try {
$postage = $moduleInstance->getPostage($deliveryAddress->getCountry()); $postage = $moduleInstance->getPostage($deliveryAddress->getCountry());
$orderEvent = new OrderEvent($order);
$orderEvent->setPostage($postage); $orderEvent->setPostage($postage);
$this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_POSTAGE, $orderEvent); $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_POSTAGE, $orderEvent);
} }
catch (DeliveryException $ex) {
// The postage has been chosen, but changes in the cart causes an exception.
// Reset the postage data in the order
$orderEvent->setDeliveryModule(0);
$this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_MODULE, $orderEvent);
}
}
} }
} }