Merge branch 'master' of github.com:thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml

core/lib/Thelia/Action/Currency.php

@@ -34,6 +34,8 @@ use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Event\CurrencyChangeEvent;
 use Thelia\Core\Event\CurrencyCreateEvent;
 use Thelia\Core\Event\CurrencyDeleteEvent;
+use Thelia\Model\Map\CurrencyTableMap;
+use Thelia\Model\ConfigQuery;
 
 class Currency extends BaseAction implements EventSubscriberInterface
 {
@@ -53,11 +55,12 @@ class Currency extends BaseAction implements EventSubscriberInterface
             ->setName($event->getCurrencyName())
             ->setSymbol($event->getSymbol())
             ->setRate($event->getRate())
-            ->setCode($event->getCode())
+            ->setCode(strtoupper($event->getCode()))
 
             ->save()
         ;
 
+
         $event->setCurrency($currency);
     }
 
@@ -79,7 +82,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
                 ->setName($event->getCurrencyName())
                 ->setSymbol($event->getSymbol())
                 ->setRate($event->getRate())
-                ->setCode($event->getCode())
+                ->setCode(strtoupper($event->getCode()))
 
                 ->save();
 
@@ -87,6 +90,32 @@ class Currency extends BaseAction implements EventSubscriberInterface
         }
     }
 
+    /**
+     * Set the default currency
+     *
+     * @param CurrencyChangeEvent $event
+     */
+    public function setDefault(CurrencyChangeEvent $event)
+    {
+        $search = CurrencyQuery::create();
+
+        if (null !== $currency = CurrencyQuery::create()->findOneById($event->getCurrencyId())) {
+
+            if ($currency->getByDefault() != $event->getIsDefault()) {
+
+                // Reset default status
+                CurrencyQuery::create()->filterByByDefault(true)->update(array('ByDefault' => false));
+
+                $currency
+                    ->setByDefault($event->getIsDefault())
+                    ->save()
+                ;
+            }
+
+            $event->setCurrency($currency);
+        }
+    }
+
     /**
      * Delete a currencyuration entry
      *
@@ -106,15 +135,41 @@ class Currency extends BaseAction implements EventSubscriberInterface
         }
     }
 
+    public function updateRates() {
+
+        $rates_url = ConfigQuery::read('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml');
+
+        $rate_data = file_get_contents($rates_url);
+
+        if ($rate_data && $sxe = new \SimpleXMLElement($rate_data)) {
+
+            foreach ($sxe->Cube[0]->Cube[0]->Cube as $last)
+            {
+                $code = strtoupper($last["currency"]);
+                $rate = floatval($last['rate']);
+
+                if (null !== $currency = CurrencyQuery::create()->findOneByCode($code)) {
+                    $currency->setRate($rate)->save();
+                }
+            }
+        }
+        else {
+            throw new \RuntimeException(sprintf("Failed to get currency rates data from URL %s", $url));
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
     public static function getSubscribedEvents()
     {
         return array(
-            TheliaEvents::CURRENCY_CREATE   => array("create", 128),
-            TheliaEvents::CURRENCY_MODIFY   => array("modify", 128),
-            TheliaEvents::CURRENCY_DELETE   => array("delete", 128),
+            TheliaEvents::CURRENCY_CREATE       => array("create", 128),
+            TheliaEvents::CURRENCY_MODIFY       => array("modify", 128),
+            TheliaEvents::CURRENCY_DELETE       => array("delete", 128),
+            TheliaEvents::CURRENCY_SET_DEFAULT  => array("setDefault", 128),
+            TheliaEvents::CURRENCY_UPDATE_RATES => array("updateRates", 128),
+
         );
     }
 }

core/lib/Thelia/Action/PageNotFound.php

@@ -0,0 +1,84 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Action;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Thelia\Model\ConfigQuery;
+
+/**
+ *
+ * Class PageNotFound
+ * @package Thelia\Action
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class PageNotFound extends BaseAction implements EventSubscriberInterface
+{
+    public function display404(GetResponseForExceptionEvent $event)
+    {
+        if(is_a($event->getException(), 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException')) {
+
+            $parser = $this->container->get("thelia.parser");
+
+            // Define the template thant shoud be used
+            $parser->setTemplate(ConfigQuery::getActiveTemplate());
+
+            //$event->getRequest()->attributes->set('_view', ConfigQuery::getPageNotFoundView());
+
+            $response = new Response($parser->render(ConfigQuery::getPageNotFoundView()), 404);
+
+            $event->setResponse($response);
+        }
+    }
+
+    /**
+     * Returns an array of event names this subscriber wants to listen to.
+     *
+     * The array keys are event names and the value can be:
+     *
+     *  * The method name to call (priority defaults to 0)
+     *  * An array composed of the method name to call and the priority
+     *  * An array of arrays composed of the method names to call and respective
+     *    priorities, or 0 if unset
+     *
+     * For instance:
+     *
+     *  * array('eventName' => 'methodName')
+     *  * array('eventName' => array('methodName', $priority))
+     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
+     *
+     * @return array The event names to listen to
+     *
+     * @api
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            KernelEvents::EXCEPTION => array("display404", 128),
+        );
+    }
+}