From 4391e6334b8b0da18110ffb8a784bdede0c57fdc Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 11 Mar 2014 15:43:48 +0100 Subject: [PATCH] fix modules cs --- local/modules/Front/Controller/AddressController.php | 1 - local/modules/Front/Controller/CartController.php | 5 ++--- local/modules/Front/Controller/CouponController.php | 4 ++-- local/modules/Front/Controller/OrderController.php | 8 +++----- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/local/modules/Front/Controller/AddressController.php b/local/modules/Front/Controller/AddressController.php index f8cbde0a4..1ab3e324f 100644 --- a/local/modules/Front/Controller/AddressController.php +++ b/local/modules/Front/Controller/AddressController.php @@ -183,7 +183,6 @@ class AddressController extends BaseFrontController \Thelia\Log\Tlog::getInstance()->error(sprintf('Error during address deletion : %s', $error_message)); - // If Ajax Request if ($this->getRequest()->isXmlHttpRequest()) { if ($error_message) { diff --git a/local/modules/Front/Controller/CartController.php b/local/modules/Front/Controller/CartController.php index 5985dedb5..59110d62a 100644 --- a/local/modules/Front/Controller/CartController.php +++ b/local/modules/Front/Controller/CartController.php @@ -154,11 +154,11 @@ class CartController extends BaseFrontController { /* recalculate postage amount */ $order = $this->getSession()->getOrder(); - if(null !== $order) { + if (null !== $order) { $deliveryModule = $order->getModuleRelatedByDeliveryModuleId(); $deliveryAddress = AddressQuery::create()->findPk($order->chosenDeliveryAddress); - if(null !== $deliveryModule && null !== $deliveryAddress) { + if (null !== $deliveryModule && null !== $deliveryAddress) { $moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode())); $postage = $moduleInstance->getPostage($deliveryAddress->getCountry()); @@ -170,5 +170,4 @@ class CartController extends BaseFrontController } } - } diff --git a/local/modules/Front/Controller/CouponController.php b/local/modules/Front/Controller/CouponController.php index 73eef34b7..ba7433612 100644 --- a/local/modules/Front/Controller/CouponController.php +++ b/local/modules/Front/Controller/CouponController.php @@ -68,11 +68,11 @@ class CouponController extends BaseFrontController /* recalculate postage amount */ $order = $this->getSession()->getOrder(); - if(null !== $order) { + if (null !== $order) { $deliveryModule = $order->getModuleRelatedByDeliveryModuleId(); $deliveryAddress = AddressQuery::create()->findPk($order->chosenDeliveryAddress); - if(null !== $deliveryModule && null !== $deliveryAddress) { + if (null !== $deliveryModule && null !== $deliveryAddress) { $moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode())); $postage = $moduleInstance->getPostage($deliveryAddress->getCountry()); diff --git a/local/modules/Front/Controller/OrderController.php b/local/modules/Front/Controller/OrderController.php index 4791663f0..5ac01d723 100644 --- a/local/modules/Front/Controller/OrderController.php +++ b/local/modules/Front/Controller/OrderController.php @@ -25,9 +25,6 @@ namespace Front\Controller; use Propel\Runtime\Exception\PropelException; use Thelia\Cart\CartTrait; use Thelia\Controller\Front\BaseFrontController; -use Thelia\Core\Event\PdfEvent; -use Thelia\Core\HttpFoundation\Response; -use Thelia\Core\Template\TemplateHelper; use Thelia\Core\Translation\Translator; use Thelia\Exception\TheliaProcessException; use Thelia\Form\Exception\FormValidationException; @@ -202,7 +199,7 @@ class OrderController extends BaseFrontController if (null !== $placedOrder && null !== $placedOrder->getId()) { /* order has been placed */ - if($orderEvent->hasResponse()) { + if ($orderEvent->hasResponse()) { return $orderEvent->getResponse(); } else { $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute('order.placed', array('order_id' => $orderEvent->getPlacedOrder()->getId())))); @@ -263,6 +260,7 @@ class OrderController extends BaseFrontController { /* check customer */ $this->checkAuth(); + return $this->generateOrderPdf($order_id, ConfigQuery::read('pdf_invoice_file', 'invoice')); } @@ -270,6 +268,7 @@ class OrderController extends BaseFrontController { /* check customer */ $this->checkAuth(); + return $this->generateOrderPdf($order_id, ConfigQuery::read('pdf_delivery_file', 'delivery')); } @@ -286,5 +285,4 @@ class OrderController extends BaseFrontController return $this->render('ajax/order-delivery-module-list', $args); } - }