From 8570251b881da0dd43fffe22b027a8712edd4343 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Tue, 10 Sep 2013 12:04:33 +0200
Subject: [PATCH 01/55] product price

---
 core/lib/Thelia/Model/Base/Currency.php       |   5 +-
 core/lib/Thelia/Model/Base/ProductPrice.php   | 156 ++++++------------
 .../Thelia/Model/Base/ProductPriceQuery.php   |  77 +++------
 .../Thelia/Model/Base/ProductSaleElements.php |   5 +-
 .../Thelia/Model/Map/ProductPriceTableMap.php | 121 +++++++++-----
 install/thelia.sql                            |   3 +-
 local/config/schema.xml                       |   7 +-
 7 files changed, 166 insertions(+), 208 deletions(-)

diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php
index 767e2dc37..26d6573a9 100644
--- a/core/lib/Thelia/Model/Base/Currency.php
+++ b/core/lib/Thelia/Model/Base/Currency.php
@@ -2276,7 +2276,10 @@ abstract class Currency implements ActiveRecordInterface
         $productPricesToDelete = $this->getProductPrices(new Criteria(), $con)->diff($productPrices);
 
 
-        $this->productPricesScheduledForDeletion = $productPricesToDelete;
+        //since at least one column in the foreign key is at the same time a PK
+        //we can not just set a PK to NULL in the lines below. We have to store
+        //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
+        $this->productPricesScheduledForDeletion = clone $productPricesToDelete;
 
         foreach ($productPricesToDelete as $productPriceRemoved) {
             $productPriceRemoved->setCurrency(null);
diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php
index 15502a385..e92ca2cfa 100644
--- a/core/lib/Thelia/Model/Base/ProductPrice.php
+++ b/core/lib/Thelia/Model/Base/ProductPrice.php
@@ -58,12 +58,6 @@ abstract class ProductPrice implements ActiveRecordInterface
      */
     protected $virtualColumns = array();
 
-    /**
-     * The value for the id field.
-     * @var        int
-     */
-    protected $id;
-
     /**
      * The value for the product_sale_elements_id field.
      * @var        int
@@ -372,17 +366,6 @@ abstract class ProductPrice implements ActiveRecordInterface
         return array_keys(get_object_vars($this));
     }
 
-    /**
-     * Get the [id] column value.
-     *
-     * @return   int
-     */
-    public function getId()
-    {
-
-        return $this->id;
-    }
-
     /**
      * Get the [product_sale_elements_id] column value.
      *
@@ -467,27 +450,6 @@ abstract class ProductPrice implements ActiveRecordInterface
         }
     }
 
-    /**
-     * Set the value of [id] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\ProductPrice The current object (for fluent API support)
-     */
-    public function setId($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->id !== $v) {
-            $this->id = $v;
-            $this->modifiedColumns[] = ProductPriceTableMap::ID;
-        }
-
-
-        return $this;
-    } // setId()
-
     /**
      * Set the value of [product_sale_elements_id] column.
      *
@@ -659,28 +621,25 @@ abstract class ProductPrice implements ActiveRecordInterface
         try {
 
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductPriceTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->id = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProductPriceTableMap::translateFieldName('ProductSaleElementsId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductPriceTableMap::translateFieldName('ProductSaleElementsId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->product_sale_elements_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductPriceTableMap::translateFieldName('CurrencyId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProductPriceTableMap::translateFieldName('CurrencyId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->currency_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductPriceTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductPriceTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
             $this->price = (null !== $col) ? (double) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductPriceTableMap::translateFieldName('PromoPrice', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductPriceTableMap::translateFieldName('PromoPrice', TableMap::TYPE_PHPNAME, $indexType)];
             $this->promo_price = (null !== $col) ? (double) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductPriceTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductPriceTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductPriceTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductPriceTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -693,7 +652,7 @@ abstract class ProductPrice implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 7; // 7 = ProductPriceTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 6; // 6 = ProductPriceTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\ProductPrice object", 0, $e);
@@ -934,15 +893,8 @@ abstract class ProductPrice implements ActiveRecordInterface
         $modifiedColumns = array();
         $index = 0;
 
-        $this->modifiedColumns[] = ProductPriceTableMap::ID;
-        if (null !== $this->id) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key (' . ProductPriceTableMap::ID . ')');
-        }
 
          // check the columns in natural order for more readable SQL queries
-        if ($this->isColumnModified(ProductPriceTableMap::ID)) {
-            $modifiedColumns[':p' . $index++]  = 'ID';
-        }
         if ($this->isColumnModified(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID)) {
             $modifiedColumns[':p' . $index++]  = 'PRODUCT_SALE_ELEMENTS_ID';
         }
@@ -972,9 +924,6 @@ abstract class ProductPrice implements ActiveRecordInterface
             $stmt = $con->prepare($sql);
             foreach ($modifiedColumns as $identifier => $columnName) {
                 switch ($columnName) {
-                    case 'ID':
-                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
-                        break;
                     case 'PRODUCT_SALE_ELEMENTS_ID':
                         $stmt->bindValue($identifier, $this->product_sale_elements_id, PDO::PARAM_INT);
                         break;
@@ -1001,13 +950,6 @@ abstract class ProductPrice implements ActiveRecordInterface
             throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
         }
 
-        try {
-            $pk = $con->lastInsertId();
-        } catch (Exception $e) {
-            throw new PropelException('Unable to get autoincrement id.', 0, $e);
-        }
-        $this->setId($pk);
-
         $this->setNew(false);
     }
 
@@ -1056,24 +998,21 @@ abstract class ProductPrice implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                return $this->getId();
-                break;
-            case 1:
                 return $this->getProductSaleElementsId();
                 break;
-            case 2:
+            case 1:
                 return $this->getCurrencyId();
                 break;
-            case 3:
+            case 2:
                 return $this->getPrice();
                 break;
-            case 4:
+            case 3:
                 return $this->getPromoPrice();
                 break;
-            case 5:
+            case 4:
                 return $this->getCreatedAt();
                 break;
-            case 6:
+            case 5:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1099,19 +1038,18 @@ abstract class ProductPrice implements ActiveRecordInterface
      */
     public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
     {
-        if (isset($alreadyDumpedObjects['ProductPrice'][$this->getPrimaryKey()])) {
+        if (isset($alreadyDumpedObjects['ProductPrice'][serialize($this->getPrimaryKey())])) {
             return '*RECURSION*';
         }
-        $alreadyDumpedObjects['ProductPrice'][$this->getPrimaryKey()] = true;
+        $alreadyDumpedObjects['ProductPrice'][serialize($this->getPrimaryKey())] = true;
         $keys = ProductPriceTableMap::getFieldNames($keyType);
         $result = array(
-            $keys[0] => $this->getId(),
-            $keys[1] => $this->getProductSaleElementsId(),
-            $keys[2] => $this->getCurrencyId(),
-            $keys[3] => $this->getPrice(),
-            $keys[4] => $this->getPromoPrice(),
-            $keys[5] => $this->getCreatedAt(),
-            $keys[6] => $this->getUpdatedAt(),
+            $keys[0] => $this->getProductSaleElementsId(),
+            $keys[1] => $this->getCurrencyId(),
+            $keys[2] => $this->getPrice(),
+            $keys[3] => $this->getPromoPrice(),
+            $keys[4] => $this->getCreatedAt(),
+            $keys[5] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach($virtualColumns as $key => $virtualColumn)
@@ -1161,24 +1099,21 @@ abstract class ProductPrice implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                $this->setId($value);
-                break;
-            case 1:
                 $this->setProductSaleElementsId($value);
                 break;
-            case 2:
+            case 1:
                 $this->setCurrencyId($value);
                 break;
-            case 3:
+            case 2:
                 $this->setPrice($value);
                 break;
-            case 4:
+            case 3:
                 $this->setPromoPrice($value);
                 break;
-            case 5:
+            case 4:
                 $this->setCreatedAt($value);
                 break;
-            case 6:
+            case 5:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1205,13 +1140,12 @@ abstract class ProductPrice implements ActiveRecordInterface
     {
         $keys = ProductPriceTableMap::getFieldNames($keyType);
 
-        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setProductSaleElementsId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setCurrencyId($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setPrice($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setPromoPrice($arr[$keys[4]]);
-        if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
-        if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
+        if (array_key_exists($keys[0], $arr)) $this->setProductSaleElementsId($arr[$keys[0]]);
+        if (array_key_exists($keys[1], $arr)) $this->setCurrencyId($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setPrice($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setPromoPrice($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
+        if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
     }
 
     /**
@@ -1223,7 +1157,6 @@ abstract class ProductPrice implements ActiveRecordInterface
     {
         $criteria = new Criteria(ProductPriceTableMap::DATABASE_NAME);
 
-        if ($this->isColumnModified(ProductPriceTableMap::ID)) $criteria->add(ProductPriceTableMap::ID, $this->id);
         if ($this->isColumnModified(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID)) $criteria->add(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, $this->product_sale_elements_id);
         if ($this->isColumnModified(ProductPriceTableMap::CURRENCY_ID)) $criteria->add(ProductPriceTableMap::CURRENCY_ID, $this->currency_id);
         if ($this->isColumnModified(ProductPriceTableMap::PRICE)) $criteria->add(ProductPriceTableMap::PRICE, $this->price);
@@ -1245,29 +1178,36 @@ abstract class ProductPrice implements ActiveRecordInterface
     public function buildPkeyCriteria()
     {
         $criteria = new Criteria(ProductPriceTableMap::DATABASE_NAME);
-        $criteria->add(ProductPriceTableMap::ID, $this->id);
+        $criteria->add(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, $this->product_sale_elements_id);
+        $criteria->add(ProductPriceTableMap::CURRENCY_ID, $this->currency_id);
 
         return $criteria;
     }
 
     /**
-     * Returns the primary key for this object (row).
-     * @return   int
+     * Returns the composite primary key for this object.
+     * The array elements will be in same order as specified in XML.
+     * @return array
      */
     public function getPrimaryKey()
     {
-        return $this->getId();
+        $pks = array();
+        $pks[0] = $this->getProductSaleElementsId();
+        $pks[1] = $this->getCurrencyId();
+
+        return $pks;
     }
 
     /**
-     * Generic method to set the primary key (id column).
+     * Set the [composite] primary key.
      *
-     * @param       int $key Primary key.
+     * @param      array $keys The elements of the composite key (order must match the order in XML file).
      * @return void
      */
-    public function setPrimaryKey($key)
+    public function setPrimaryKey($keys)
     {
-        $this->setId($key);
+        $this->setProductSaleElementsId($keys[0]);
+        $this->setCurrencyId($keys[1]);
     }
 
     /**
@@ -1277,7 +1217,7 @@ abstract class ProductPrice implements ActiveRecordInterface
     public function isPrimaryKeyNull()
     {
 
-        return null === $this->getId();
+        return (null === $this->getProductSaleElementsId()) && (null === $this->getCurrencyId());
     }
 
     /**
@@ -1301,7 +1241,6 @@ abstract class ProductPrice implements ActiveRecordInterface
         $copyObj->setUpdatedAt($this->getUpdatedAt());
         if ($makeNew) {
             $copyObj->setNew(true);
-            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
         }
     }
 
@@ -1434,7 +1373,6 @@ abstract class ProductPrice implements ActiveRecordInterface
      */
     public function clear()
     {
-        $this->id = null;
         $this->product_sale_elements_id = null;
         $this->currency_id = null;
         $this->price = null;
diff --git a/core/lib/Thelia/Model/Base/ProductPriceQuery.php b/core/lib/Thelia/Model/Base/ProductPriceQuery.php
index 275aebbb2..9790d00ef 100644
--- a/core/lib/Thelia/Model/Base/ProductPriceQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductPriceQuery.php
@@ -21,7 +21,6 @@ use Thelia\Model\Map\ProductPriceTableMap;
  *
  *
  *
- * @method     ChildProductPriceQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildProductPriceQuery orderByProductSaleElementsId($order = Criteria::ASC) Order by the product_sale_elements_id column
  * @method     ChildProductPriceQuery orderByCurrencyId($order = Criteria::ASC) Order by the currency_id column
  * @method     ChildProductPriceQuery orderByPrice($order = Criteria::ASC) Order by the price column
@@ -29,7 +28,6 @@ use Thelia\Model\Map\ProductPriceTableMap;
  * @method     ChildProductPriceQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildProductPriceQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
- * @method     ChildProductPriceQuery groupById() Group by the id column
  * @method     ChildProductPriceQuery groupByProductSaleElementsId() Group by the product_sale_elements_id column
  * @method     ChildProductPriceQuery groupByCurrencyId() Group by the currency_id column
  * @method     ChildProductPriceQuery groupByPrice() Group by the price column
@@ -52,7 +50,6 @@ use Thelia\Model\Map\ProductPriceTableMap;
  * @method     ChildProductPrice findOne(ConnectionInterface $con = null) Return the first ChildProductPrice matching the query
  * @method     ChildProductPrice findOneOrCreate(ConnectionInterface $con = null) Return the first ChildProductPrice matching the query, or a new ChildProductPrice object populated from the query conditions when no match is found
  *
- * @method     ChildProductPrice findOneById(int $id) Return the first ChildProductPrice filtered by the id column
  * @method     ChildProductPrice findOneByProductSaleElementsId(int $product_sale_elements_id) Return the first ChildProductPrice filtered by the product_sale_elements_id column
  * @method     ChildProductPrice findOneByCurrencyId(int $currency_id) Return the first ChildProductPrice filtered by the currency_id column
  * @method     ChildProductPrice findOneByPrice(double $price) Return the first ChildProductPrice filtered by the price column
@@ -60,7 +57,6 @@ use Thelia\Model\Map\ProductPriceTableMap;
  * @method     ChildProductPrice findOneByCreatedAt(string $created_at) Return the first ChildProductPrice filtered by the created_at column
  * @method     ChildProductPrice findOneByUpdatedAt(string $updated_at) Return the first ChildProductPrice filtered by the updated_at column
  *
- * @method     array findById(int $id) Return ChildProductPrice objects filtered by the id column
  * @method     array findByProductSaleElementsId(int $product_sale_elements_id) Return ChildProductPrice objects filtered by the product_sale_elements_id column
  * @method     array findByCurrencyId(int $currency_id) Return ChildProductPrice objects filtered by the currency_id column
  * @method     array findByPrice(double $price) Return ChildProductPrice objects filtered by the price column
@@ -114,10 +110,10 @@ abstract class ProductPriceQuery extends ModelCriteria
      * Go fast if the query is untouched.
      *
      * <code>
-     * $obj  = $c->findPk(12, $con);
+     * $obj = $c->findPk(array(12, 34), $con);
      * </code>
      *
-     * @param mixed $key Primary key to use for the query
+     * @param array[$product_sale_elements_id, $currency_id] $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildProductPrice|array|mixed the result, formatted by the current formatter
@@ -127,7 +123,7 @@ abstract class ProductPriceQuery extends ModelCriteria
         if ($key === null) {
             return null;
         }
-        if ((null !== ($obj = ProductPriceTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+        if ((null !== ($obj = ProductPriceTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) {
             // the object is already in the instance pool
             return $obj;
         }
@@ -155,10 +151,11 @@ abstract class ProductPriceQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, PRODUCT_SALE_ELEMENTS_ID, CURRENCY_ID, PRICE, PROMO_PRICE, CREATED_AT, UPDATED_AT FROM product_price WHERE ID = :p0';
+        $sql = 'SELECT PRODUCT_SALE_ELEMENTS_ID, CURRENCY_ID, PRICE, PROMO_PRICE, CREATED_AT, UPDATED_AT FROM product_price WHERE PRODUCT_SALE_ELEMENTS_ID = :p0 AND CURRENCY_ID = :p1';
         try {
             $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
+            $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
             $stmt->execute();
         } catch (Exception $e) {
             Propel::log($e->getMessage(), Propel::LOG_ERR);
@@ -168,7 +165,7 @@ abstract class ProductPriceQuery extends ModelCriteria
         if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
             $obj = new ChildProductPrice();
             $obj->hydrate($row);
-            ProductPriceTableMap::addInstanceToPool($obj, (string) $key);
+            ProductPriceTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1])));
         }
         $stmt->closeCursor();
 
@@ -197,7 +194,7 @@ abstract class ProductPriceQuery extends ModelCriteria
     /**
      * Find objects by primary key
      * <code>
-     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
      * </code>
      * @param     array $keys Primary keys to use for the query
      * @param     ConnectionInterface $con an optional connection object
@@ -227,8 +224,10 @@ abstract class ProductPriceQuery extends ModelCriteria
      */
     public function filterByPrimaryKey($key)
     {
+        $this->addUsingAlias(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, $key[0], Criteria::EQUAL);
+        $this->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $key[1], Criteria::EQUAL);
 
-        return $this->addUsingAlias(ProductPriceTableMap::ID, $key, Criteria::EQUAL);
+        return $this;
     }
 
     /**
@@ -240,49 +239,17 @@ abstract class ProductPriceQuery extends ModelCriteria
      */
     public function filterByPrimaryKeys($keys)
     {
-
-        return $this->addUsingAlias(ProductPriceTableMap::ID, $keys, Criteria::IN);
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductPriceQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(ProductPriceTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(ProductPriceTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
+        if (empty($keys)) {
+            return $this->add(null, '1<>1', Criteria::CUSTOM);
+        }
+        foreach ($keys as $key) {
+            $cton0 = $this->getNewCriterion(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, $key[0], Criteria::EQUAL);
+            $cton1 = $this->getNewCriterion(ProductPriceTableMap::CURRENCY_ID, $key[1], Criteria::EQUAL);
+            $cton0->addAnd($cton1);
+            $this->addOr($cton0);
         }
 
-        return $this->addUsingAlias(ProductPriceTableMap::ID, $id, $comparison);
+        return $this;
     }
 
     /**
@@ -699,7 +666,9 @@ abstract class ProductPriceQuery extends ModelCriteria
     public function prune($productPrice = null)
     {
         if ($productPrice) {
-            $this->addUsingAlias(ProductPriceTableMap::ID, $productPrice->getId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond0', $this->getAliasedColName(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID), $productPrice->getProductSaleElementsId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond1', $this->getAliasedColName(ProductPriceTableMap::CURRENCY_ID), $productPrice->getCurrencyId(), Criteria::NOT_EQUAL);
+            $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR);
         }
 
         return $this;
diff --git a/core/lib/Thelia/Model/Base/ProductSaleElements.php b/core/lib/Thelia/Model/Base/ProductSaleElements.php
index f79d9a246..4c14580ff 100644
--- a/core/lib/Thelia/Model/Base/ProductSaleElements.php
+++ b/core/lib/Thelia/Model/Base/ProductSaleElements.php
@@ -2248,7 +2248,10 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         $productPricesToDelete = $this->getProductPrices(new Criteria(), $con)->diff($productPrices);
 
 
-        $this->productPricesScheduledForDeletion = $productPricesToDelete;
+        //since at least one column in the foreign key is at the same time a PK
+        //we can not just set a PK to NULL in the lines below. We have to store
+        //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
+        $this->productPricesScheduledForDeletion = clone $productPricesToDelete;
 
         foreach ($productPricesToDelete as $productPriceRemoved) {
             $productPriceRemoved->setProductSaleElements(null);
diff --git a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php
index 1a6274e2d..86a22b680 100644
--- a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php
@@ -57,7 +57,7 @@ class ProductPriceTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 7;
+    const NUM_COLUMNS = 6;
 
     /**
      * The number of lazy-loaded columns
@@ -67,12 +67,7 @@ class ProductPriceTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 7;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'product_price.ID';
+    const NUM_HYDRATE_COLUMNS = 6;
 
     /**
      * the column name for the PRODUCT_SALE_ELEMENTS_ID field
@@ -116,12 +111,12 @@ class ProductPriceTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'ProductSaleElementsId', 'CurrencyId', 'Price', 'PromoPrice', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'productSaleElementsId', 'currencyId', 'price', 'promoPrice', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(ProductPriceTableMap::ID, ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, ProductPriceTableMap::CURRENCY_ID, ProductPriceTableMap::PRICE, ProductPriceTableMap::PROMO_PRICE, ProductPriceTableMap::CREATED_AT, ProductPriceTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'PRODUCT_SALE_ELEMENTS_ID', 'CURRENCY_ID', 'PRICE', 'PROMO_PRICE', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'product_sale_elements_id', 'currency_id', 'price', 'promo_price', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+        self::TYPE_PHPNAME       => array('ProductSaleElementsId', 'CurrencyId', 'Price', 'PromoPrice', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('productSaleElementsId', 'currencyId', 'price', 'promoPrice', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, ProductPriceTableMap::CURRENCY_ID, ProductPriceTableMap::PRICE, ProductPriceTableMap::PROMO_PRICE, ProductPriceTableMap::CREATED_AT, ProductPriceTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('PRODUCT_SALE_ELEMENTS_ID', 'CURRENCY_ID', 'PRICE', 'PROMO_PRICE', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('product_sale_elements_id', 'currency_id', 'price', 'promo_price', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
     );
 
     /**
@@ -131,12 +126,12 @@ class ProductPriceTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'ProductSaleElementsId' => 1, 'CurrencyId' => 2, 'Price' => 3, 'PromoPrice' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'productSaleElementsId' => 1, 'currencyId' => 2, 'price' => 3, 'promoPrice' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
-        self::TYPE_COLNAME       => array(ProductPriceTableMap::ID => 0, ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID => 1, ProductPriceTableMap::CURRENCY_ID => 2, ProductPriceTableMap::PRICE => 3, ProductPriceTableMap::PROMO_PRICE => 4, ProductPriceTableMap::CREATED_AT => 5, ProductPriceTableMap::UPDATED_AT => 6, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PRODUCT_SALE_ELEMENTS_ID' => 1, 'CURRENCY_ID' => 2, 'PRICE' => 3, 'PROMO_PRICE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'product_sale_elements_id' => 1, 'currency_id' => 2, 'price' => 3, 'promo_price' => 4, 'created_at' => 5, 'updated_at' => 6, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+        self::TYPE_PHPNAME       => array('ProductSaleElementsId' => 0, 'CurrencyId' => 1, 'Price' => 2, 'PromoPrice' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
+        self::TYPE_STUDLYPHPNAME => array('productSaleElementsId' => 0, 'currencyId' => 1, 'price' => 2, 'promoPrice' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
+        self::TYPE_COLNAME       => array(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID => 0, ProductPriceTableMap::CURRENCY_ID => 1, ProductPriceTableMap::PRICE => 2, ProductPriceTableMap::PROMO_PRICE => 3, ProductPriceTableMap::CREATED_AT => 4, ProductPriceTableMap::UPDATED_AT => 5, ),
+        self::TYPE_RAW_COLNAME   => array('PRODUCT_SALE_ELEMENTS_ID' => 0, 'CURRENCY_ID' => 1, 'PRICE' => 2, 'PROMO_PRICE' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
+        self::TYPE_FIELDNAME     => array('product_sale_elements_id' => 0, 'currency_id' => 1, 'price' => 2, 'promo_price' => 3, 'created_at' => 4, 'updated_at' => 5, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
     );
 
     /**
@@ -153,11 +148,10 @@ class ProductPriceTableMap extends TableMap
         $this->setPhpName('ProductPrice');
         $this->setClassName('\\Thelia\\Model\\ProductPrice');
         $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
+        $this->setUseIdGenerator(false);
         // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('PRODUCT_SALE_ELEMENTS_ID', 'ProductSaleElementsId', 'INTEGER', 'product_sale_elements', 'ID', true, null, null);
-        $this->addForeignKey('CURRENCY_ID', 'CurrencyId', 'INTEGER', 'currency', 'ID', true, null, null);
+        $this->addForeignPrimaryKey('PRODUCT_SALE_ELEMENTS_ID', 'ProductSaleElementsId', 'INTEGER' , 'product_sale_elements', 'ID', true, null, null);
+        $this->addForeignPrimaryKey('CURRENCY_ID', 'CurrencyId', 'INTEGER' , 'currency', 'ID', true, null, null);
         $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
         $this->addColumn('PROMO_PRICE', 'PromoPrice', 'FLOAT', false, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
@@ -186,6 +180,59 @@ class ProductPriceTableMap extends TableMap
         );
     } // getBehaviors()
 
+    /**
+     * Adds an object to the instance pool.
+     *
+     * Propel keeps cached copies of objects in an instance pool when they are retrieved
+     * from the database. In some cases you may need to explicitly add objects
+     * to the cache in order to ensure that the same objects are always returned by find*()
+     * and findPk*() calls.
+     *
+     * @param \Thelia\Model\ProductPrice $obj A \Thelia\Model\ProductPrice object.
+     * @param string $key             (optional) key to use for instance map (for performance boost if key was already calculated externally).
+     */
+    public static function addInstanceToPool($obj, $key = null)
+    {
+        if (Propel::isInstancePoolingEnabled()) {
+            if (null === $key) {
+                $key = serialize(array((string) $obj->getProductSaleElementsId(), (string) $obj->getCurrencyId()));
+            } // if key === null
+            self::$instances[$key] = $obj;
+        }
+    }
+
+    /**
+     * Removes an object from the instance pool.
+     *
+     * Propel keeps cached copies of objects in an instance pool when they are retrieved
+     * from the database.  In some cases -- especially when you override doDelete
+     * methods in your stub classes -- you may need to explicitly remove objects
+     * from the cache in order to prevent returning objects that no longer exist.
+     *
+     * @param mixed $value A \Thelia\Model\ProductPrice object or a primary key value.
+     */
+    public static function removeInstanceFromPool($value)
+    {
+        if (Propel::isInstancePoolingEnabled() && null !== $value) {
+            if (is_object($value) && $value instanceof \Thelia\Model\ProductPrice) {
+                $key = serialize(array((string) $value->getProductSaleElementsId(), (string) $value->getCurrencyId()));
+
+            } elseif (is_array($value) && count($value) === 2) {
+                // assume we've been passed a primary key";
+                $key = serialize(array((string) $value[0], (string) $value[1]));
+            } elseif ($value instanceof Criteria) {
+                self::$instances = [];
+
+                return;
+            } else {
+                $e = new PropelException("Invalid value passed to removeInstanceFromPool().  Expected primary key or \Thelia\Model\ProductPrice object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true)));
+                throw $e;
+            }
+
+            unset(self::$instances[$key]);
+        }
+    }
+
     /**
      * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
      *
@@ -200,11 +247,11 @@ class ProductPriceTableMap extends TableMap
     public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
         // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('ProductSaleElementsId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('CurrencyId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
             return null;
         }
 
-        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('ProductSaleElementsId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('CurrencyId', TableMap::TYPE_PHPNAME, $indexType)]));
     }
 
     /**
@@ -222,11 +269,7 @@ class ProductPriceTableMap extends TableMap
     public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
 
-            return (int) $row[
-                            $indexType == TableMap::TYPE_NUM
-                            ? 0 + $offset
-                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-                        ];
+            return $pks;
     }
 
     /**
@@ -324,7 +367,6 @@ class ProductPriceTableMap extends TableMap
     public static function addSelectColumns(Criteria $criteria, $alias = null)
     {
         if (null === $alias) {
-            $criteria->addSelectColumn(ProductPriceTableMap::ID);
             $criteria->addSelectColumn(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID);
             $criteria->addSelectColumn(ProductPriceTableMap::CURRENCY_ID);
             $criteria->addSelectColumn(ProductPriceTableMap::PRICE);
@@ -332,7 +374,6 @@ class ProductPriceTableMap extends TableMap
             $criteria->addSelectColumn(ProductPriceTableMap::CREATED_AT);
             $criteria->addSelectColumn(ProductPriceTableMap::UPDATED_AT);
         } else {
-            $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.PRODUCT_SALE_ELEMENTS_ID');
             $criteria->addSelectColumn($alias . '.CURRENCY_ID');
             $criteria->addSelectColumn($alias . '.PRICE');
@@ -390,7 +431,17 @@ class ProductPriceTableMap extends TableMap
             $criteria = $values->buildPkeyCriteria();
         } else { // it's a primary key, or an array of pks
             $criteria = new Criteria(ProductPriceTableMap::DATABASE_NAME);
-            $criteria->add(ProductPriceTableMap::ID, (array) $values, Criteria::IN);
+            // primary key is composite; we therefore, expect
+            // the primary key passed to be an array of pkey values
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
+                // array is not multi-dimensional
+                $values = array($values);
+            }
+            foreach ($values as $value) {
+                $criterion = $criteria->getNewCriterion(ProductPriceTableMap::PRODUCT_SALE_ELEMENTS_ID, $value[0]);
+                $criterion->addAnd($criteria->getNewCriterion(ProductPriceTableMap::CURRENCY_ID, $value[1]));
+                $criteria->addOr($criterion);
+            }
         }
 
         $query = ProductPriceQuery::create()->mergeWith($criteria);
@@ -436,10 +487,6 @@ class ProductPriceTableMap extends TableMap
             $criteria = $criteria->buildCriteria(); // build Criteria from ProductPrice object
         }
 
-        if ($criteria->containsKey(ProductPriceTableMap::ID) && $criteria->keyContainsValue(ProductPriceTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductPriceTableMap::ID.')');
-        }
-
 
         // Set the correct dbName
         $query = ProductPriceQuery::create()->mergeWith($criteria);
diff --git a/install/thelia.sql b/install/thelia.sql
index d38d45379..0346ffba8 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -1213,14 +1213,13 @@ DROP TABLE IF EXISTS `product_price`;
 
 CREATE TABLE `product_price`
 (
-    `id` INTEGER NOT NULL AUTO_INCREMENT,
     `product_sale_elements_id` INTEGER NOT NULL,
     `currency_id` INTEGER NOT NULL,
     `price` FLOAT NOT NULL,
     `promo_price` FLOAT,
     `created_at` DATETIME,
     `updated_at` DATETIME,
-    PRIMARY KEY (`id`),
+    PRIMARY KEY (`product_sale_elements_id`,`currency_id`),
     INDEX `idx_product_price_product_sale_elements_id` (`product_sale_elements_id`),
     INDEX `idx_product_price_currency_id` (`currency_id`),
     CONSTRAINT `fk_product_price_product_sale_elements_id`
diff --git a/local/config/schema.xml b/local/config/schema.xml
index 39f649650..afb7b2c41 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <database defaultIdMethod="native" name="thelia">
   <table name="category" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
@@ -924,9 +924,8 @@
     <behavior name="timestampable" />
   </table>
   <table name="product_price" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_sale_elements_id" required="true" type="INTEGER" />
-    <column name="currency_id" required="true" type="INTEGER" />
+    <column name="product_sale_elements_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="currency_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="price" required="true" type="FLOAT" />
     <column name="promo_price" type="FLOAT" />
     <foreign-key foreignTable="product_sale_elements" name="fk_product_price_product_sale_elements_id" onDelete="CASCADE">

From 1971240fcace36a1e100cc40299978fb6d0e5b62 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Tue, 10 Sep 2013 12:22:58 +0200
Subject: [PATCH 02/55] currency in product loop

---
 core/lib/Thelia/Core/Template/Loop/Product.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index b7a7c13fe..22860adbb 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -307,7 +307,9 @@ class Product extends BaseI18nLoop
             $minPriceJoin->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', $joiningTable, ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'global_price_data');
             $minPriceJoin->setJoinType(Criteria::LEFT_JOIN);
 
-            $search->addJoinObject($minPriceJoin);
+            $currency = $this->request->getSession()->getCurrency();
+            $search->addJoinObject($minPriceJoin, 'min_price_join')
+                ->addJoinCondition('min_price_join', '`global_price_data`.`currency_id` = ?', $currency, null, \PDO::PARAM_INT);
         }
 
         /*
@@ -339,6 +341,9 @@ class Product extends BaseI18nLoop
         $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_highest_price');
         $search->withColumn('ROUND(MIN(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_lowest_price');
 
+        $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_highest_price_default_currency');
+        $search->withColumn('ROUND(MIN(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_lowest_price_default_currency');
+
 
         $current = $this->getCurrent();
 
@@ -502,6 +507,8 @@ class Product extends BaseI18nLoop
             }
         }
 
+        var_dump($search->toString());
+
         /* perform search */
         $products = $this->search($search, $pagination);
 

From 6353b8670c75cbdc0346a2afc466d77b9450b98c Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Tue, 10 Sep 2013 14:36:06 +0200
Subject: [PATCH 03/55] Saving current status

---
 .gitignore                                           | 1 +
 templates/admin/default/product-attributes-edit.html | 1 -
 web/index_dev.php                                    | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index cad92f7a8..f208419b9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ web/cache/*
 web/.htaccess
 phpdoc*.log
 php-cs
+xhprof/
diff --git a/templates/admin/default/product-attributes-edit.html b/templates/admin/default/product-attributes-edit.html
index 30d74d258..e69de29bb 100644
--- a/templates/admin/default/product-attributes-edit.html
+++ b/templates/admin/default/product-attributes-edit.html
@@ -1 +0,0 @@
-test
\ No newline at end of file
diff --git a/web/index_dev.php b/web/index_dev.php
index 8991dc4a8..be97da3ea 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -9,7 +9,8 @@ require __DIR__ . '/../core/bootstrap.php';
 
 $trustIp = array(
   '::1',
-  '127.0.0.1'
+  '127.0.0.1',
+  '192.168.56.1'
 );
 
 $request = Request::createFromGlobals();

From 79e40013e2bb4ecdf8b3974c190618bc77bbec7a Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 14:50:51 +0200
Subject: [PATCH 04/55] updating customer form

---
 core/lib/Thelia/Form/CustomerCreation.php | 70 ++++++++++++++++++-----
 templates/default/register.html           |  9 +--
 2 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index 1bc88407b..0627e770a 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -26,6 +26,7 @@ use Symfony\Component\Validator\Constraints;
 use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\CustomerQuery;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class CustomerCreation
@@ -43,55 +44,88 @@ class CustomerCreation extends BaseForm
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "firstname"
+                "label" => Translator::getInstance()->trans("First Name"),
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "lastname"
+                "label" => Translator::getInstance()->trans("Last Name"),
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "address"
+                "label_for" => array(
+                    "for" => "address"
+                ),
+                "label" => Translator::getInstance()->trans("Street Address")
             ))
             ->add("address2", "text", array(
-                "label" => "Address Line 2"
+                "label" => Translator::getInstance()->trans("Address Line 2"),
+                "label_attr" => array(
+                    "for" => "address2"
+                )
             ))
             ->add("address3", "text", array(
-                "label" => "Address Line 3"
+                "label" => Translator::getInstance()->trans("Address Line 3"),
+                "label_attr" => array(
+                    "for" => "address3"
+                )
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "city"
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "country"
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "title"
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title"
+                )
             ))
             ->add("email", "email", array(
                 "constraints" => array(
@@ -104,9 +138,12 @@ class CustomerCreation extends BaseForm
                         )
                     ))
                 ),
-                "label" => "email"
+                "label" => Translator::getInstance()->trans("Email Address"),
+                "label_attr" => array(
+                    "for" => "email"
+                )
             ))
-            ->add("email_confirm", "email", array(
+/*            ->add("email_confirm", "email", array(
                 "constraints" => array(
                     new Constraints\Callback(array(
                         "methods" => array(
@@ -116,13 +153,16 @@ class CustomerCreation extends BaseForm
                     ))
                 ),
                 "label" => "email confirmation"
-            ))
+            ))*/
             ->add("password", "password", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
                     new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
                 ),
-                "label" => "password"
+                "label" => Translator::getInstance()->trans("Password"),
+                "label_attr" => array(
+                    "for" => "password"
+                )
             ))
             ->add("password_confirm", "password", array(
                 "constraints" => array(
diff --git a/templates/default/register.html b/templates/default/register.html
index e38830743..faa780674 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -17,7 +17,7 @@
         <article class="col-main" role="main" aria-labelledby="main-label">
 
             <h1 id="main-label" class="page-header">{intl l="Create New Account"}</h1>
-            {form name=""}
+            {form name="thelia.customer.creation"}
             <form id="form-register" class="form-horizontal" action="" method="post" role="form">
 
                 <fieldset id="register-info" class="panel panel">
@@ -41,13 +41,14 @@
                                 <span class="help-block"><i class="icon-remove"></i> Invalid input!</span>
                             </div>
                         </div><!--/.form-group-->
-
+                        {form_field form=$form field="email"}
                         <div class="form-group group-email">
-                            <label class="control-label" for="email">Email Address: <span class="required">*</span></label>
+                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
                             <div class="control-input">
-                                <input type="email" name="email" id="email" class="form-control" placeholder="johndoe@domain.com" required>
+                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" required value="">
                             </div>
                         </div><!--/.form-group-->
+                        {/form_field}
 
                         <div class="form-group group-phone">
                             <label class="control-label" for="phone">Telephone: <span class="required">*</span></label>

From c7544faf6575572d4ce15f4ba8b7dd340fd6ae99 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 15:17:55 +0200
Subject: [PATCH 05/55] change variable identifier in customer template

---
 templates/admin/default/customers.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index ea498f72c..35c67f076 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -61,14 +61,14 @@
                         <tbody>
                         {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
                             <tr>
-                                <td>{#REF}</td>
+                                <td>{$REF}</td>
 
                                 <td>
-                                    {#COMPANY}
+                                    {$COMPANY}
                                 </td>
 
                                 <td class="object-title">
-                                    {#FIRSTNAME} {#LASTNAME}
+                                    {$FIRSTNAME} {$LASTNAME}
                                 </td>
 
                                 {module_include location='customer_list_row'}
@@ -87,7 +87,7 @@
                                             <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
                                         {/loop}
                                         {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
+                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
                                         {/loop}
                                         {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
                                             <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
@@ -110,21 +110,21 @@
         <div class="col-md-12 text-center">
 
             <ul class="pagination pagination-centered">
-                {if #customer_page != 1}
+                {if $customer_page != 1}
                     <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
                 {else}
                     <li class="disabled"><a href="#">&laquo;</a></li>
                 {/if}
 
             {pageloop rel="customer_list"}
-                {if #PAGE != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
+                {if $PAGE != $CURRENT}
+                    <li><a href="{url path="/admin/customers" page="{$PAGE}"}">{$PAGE}</a></li>
                 {else}
-                    <li class="active"><a href="#">#PAGE</a></li>
+                    <li class="active"><a href="#">{$PAGE}</a></li>
                 {/if}
 
-                {if #PAGE == #LAST && #LAST != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">&raquo;</a></li>
+                {if $PAGE == $LAST && $LAST != $CURRENT}
+                    <li><a href="{url path="/admin/customers" page="{$PAGE}"}">&raquo;</a></li>
                 {else}
                     <li class="disabled"><a href="#">&raquo;</a></li>
                 {/if}

From 281ec337aa0c4583c374dbb61f69be8195554e8a Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Tue, 10 Sep 2013 15:45:29 +0200
Subject: [PATCH 06/55] Started product attributes management

---
 .../Thelia/Config/Resources/routing/admin.xml |   4 +-
 install/INSTALL-TODO.txt                      |   1 -
 install/insert.sql                            | 542 +++++++++---------
 reset_install.bat                             |   4 +-
 templates/admin/default/admin-layout.tpl      |   4 +
 templates/admin/default/configuration.html    |   6 +-
 .../includes/generic-create-dialog.html       |   3 +-
 7 files changed, 283 insertions(+), 281 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index e8262117b..0f4e7bfae 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -149,11 +149,11 @@
 
     <!-- attribute and feature routes  management -->
 
-    <route id="admin.configuration.attribute" path="/admin/configuration/product_attributes">
+    <route id="admin.configuration.product-attribute.default" path="/admin/configuration/product-attributes">
         <default key="_controller">Thelia\Controller\Admin\AttributeController::defaultAction</default>
     </route>
 
-    <route id="admin.configuration.attribute.edit" path="/admin/configuration/product_attributes/update">
+    <route id="admin.configuration.product-attribute.edit" path="/admin/configuration/product-attributes/update">
         <default key="_controller">Thelia\Controller\Admin\AttributeController::updateAction</default>
     </route>
 
diff --git a/install/INSTALL-TODO.txt b/install/INSTALL-TODO.txt
index 8ea68554e..0b8001fe9 100755
--- a/install/INSTALL-TODO.txt
+++ b/install/INSTALL-TODO.txt
@@ -3,7 +3,6 @@ A faire dans la procédure d'install
 
 Variables Config à initialiser:
 
-- base_url : url de base de la boutique avec / final (ex. http://www.boutique.com/, ou http://www.boutique.com/path/to/thelia2/ )
 - base_admin_template : chemin du template admin relatif au repertoire template (ex. admin/default)
 - default_locale : la locale par défaut (ex. en_US), à utiliser pour les fichiers de traduction
 - asset_dir_from_web_root : le chemin relatif à /web du repertoires des assets (ex. assets)
diff --git a/install/insert.sql b/install/insert.sql
index 344381a37..774d22472 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -1,6 +1,6 @@
 INSERT INTO `lang`(`id`,`title`,`code`,`locale`,`url`,`date_format`,`time_format`,`datetime_format`,`decimal_separator`,`thousands_separator`,`decimals`,`by_default`,`created_at`,`updated_at`)VALUES
 (1, 'Français', 'fr', 'fr_FR', '', 'd/m/Y', 'H:i:s', 'd/m/y H:i:s', ',', ' ', '2', '1', NOW(), NOW()),
-(2, 'English', 'en', 'en_EN', '', 'm-d-Y', 'h:i:s', 'm-d-Y h:i:s', '.', ' ', '2', '0', NOW(), NOW()),
+(2, 'English', 'en', 'en_US', '', 'm-d-Y', 'h:i:s', 'm-d-Y h:i:s', '.', ' ', '2', '0', NOW(), NOW()),
 (3, 'castellano', 'es', 'es_ES', '', 'm-d-Y', 'h:i:s', 'm-d-Y h:i:s', ',', '.', '2', '0', NOW(), NOW()),
 (4, 'Italiano', 'it', 'it_IT', '', 'd/m/Y', 'H:i:s', 'd/m/y H:i:s', ',', ' ', '2', '0', NOW(), NOW());
 
@@ -28,11 +28,11 @@ INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `upda
 
 INSERT INTO `customer_title_i18n` (`id`, `locale`, `short`, `long`) VALUES
 (1, 'fr_FR', 'Mr', 'Monsieur'),
-(1, 'en_UK', 'M', 'Mister'),
+(1, 'en_US', 'M', 'Mister'),
 (2, 'fr_FR', 'Mrs', 'Madame'),
-(2, 'en_UK', 'Mme', 'Misses'),
+(2, 'en_US', 'Mme', 'Misses'),
 (3, 'fr_FR', 'Miss', 'Madamemoiselle'),
-(3, 'en_UK', 'Mlle', 'Miss');
+(3, 'en_US', 'Mlle', 'Miss');
 
 INSERT INTO `currency` (`id` ,`code` ,`symbol` ,`rate`, `position` ,`by_default` ,`created_at` ,`updated_at`)
 VALUES
@@ -43,11 +43,11 @@ VALUES
 INSERT INTO `currency_i18n` (`id` ,`locale` ,`name`)
 VALUES
 (1, 'fr_FR', 'Euro'),
-(1, 'en_UK', 'Euro'),
+(1, 'en_US', 'Euro'),
 (2, 'fr_FR', 'Dollar Américain'),
-(2, 'en_UK', 'United States Dollar'),
+(2, 'en_US', 'United States Dollar'),
 (3, 'fr_FR', 'Livre anglaise'),
-(3, 'en_UK', 'UK Pound');
+(3, 'en_US', 'UK Pound');
 
 
 INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `created_at`, `updated_at`) VALUES
@@ -317,795 +317,795 @@ INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `cr
 (268, NULL, '840', 'US', 'USA', NOW(), NOW());
 
 INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
-(1, 'en_UK', 'Afghanistan', '', '', ''),
+(1, 'en_US', 'Afghanistan', '', '', ''),
 (1, 'es_ES', 'Afganistán', '', '', ''),
 (1, 'fr_FR', 'Afghanistan', '', '', ''),
-(2, 'en_UK', 'South Africa', '', '', ''),
+(2, 'en_US', 'South Africa', '', '', ''),
 (2, 'es_ES', 'Sudáfrica', '', '', ''),
 (2, 'fr_FR', 'Afrique du Sud', '', '', ''),
-(3, 'en_UK', 'Albania', '', '', ''),
+(3, 'en_US', 'Albania', '', '', ''),
 (3, 'es_ES', 'Albania', '', '', ''),
 (3, 'fr_FR', 'Albanie', '', '', ''),
-(4, 'en_UK', 'Algeria', '', '', ''),
+(4, 'en_US', 'Algeria', '', '', ''),
 (4, 'es_ES', 'Argelia', '', '', ''),
 (4, 'fr_FR', 'Algérie', '', '', ''),
-(5, 'en_UK', 'Germany', '', '', ''),
+(5, 'en_US', 'Germany', '', '', ''),
 (5, 'es_ES', 'Alemania', '', '', ''),
 (5, 'fr_FR', 'Allemagne', '', '', ''),
-(6, 'en_UK', 'Andorra', '', '', ''),
+(6, 'en_US', 'Andorra', '', '', ''),
 (6, 'es_ES', 'Andorra', '', '', ''),
 (6, 'fr_FR', 'Andorre', '', '', ''),
-(7, 'en_UK', 'Angola', '', '', ''),
+(7, 'en_US', 'Angola', '', '', ''),
 (7, 'es_ES', 'Angola', '', '', ''),
 (7, 'fr_FR', 'Angola', '', '', ''),
-(8, 'en_UK', 'Antigua and Barbuda', '', '', ''),
+(8, 'en_US', 'Antigua and Barbuda', '', '', ''),
 (8, 'es_ES', 'Antigua y Barbuda', '', '', ''),
 (8, 'fr_FR', 'Antigua-et-Barbuda', '', '', ''),
-(9, 'en_UK', 'Saudi Arabia', '', '', ''),
+(9, 'en_US', 'Saudi Arabia', '', '', ''),
 (9, 'es_ES', 'Arabia Saudita', '', '', ''),
 (9, 'fr_FR', 'Arabie saoudite', '', '', ''),
-(10, 'en_UK', 'Argentina', '', '', ''),
+(10, 'en_US', 'Argentina', '', '', ''),
 (10, 'es_ES', 'Argentina', '', '', ''),
 (10, 'fr_FR', 'Argentine', '', '', ''),
-(11, 'en_UK', 'Armenia', '', '', ''),
+(11, 'en_US', 'Armenia', '', '', ''),
 (11, 'es_ES', 'Armenia', '', '', ''),
 (11, 'fr_FR', 'Arménie', '', '', ''),
-(12, 'en_UK', 'Australia', '', '', ''),
+(12, 'en_US', 'Australia', '', '', ''),
 (12, 'es_ES', 'Australia', '', '', ''),
 (12, 'fr_FR', 'Australie', '', '', ''),
-(13, 'en_UK', 'Austria', '', '', ''),
+(13, 'en_US', 'Austria', '', '', ''),
 (13, 'es_ES', 'Austria', '', '', ''),
 (13, 'fr_FR', 'Autriche', '', '', ''),
-(14, 'en_UK', 'Azerbaijan', '', '', ''),
+(14, 'en_US', 'Azerbaijan', '', '', ''),
 (14, 'es_ES', 'Azerbaiyán', '', '', ''),
 (14, 'fr_FR', 'Azerbaïdjan', '', '', ''),
-(15, 'en_UK', 'Bahamas', '', '', ''),
+(15, 'en_US', 'Bahamas', '', '', ''),
 (15, 'es_ES', 'Bahamas', '', '', ''),
 (15, 'fr_FR', 'Bahamas', '', '', ''),
-(16, 'en_UK', 'Bahrain', '', '', ''),
+(16, 'en_US', 'Bahrain', '', '', ''),
 (16, 'es_ES', 'Bahrein', '', '', ''),
 (16, 'fr_FR', 'Bahreïn', '', '', ''),
-(17, 'en_UK', 'Bangladesh', '', '', ''),
+(17, 'en_US', 'Bangladesh', '', '', ''),
 (17, 'es_ES', 'Bangladesh', '', '', ''),
 (17, 'fr_FR', 'Bangladesh', '', '', ''),
-(18, 'en_UK', 'Barbados', '', '', ''),
+(18, 'en_US', 'Barbados', '', '', ''),
 (18, 'es_ES', 'Barbados', '', '', ''),
 (18, 'fr_FR', 'Barbade', '', '', ''),
-(19, 'en_UK', 'Belarus', '', '', ''),
+(19, 'en_US', 'Belarus', '', '', ''),
 (19, 'es_ES', 'Belarús', '', '', ''),
 (19, 'fr_FR', 'Belau', '', '', ''),
-(20, 'en_UK', 'Belgium', '', '', ''),
+(20, 'en_US', 'Belgium', '', '', ''),
 (20, 'es_ES', 'Bélgica', '', '', ''),
 (20, 'fr_FR', 'Belgique', '', '', ''),
-(21, 'en_UK', 'Belize', '', '', ''),
+(21, 'en_US', 'Belize', '', '', ''),
 (21, 'es_ES', 'Belice', '', '', ''),
 (21, 'fr_FR', 'Belize', '', '', ''),
-(22, 'en_UK', 'Benin', '', '', ''),
+(22, 'en_US', 'Benin', '', '', ''),
 (22, 'es_ES', 'Benin', '', '', ''),
 (22, 'fr_FR', 'Bénin', '', '', ''),
-(23, 'en_UK', 'Bhutan', '', '', ''),
+(23, 'en_US', 'Bhutan', '', '', ''),
 (23, 'es_ES', 'Bhután', '', '', ''),
 (23, 'fr_FR', 'Bhoutan', '', '', ''),
-(24, 'en_UK', 'Bielorussia', '', '', ''),
+(24, 'en_US', 'Bielorussia', '', '', ''),
 (24, 'es_ES', 'Bielorusia', '', '', ''),
 (24, 'fr_FR', 'Biélorussie', '', '', ''),
-(25, 'en_UK', 'Burma', '', '', ''),
+(25, 'en_US', 'Burma', '', '', ''),
 (25, 'es_ES', 'Birmania', '', '', ''),
 (25, 'fr_FR', 'Birmanie', '', '', ''),
-(26, 'en_UK', 'Bolivia', '', '', ''),
+(26, 'en_US', 'Bolivia', '', '', ''),
 (26, 'es_ES', 'Bolivia', '', '', ''),
 (26, 'fr_FR', 'Bolivie', '', '', ''),
-(27, 'en_UK', 'Bosnia and Herzegovina', '', '', ''),
+(27, 'en_US', 'Bosnia and Herzegovina', '', '', ''),
 (27, 'es_ES', 'Bosnia y Herzegovina', '', '', ''),
 (27, 'fr_FR', 'Bosnie-Herzégovine', '', '', ''),
-(28, 'en_UK', 'Botswana', '', '', ''),
+(28, 'en_US', 'Botswana', '', '', ''),
 (28, 'es_ES', 'Botswana', '', '', ''),
 (28, 'fr_FR', 'Botswana', '', '', ''),
-(29, 'en_UK', 'Brazil', '', '', ''),
+(29, 'en_US', 'Brazil', '', '', ''),
 (29, 'es_ES', 'Brasil', '', '', ''),
 (29, 'fr_FR', 'Brésil', '', '', ''),
-(30, 'en_UK', 'Brunei', '', '', ''),
+(30, 'en_US', 'Brunei', '', '', ''),
 (30, 'es_ES', 'Brunei', '', '', ''),
 (30, 'fr_FR', 'Brunei', '', '', ''),
-(31, 'en_UK', 'Bulgaria', '', '', ''),
+(31, 'en_US', 'Bulgaria', '', '', ''),
 (31, 'es_ES', 'Bulgaria', '', '', ''),
 (31, 'fr_FR', 'Bulgarie', '', '', ''),
-(32, 'en_UK', 'Burkina', '', '', ''),
+(32, 'en_US', 'Burkina', '', '', ''),
 (32, 'es_ES', 'Burkina', '', '', ''),
 (32, 'fr_FR', 'Burkina', '', '', ''),
-(33, 'en_UK', 'Burundi', '', '', ''),
+(33, 'en_US', 'Burundi', '', '', ''),
 (33, 'es_ES', 'Burundi', '', '', ''),
 (33, 'fr_FR', 'Burundi', '', '', ''),
-(34, 'en_UK', 'Cambodia', '', '', ''),
+(34, 'en_US', 'Cambodia', '', '', ''),
 (34, 'es_ES', 'Camboya', '', '', ''),
 (34, 'fr_FR', 'Cambodge', '', '', ''),
-(35, 'en_UK', 'Cameroon', '', '', ''),
+(35, 'en_US', 'Cameroon', '', '', ''),
 (35, 'es_ES', 'Camerún', '', '', ''),
 (35, 'fr_FR', 'Cameroun', '', '', ''),
-(37, 'en_UK', 'Cape Verde', '', '', ''),
+(37, 'en_US', 'Cape Verde', '', '', ''),
 (37, 'es_ES', 'Cabo Verde', '', '', ''),
 (37, 'fr_FR', 'Cap-Vert', '', '', ''),
-(38, 'en_UK', 'Chile', '', '', ''),
+(38, 'en_US', 'Chile', '', '', ''),
 (38, 'es_ES', 'Chile', '', '', ''),
 (38, 'fr_FR', 'Chili', '', '', ''),
-(39, 'en_UK', 'China', '', '', ''),
+(39, 'en_US', 'China', '', '', ''),
 (39, 'es_ES', 'China', '', '', ''),
 (39, 'fr_FR', 'Chine', '', '', ''),
-(40, 'en_UK', 'Cyprus', '', '', ''),
+(40, 'en_US', 'Cyprus', '', '', ''),
 (40, 'es_ES', 'Chipre', '', '', ''),
 (40, 'fr_FR', 'Chypre', '', '', ''),
-(41, 'en_UK', 'Colombia', '', '', ''),
+(41, 'en_US', 'Colombia', '', '', ''),
 (41, 'es_ES', 'Colombia', '', '', ''),
 (41, 'fr_FR', 'Colombie', '', '', ''),
-(42, 'en_UK', 'Comoros', '', '', ''),
+(42, 'en_US', 'Comoros', '', '', ''),
 (42, 'es_ES', 'Comoras', '', '', ''),
 (42, 'fr_FR', 'Comores', '', '', ''),
-(43, 'en_UK', 'Congo', '', '', ''),
+(43, 'en_US', 'Congo', '', '', ''),
 (43, 'es_ES', 'Congo', '', '', ''),
 (43, 'fr_FR', 'Congo', '', '', ''),
-(44, 'en_UK', 'Cook Islands', '', '', ''),
+(44, 'en_US', 'Cook Islands', '', '', ''),
 (44, 'es_ES', 'Cook', '', '', ''),
 (44, 'fr_FR', 'Cook', '', '', ''),
-(45, 'en_UK', 'North Korea', '', '', ''),
+(45, 'en_US', 'North Korea', '', '', ''),
 (45, 'es_ES', 'Corea del Norte', '', '', ''),
 (45, 'fr_FR', 'Corée du Nord', '', '', ''),
-(46, 'en_UK', 'South Korea', '', '', ''),
+(46, 'en_US', 'South Korea', '', '', ''),
 (46, 'es_ES', 'Corea del Sur', '', '', ''),
 (46, 'fr_FR', 'Corée du Sud', '', '', ''),
-(47, 'en_UK', 'Costa Rica', '', '', ''),
+(47, 'en_US', 'Costa Rica', '', '', ''),
 (47, 'es_ES', 'Costa Rica', '', '', ''),
 (47, 'fr_FR', 'Costa Rica', '', '', ''),
-(48, 'en_UK', 'Ivory Coast', '', '', ''),
+(48, 'en_US', 'Ivory Coast', '', '', ''),
 (48, 'es_ES', 'Costa de Marfil', '', '', ''),
 (48, 'fr_FR', 'Côte dIvoire', '', '', ''),
-(49, 'en_UK', 'Croatia', '', '', ''),
+(49, 'en_US', 'Croatia', '', '', ''),
 (49, 'es_ES', 'Croacia', '', '', ''),
 (49, 'fr_FR', 'Croatie', '', '', ''),
-(50, 'en_UK', 'Cuba', '', '', ''),
+(50, 'en_US', 'Cuba', '', '', ''),
 (50, 'es_ES', 'Cuba', '', '', ''),
 (50, 'fr_FR', 'Cuba', '', '', ''),
-(51, 'en_UK', 'Denmark', '', '', ''),
+(51, 'en_US', 'Denmark', '', '', ''),
 (51, 'es_ES', 'Dinamarca', '', '', ''),
 (51, 'fr_FR', 'Danemark', '', '', ''),
-(52, 'en_UK', 'Djibouti', '', '', ''),
+(52, 'en_US', 'Djibouti', '', '', ''),
 (52, 'es_ES', 'Djibouti', '', '', ''),
 (52, 'fr_FR', 'Djibouti', '', '', ''),
-(53, 'en_UK', 'Dominica', '', '', ''),
+(53, 'en_US', 'Dominica', '', '', ''),
 (53, 'es_ES', 'Dominica', '', '', ''),
 (53, 'fr_FR', 'Dominique', '', '', ''),
-(54, 'en_UK', 'Egypt', '', '', ''),
+(54, 'en_US', 'Egypt', '', '', ''),
 (54, 'es_ES', 'Egipto', '', '', ''),
 (54, 'fr_FR', 'Égypte', '', '', ''),
-(55, 'en_UK', 'United Arab Emirates', '', '', ''),
+(55, 'en_US', 'United Arab Emirates', '', '', ''),
 (55, 'es_ES', 'Emiratos Árabes Unidos', '', '', ''),
 (55, 'fr_FR', 'Émirats arabes unis', '', '', ''),
-(56, 'en_UK', 'Ecuador', '', '', ''),
+(56, 'en_US', 'Ecuador', '', '', ''),
 (56, 'es_ES', 'Ecuador', '', '', ''),
 (56, 'fr_FR', 'Équateur', '', '', ''),
-(57, 'en_UK', 'Eritrea', '', '', ''),
+(57, 'en_US', 'Eritrea', '', '', ''),
 (57, 'es_ES', 'Eritrea', '', '', ''),
 (57, 'fr_FR', 'Érythrée', '', '', ''),
-(58, 'en_UK', 'Spain', '', '', ''),
+(58, 'en_US', 'Spain', '', '', ''),
 (58, 'es_ES', 'España', '', '', ''),
 (58, 'fr_FR', 'Espagne', '', '', ''),
-(59, 'en_UK', 'Estonia', '', '', ''),
+(59, 'en_US', 'Estonia', '', '', ''),
 (59, 'es_ES', 'Estonia', '', '', ''),
 (59, 'fr_FR', 'Estonie', '', '', ''),
-(61, 'en_UK', 'Ethiopia', '', '', ''),
+(61, 'en_US', 'Ethiopia', '', '', ''),
 (61, 'es_ES', 'Etiopía', '', '', ''),
 (61, 'fr_FR', 'Éthiopie', '', '', ''),
-(62, 'en_UK', 'Fiji', '', '', ''),
+(62, 'en_US', 'Fiji', '', '', ''),
 (62, 'es_ES', 'Fiji', '', '', ''),
 (62, 'fr_FR', 'Fidji', '', '', ''),
-(63, 'en_UK', 'Finland', '', '', ''),
+(63, 'en_US', 'Finland', '', '', ''),
 (63, 'es_ES', 'Finlandia', '', '', ''),
 (63, 'fr_FR', 'Finlande', '', '', ''),
-(64, 'en_UK', 'France metropolitan', '', '', ''),
+(64, 'en_US', 'France metropolitan', '', '', ''),
 (64, 'es_ES', 'Francia', '', '', ''),
 (64, 'fr_FR', 'France métropolitaine', '', '', ''),
-(65, 'en_UK', 'Gabon', '', '', ''),
+(65, 'en_US', 'Gabon', '', '', ''),
 (65, 'es_ES', 'Gabón', '', '', ''),
 (65, 'fr_FR', 'Gabon', '', '', ''),
-(66, 'en_UK', 'Gambia', '', '', ''),
+(66, 'en_US', 'Gambia', '', '', ''),
 (66, 'es_ES', 'Gambia', '', '', ''),
 (66, 'fr_FR', 'Gambie', '', '', ''),
-(67, 'en_UK', 'Georgia', '', '', ''),
+(67, 'en_US', 'Georgia', '', '', ''),
 (67, 'es_ES', 'Georgia', '', '', ''),
 (67, 'fr_FR', 'Géorgie', '', '', ''),
-(68, 'en_UK', 'Ghana', '', '', ''),
+(68, 'en_US', 'Ghana', '', '', ''),
 (68, 'es_ES', 'Ghana', '', '', ''),
 (68, 'fr_FR', 'Ghana', '', '', ''),
-(69, 'en_UK', 'Greece', '', '', ''),
+(69, 'en_US', 'Greece', '', '', ''),
 (69, 'es_ES', 'Grecia', '', '', ''),
 (69, 'fr_FR', 'Grèce', '', '', ''),
-(70, 'en_UK', 'Grenada', '', '', ''),
+(70, 'en_US', 'Grenada', '', '', ''),
 (70, 'es_ES', 'Granada', '', '', ''),
 (70, 'fr_FR', 'Grenade', '', '', ''),
-(71, 'en_UK', 'Guatemala', '', '', ''),
+(71, 'en_US', 'Guatemala', '', '', ''),
 (71, 'es_ES', 'Guatemala', '', '', ''),
 (71, 'fr_FR', 'Guatemala', '', '', ''),
-(72, 'en_UK', 'Guinea', '', '', ''),
+(72, 'en_US', 'Guinea', '', '', ''),
 (72, 'es_ES', 'Guinea', '', '', ''),
 (72, 'fr_FR', 'Guinée', '', '', ''),
-(73, 'en_UK', 'Guinea-Bissau', '', '', ''),
+(73, 'en_US', 'Guinea-Bissau', '', '', ''),
 (73, 'es_ES', 'Guinea-Bissau', '', '', ''),
 (73, 'fr_FR', 'Guinée-Bissao', '', '', ''),
-(74, 'en_UK', 'Equatorial Guinea', '', '', ''),
+(74, 'en_US', 'Equatorial Guinea', '', '', ''),
 (74, 'es_ES', 'Guinea Ecuatorial', '', '', ''),
 (74, 'fr_FR', 'Guinée équatoriale', '', '', ''),
-(75, 'en_UK', 'Guyana', '', '', ''),
+(75, 'en_US', 'Guyana', '', '', ''),
 (75, 'es_ES', 'Guyana', '', '', ''),
 (75, 'fr_FR', 'Guyana', '', '', ''),
-(76, 'en_UK', 'Haiti', '', '', ''),
+(76, 'en_US', 'Haiti', '', '', ''),
 (76, 'es_ES', 'Haití', '', '', ''),
 (76, 'fr_FR', 'Haïti', '', '', ''),
-(77, 'en_UK', 'Honduras', '', '', ''),
+(77, 'en_US', 'Honduras', '', '', ''),
 (77, 'es_ES', 'Honduras', '', '', ''),
 (77, 'fr_FR', 'Honduras', '', '', ''),
-(78, 'en_UK', 'Hungary', '', '', ''),
+(78, 'en_US', 'Hungary', '', '', ''),
 (78, 'es_ES', 'Hungría', '', '', ''),
 (78, 'fr_FR', 'Hongrie', '', '', ''),
-(79, 'en_UK', 'India', '', '', ''),
+(79, 'en_US', 'India', '', '', ''),
 (79, 'es_ES', 'India', '', '', ''),
 (79, 'fr_FR', 'Inde', '', '', ''),
-(80, 'en_UK', 'Indonesia', '', '', ''),
+(80, 'en_US', 'Indonesia', '', '', ''),
 (80, 'es_ES', 'Indonesia', '', '', ''),
 (80, 'fr_FR', 'Indonésie', '', '', ''),
-(81, 'en_UK', 'Iran', '', '', ''),
+(81, 'en_US', 'Iran', '', '', ''),
 (81, 'es_ES', 'Irán', '', '', ''),
 (81, 'fr_FR', 'Iran', '', '', ''),
-(82, 'en_UK', 'Iraq', '', '', ''),
+(82, 'en_US', 'Iraq', '', '', ''),
 (82, 'es_ES', 'Iraq', '', '', ''),
 (82, 'fr_FR', 'Iraq', '', '', ''),
-(83, 'en_UK', 'Ireland', '', '', ''),
+(83, 'en_US', 'Ireland', '', '', ''),
 (83, 'es_ES', 'Irlanda', '', '', ''),
 (83, 'fr_FR', 'Irlande', '', '', ''),
-(84, 'en_UK', 'Iceland', '', '', ''),
+(84, 'en_US', 'Iceland', '', '', ''),
 (84, 'es_ES', 'Islandia', '', '', ''),
 (84, 'fr_FR', 'Islande', '', '', ''),
-(85, 'en_UK', 'Israel', '', '', ''),
+(85, 'en_US', 'Israel', '', '', ''),
 (85, 'es_ES', 'Israel', '', '', ''),
 (85, 'fr_FR', 'Israël', '', '', ''),
-(86, 'en_UK', 'Italy', '', '', ''),
+(86, 'en_US', 'Italy', '', '', ''),
 (86, 'es_ES', 'Italia', '', '', ''),
 (86, 'fr_FR', 'Italie', '', '', ''),
-(87, 'en_UK', 'Jamaica', '', '', ''),
+(87, 'en_US', 'Jamaica', '', '', ''),
 (87, 'es_ES', 'Jamaica', '', '', ''),
 (87, 'fr_FR', 'Jamaïque', '', '', ''),
-(88, 'en_UK', 'Japan', '', '', ''),
+(88, 'en_US', 'Japan', '', '', ''),
 (88, 'es_ES', 'Japón', '', '', ''),
 (88, 'fr_FR', 'Japon', '', '', ''),
-(89, 'en_UK', 'Jordan', '', '', ''),
+(89, 'en_US', 'Jordan', '', '', ''),
 (89, 'es_ES', 'Jordania', '', '', ''),
 (89, 'fr_FR', 'Jordanie', '', '', ''),
-(90, 'en_UK', 'Kazakhstan', '', '', ''),
+(90, 'en_US', 'Kazakhstan', '', '', ''),
 (90, 'es_ES', 'Kazajstán', '', '', ''),
 (90, 'fr_FR', 'Kazakhstan', '', '', ''),
-(91, 'en_UK', 'Kenya', '', '', ''),
+(91, 'en_US', 'Kenya', '', '', ''),
 (91, 'es_ES', 'Kenia', '', '', ''),
 (91, 'fr_FR', 'Kenya', '', '', ''),
-(92, 'en_UK', 'Kyrgyzstan', '', '', ''),
+(92, 'en_US', 'Kyrgyzstan', '', '', ''),
 (92, 'es_ES', 'Kirguistán', '', '', ''),
 (92, 'fr_FR', 'Kirghizistan', '', '', ''),
-(93, 'en_UK', 'Kiribati', '', '', ''),
+(93, 'en_US', 'Kiribati', '', '', ''),
 (93, 'es_ES', 'Kiribati', '', '', ''),
 (93, 'fr_FR', 'Kiribati', '', '', ''),
-(94, 'en_UK', 'Kuwait', '', '', ''),
+(94, 'en_US', 'Kuwait', '', '', ''),
 (94, 'es_ES', 'Kuwait', '', '', ''),
 (94, 'fr_FR', 'Koweït', '', '', ''),
-(95, 'en_UK', 'Laos', '', '', ''),
+(95, 'en_US', 'Laos', '', '', ''),
 (95, 'es_ES', 'Laos', '', '', ''),
 (95, 'fr_FR', 'Laos', '', '', ''),
-(96, 'en_UK', 'Lesotho', '', '', ''),
+(96, 'en_US', 'Lesotho', '', '', ''),
 (96, 'es_ES', 'Lesotho', '', '', ''),
 (96, 'fr_FR', 'Lesotho', '', '', ''),
-(97, 'en_UK', 'Latvia', '', '', ''),
+(97, 'en_US', 'Latvia', '', '', ''),
 (97, 'es_ES', 'Letonia', '', '', ''),
 (97, 'fr_FR', 'Lettonie', '', '', ''),
-(98, 'en_UK', 'Lebanon', '', '', ''),
+(98, 'en_US', 'Lebanon', '', '', ''),
 (98, 'es_ES', 'Líbano', '', '', ''),
 (98, 'fr_FR', 'Liban', '', '', ''),
-(99, 'en_UK', 'Liberia', '', '', ''),
+(99, 'en_US', 'Liberia', '', '', ''),
 (99, 'es_ES', 'Liberia', '', '', ''),
 (99, 'fr_FR', 'Liberia', '', '', ''),
-(100, 'en_UK', 'Libya', '', '', ''),
+(100, 'en_US', 'Libya', '', '', ''),
 (100, 'es_ES', 'Libia', '', '', ''),
 (100, 'fr_FR', 'Libye', '', '', ''),
-(101, 'en_UK', 'Liechtenstein', '', '', ''),
+(101, 'en_US', 'Liechtenstein', '', '', ''),
 (101, 'es_ES', 'Liechtenstein', '', '', ''),
 (101, 'fr_FR', 'Liechtenstein', '', '', ''),
-(102, 'en_UK', 'Lithuania', '', '', ''),
+(102, 'en_US', 'Lithuania', '', '', ''),
 (102, 'es_ES', 'Lituania', '', '', ''),
 (102, 'fr_FR', 'Lituanie', '', '', ''),
-(103, 'en_UK', 'Luxembourg', '', '', ''),
+(103, 'en_US', 'Luxembourg', '', '', ''),
 (103, 'es_ES', 'Luxemburgo', '', '', ''),
 (103, 'fr_FR', 'Luxembourg', '', '', ''),
-(104, 'en_UK', 'Macedonia', '', '', ''),
+(104, 'en_US', 'Macedonia', '', '', ''),
 (104, 'es_ES', 'Macedonia', '', '', ''),
 (104, 'fr_FR', 'Macédoine', '', '', ''),
-(105, 'en_UK', 'Madagascar', '', '', ''),
+(105, 'en_US', 'Madagascar', '', '', ''),
 (105, 'es_ES', 'Madagascar', '', '', ''),
 (105, 'fr_FR', 'Madagascar', '', '', ''),
-(106, 'en_UK', 'Malaysia', '', '', ''),
+(106, 'en_US', 'Malaysia', '', '', ''),
 (106, 'es_ES', 'Malasia', '', '', ''),
 (106, 'fr_FR', 'Malaisie', '', '', ''),
-(107, 'en_UK', 'Malawi', '', '', ''),
+(107, 'en_US', 'Malawi', '', '', ''),
 (107, 'es_ES', 'Malawi', '', '', ''),
 (107, 'fr_FR', 'Malawi', '', '', ''),
-(108, 'en_UK', 'Maldives', '', '', ''),
+(108, 'en_US', 'Maldives', '', '', ''),
 (108, 'es_ES', 'Maldivas', '', '', ''),
 (108, 'fr_FR', 'Maldives', '', '', ''),
-(109, 'en_UK', 'Mali', '', '', ''),
+(109, 'en_US', 'Mali', '', '', ''),
 (109, 'es_ES', 'Malí', '', '', ''),
 (109, 'fr_FR', 'Mali', '', '', ''),
-(110, 'en_UK', 'Malta', '', '', ''),
+(110, 'en_US', 'Malta', '', '', ''),
 (110, 'es_ES', 'Malta', '', '', ''),
 (110, 'fr_FR', 'Malte', '', '', ''),
-(111, 'en_UK', 'Morocco', '', '', ''),
+(111, 'en_US', 'Morocco', '', '', ''),
 (111, 'es_ES', 'Marruecos', '', '', ''),
 (111, 'fr_FR', 'Maroc', '', '', ''),
-(112, 'en_UK', 'Marshall Islands', '', '', ''),
+(112, 'en_US', 'Marshall Islands', '', '', ''),
 (112, 'es_ES', 'Marshall', '', '', ''),
 (112, 'fr_FR', 'Marshall', '', '', ''),
-(113, 'en_UK', 'Mauritius', '', '', ''),
+(113, 'en_US', 'Mauritius', '', '', ''),
 (113, 'es_ES', 'Mauricio', '', '', ''),
 (113, 'fr_FR', 'Maurice', '', '', ''),
-(114, 'en_UK', 'Mauritania', '', '', ''),
+(114, 'en_US', 'Mauritania', '', '', ''),
 (114, 'es_ES', 'Mauritania', '', '', ''),
 (114, 'fr_FR', 'Mauritanie', '', '', ''),
-(115, 'en_UK', 'Mexico', '', '', ''),
+(115, 'en_US', 'Mexico', '', '', ''),
 (115, 'es_ES', 'Méjico', '', '', ''),
 (115, 'fr_FR', 'Mexique', '', '', ''),
-(116, 'en_UK', 'Micronesia', '', '', ''),
+(116, 'en_US', 'Micronesia', '', '', ''),
 (116, 'es_ES', 'Micronesia', '', '', ''),
 (116, 'fr_FR', 'Micronésie', '', '', ''),
-(117, 'en_UK', 'Moldova', '', '', ''),
+(117, 'en_US', 'Moldova', '', '', ''),
 (117, 'es_ES', 'Moldova', '', '', ''),
 (117, 'fr_FR', 'Moldavie', '', '', ''),
-(118, 'en_UK', 'Monaco', '', '', ''),
+(118, 'en_US', 'Monaco', '', '', ''),
 (118, 'es_ES', 'Mónaco', '', '', ''),
 (118, 'fr_FR', 'Monaco', '', '', ''),
-(119, 'en_UK', 'Mongolia', '', '', ''),
+(119, 'en_US', 'Mongolia', '', '', ''),
 (119, 'es_ES', 'Mongolia', '', '', ''),
 (119, 'fr_FR', 'Mongolie', '', '', ''),
-(120, 'en_UK', 'Mozambique', '', '', ''),
+(120, 'en_US', 'Mozambique', '', '', ''),
 (120, 'es_ES', 'Mozambique', '', '', ''),
 (120, 'fr_FR', 'Mozambique', '', '', ''),
-(121, 'en_UK', 'Namibia', '', '', ''),
+(121, 'en_US', 'Namibia', '', '', ''),
 (121, 'es_ES', 'Namibia', '', '', ''),
 (121, 'fr_FR', 'Namibie', '', '', ''),
-(122, 'en_UK', 'Nauru', '', '', ''),
+(122, 'en_US', 'Nauru', '', '', ''),
 (122, 'es_ES', 'Nauru', '', '', ''),
 (122, 'fr_FR', 'Nauru', '', '', ''),
-(123, 'en_UK', 'Nepal', '', '', ''),
+(123, 'en_US', 'Nepal', '', '', ''),
 (123, 'es_ES', 'Nepal', '', '', ''),
 (123, 'fr_FR', 'Népal', '', '', ''),
-(124, 'en_UK', 'Nicaragua', '', '', ''),
+(124, 'en_US', 'Nicaragua', '', '', ''),
 (124, 'es_ES', 'Nicaragua', '', '', ''),
 (124, 'fr_FR', 'Nicaragua', '', '', ''),
-(125, 'en_UK', 'Niger', '', '', ''),
+(125, 'en_US', 'Niger', '', '', ''),
 (125, 'es_ES', 'Níger', '', '', ''),
 (125, 'fr_FR', 'Niger', '', '', ''),
-(126, 'en_UK', 'Nigeria', '', '', ''),
+(126, 'en_US', 'Nigeria', '', '', ''),
 (126, 'es_ES', 'Nigeria', '', '', ''),
 (126, 'fr_FR', 'Nigeria', '', '', ''),
-(127, 'en_UK', 'Niue', '', '', ''),
+(127, 'en_US', 'Niue', '', '', ''),
 (127, 'es_ES', 'Niue', '', '', ''),
 (127, 'fr_FR', 'Niue', '', '', ''),
-(128, 'en_UK', 'Norway', '', '', ''),
+(128, 'en_US', 'Norway', '', '', ''),
 (128, 'es_ES', 'Noruega', '', '', ''),
 (128, 'fr_FR', 'Norvège', '', '', ''),
-(129, 'en_UK', 'New Zealand', '', '', ''),
+(129, 'en_US', 'New Zealand', '', '', ''),
 (129, 'es_ES', 'Nueva Zelandia', '', '', ''),
 (129, 'fr_FR', 'Nouvelle-Zélande', '', '', ''),
-(130, 'en_UK', 'Oman', '', '', ''),
+(130, 'en_US', 'Oman', '', '', ''),
 (130, 'es_ES', 'Omán', '', '', ''),
 (130, 'fr_FR', 'Oman', '', '', ''),
-(131, 'en_UK', 'Uganda', '', '', ''),
+(131, 'en_US', 'Uganda', '', '', ''),
 (131, 'es_ES', 'Uganda', '', '', ''),
 (131, 'fr_FR', 'Ouganda', '', '', ''),
-(132, 'en_UK', 'Uzbekistan', '', '', ''),
+(132, 'en_US', 'Uzbekistan', '', '', ''),
 (132, 'es_ES', 'Uzbekistán', '', '', ''),
 (132, 'fr_FR', 'Ouzbékistan', '', '', ''),
-(133, 'en_UK', 'Pakistan', '', '', ''),
+(133, 'en_US', 'Pakistan', '', '', ''),
 (133, 'es_ES', 'Pakistán', '', '', ''),
 (133, 'fr_FR', 'Pakistan', '', '', ''),
-(134, 'en_UK', 'Panama', '', '', ''),
+(134, 'en_US', 'Panama', '', '', ''),
 (134, 'es_ES', 'Panamá', '', '', ''),
 (134, 'fr_FR', 'Panama', '', '', ''),
-(135, 'en_UK', 'Papua Nueva Guinea', '', '', ''),
+(135, 'en_US', 'Papua Nueva Guinea', '', '', ''),
 (135, 'es_ES', 'Papua Nueva Guinea', '', '', ''),
 (135, 'fr_FR', 'Papouasie', '', '', ''),
-(136, 'en_UK', 'Paraguay', '', '', ''),
+(136, 'en_US', 'Paraguay', '', '', ''),
 (136, 'es_ES', 'Paraguay', '', '', ''),
 (136, 'fr_FR', 'Paraguay', '', '', ''),
-(137, 'en_UK', 'Netherlands', '', '', ''),
+(137, 'en_US', 'Netherlands', '', '', ''),
 (137, 'es_ES', 'Países Bajos', '', '', ''),
 (137, 'fr_FR', 'Pays-Bas', '', '', ''),
-(138, 'en_UK', 'Peru', '', '', ''),
+(138, 'en_US', 'Peru', '', '', ''),
 (138, 'es_ES', 'Perú', '', '', ''),
 (138, 'fr_FR', 'Pérou', '', '', ''),
-(139, 'en_UK', 'Philippines', '', '', ''),
+(139, 'en_US', 'Philippines', '', '', ''),
 (139, 'es_ES', 'Filipinas', '', '', ''),
 (139, 'fr_FR', 'Philippines', '', '', ''),
-(140, 'en_UK', 'Poland', '', '', ''),
+(140, 'en_US', 'Poland', '', '', ''),
 (140, 'es_ES', 'Polonia', '', '', ''),
 (140, 'fr_FR', 'Pologne', '', '', ''),
-(141, 'en_UK', 'Portugal', '', '', ''),
+(141, 'en_US', 'Portugal', '', '', ''),
 (141, 'es_ES', 'Portugal', '', '', ''),
 (141, 'fr_FR', 'Portugal', '', '', ''),
-(142, 'en_UK', 'Qatar', '', '', ''),
+(142, 'en_US', 'Qatar', '', '', ''),
 (142, 'es_ES', 'Qatar', '', '', ''),
 (142, 'fr_FR', 'Qatar', '', '', ''),
-(143, 'en_UK', 'Central African Republic', '', '', ''),
+(143, 'en_US', 'Central African Republic', '', '', ''),
 (143, 'es_ES', 'República Centroafricana', '', '', ''),
 (143, 'fr_FR', 'République centrafricaine', '', '', ''),
-(144, 'en_UK', 'Dominican Republic', '', '', ''),
+(144, 'en_US', 'Dominican Republic', '', '', ''),
 (144, 'es_ES', 'República Dominicana', '', '', ''),
 (144, 'fr_FR', 'République dominicaine', '', '', ''),
-(145, 'en_UK', 'Czech Republic', '', '', ''),
+(145, 'en_US', 'Czech Republic', '', '', ''),
 (145, 'es_ES', 'República Checa', '', '', ''),
 (145, 'fr_FR', 'République tchèque', '', '', ''),
-(146, 'en_UK', 'Romania', '', '', ''),
+(146, 'en_US', 'Romania', '', '', ''),
 (146, 'es_ES', 'Rumania', '', '', ''),
 (146, 'fr_FR', 'Roumanie', '', '', ''),
-(147, 'en_UK', 'United Kingdom', '', '', ''),
+(147, 'en_US', 'United Kingdom', '', '', ''),
 (147, 'es_ES', 'Reino Unido', '', '', ''),
 (147, 'fr_FR', 'Royaume-Uni', '', '', ''),
-(148, 'en_UK', 'Russia', '', '', ''),
+(148, 'en_US', 'Russia', '', '', ''),
 (148, 'es_ES', 'Rusia', '', '', ''),
 (148, 'fr_FR', 'Russie', '', '', ''),
-(149, 'en_UK', 'Rwanda', '', '', ''),
+(149, 'en_US', 'Rwanda', '', '', ''),
 (149, 'es_ES', 'Ruanda', '', '', ''),
 (149, 'fr_FR', 'Rwanda', '', '', ''),
-(150, 'en_UK', 'Saint Kitts and Nevis', '', '', ''),
+(150, 'en_US', 'Saint Kitts and Nevis', '', '', ''),
 (150, 'es_ES', 'San Cristóbal', '', '', ''),
 (150, 'fr_FR', 'Saint-Christophe-et-Niévès', '', '', ''),
-(151, 'en_UK', 'Saint Lucia', '', '', ''),
+(151, 'en_US', 'Saint Lucia', '', '', ''),
 (151, 'es_ES', 'Santa Lucía', '', '', ''),
 (151, 'fr_FR', 'Sainte-Lucie', '', '', ''),
-(152, 'en_UK', 'San Marino', '', '', ''),
+(152, 'en_US', 'San Marino', '', '', ''),
 (152, 'es_ES', 'San Marino', '', '', ''),
 (152, 'fr_FR', 'Saint-Marin', '', '', ''),
-(153, 'en_UK', 'Saint Vincent and the Grenadines', '', '', ''),
+(153, 'en_US', 'Saint Vincent and the Grenadines', '', '', ''),
 (153, 'es_ES', 'San Vicente y las Granadinas', '', '', ''),
 (153, 'fr_FR', 'Saint-Vincent-et-les Grenadines', '', '', ''),
-(154, 'en_UK', 'Solomon Islands', '', '', ''),
+(154, 'en_US', 'Solomon Islands', '', '', ''),
 (154, 'es_ES', 'Salomón', '', '', ''),
 (154, 'fr_FR', 'Salomon', '', '', ''),
-(155, 'en_UK', 'El Salvador', '', '', ''),
+(155, 'en_US', 'El Salvador', '', '', ''),
 (155, 'es_ES', 'El Salvador', '', '', ''),
 (155, 'fr_FR', 'Salvador', '', '', ''),
-(156, 'en_UK', 'Western Samoa', '', '', ''),
+(156, 'en_US', 'Western Samoa', '', '', ''),
 (156, 'es_ES', 'Samoa', '', '', ''),
 (156, 'fr_FR', 'Samoa occidentales', '', '', ''),
-(157, 'en_UK', 'Sao Tome and Principe', '', '', ''),
+(157, 'en_US', 'Sao Tome and Principe', '', '', ''),
 (157, 'es_ES', 'Santo Tomé y Príncipe', '', '', ''),
 (157, 'fr_FR', 'Sao Tomé-et-Principe', '', '', ''),
-(158, 'en_UK', 'Senegal', '', '', ''),
+(158, 'en_US', 'Senegal', '', '', ''),
 (158, 'es_ES', 'Senegal', '', '', ''),
 (158, 'fr_FR', 'Sénégal', '', '', ''),
-(159, 'en_UK', 'Seychelles', '', '', ''),
+(159, 'en_US', 'Seychelles', '', '', ''),
 (159, 'es_ES', 'Seychelles', '', '', ''),
 (159, 'fr_FR', 'Seychelles', '', '', ''),
-(160, 'en_UK', 'Sierra Leone', '', '', ''),
+(160, 'en_US', 'Sierra Leone', '', '', ''),
 (160, 'es_ES', 'Sierra Leona', '', '', ''),
 (160, 'fr_FR', 'Sierra Leone', '', '', ''),
-(161, 'en_UK', 'Singapore', '', '', ''),
+(161, 'en_US', 'Singapore', '', '', ''),
 (161, 'es_ES', 'Singapur', '', '', ''),
 (161, 'fr_FR', 'Singapour', '', '', ''),
-(162, 'en_UK', 'Slovakia', '', '', ''),
+(162, 'en_US', 'Slovakia', '', '', ''),
 (162, 'es_ES', 'Eslovaquia', '', '', ''),
 (162, 'fr_FR', 'Slovaquie', '', '', ''),
-(163, 'en_UK', 'Slovenia', '', '', ''),
+(163, 'en_US', 'Slovenia', '', '', ''),
 (163, 'es_ES', 'Eslovenia', '', '', ''),
 (163, 'fr_FR', 'Slovénie', '', '', ''),
-(164, 'en_UK', 'Somalia', '', '', ''),
+(164, 'en_US', 'Somalia', '', '', ''),
 (164, 'es_ES', 'Somalia', '', '', ''),
 (164, 'fr_FR', 'Somalie', '', '', ''),
-(165, 'en_UK', 'Sudan', '', '', ''),
+(165, 'en_US', 'Sudan', '', '', ''),
 (165, 'es_ES', 'Sudán', '', '', ''),
 (165, 'fr_FR', 'Soudan', '', '', ''),
-(166, 'en_UK', 'Sri Lanka', '', '', ''),
+(166, 'en_US', 'Sri Lanka', '', '', ''),
 (166, 'es_ES', 'Sri Lanka', '', '', ''),
 (166, 'fr_FR', 'Sri Lanka', '', '', ''),
-(167, 'en_UK', 'Sweden', '', '', ''),
+(167, 'en_US', 'Sweden', '', '', ''),
 (167, 'es_ES', 'Suecia', '', '', ''),
 (167, 'fr_FR', 'Suède', '', '', ''),
-(168, 'en_UK', 'Switzerland', '', '', ''),
+(168, 'en_US', 'Switzerland', '', '', ''),
 (168, 'es_ES', 'Suiza', '', '', ''),
 (168, 'fr_FR', 'Suisse', '', '', ''),
-(169, 'en_UK', 'Suriname', '', '', ''),
+(169, 'en_US', 'Suriname', '', '', ''),
 (169, 'es_ES', 'Suriname', '', '', ''),
 (169, 'fr_FR', 'Suriname', '', '', ''),
-(170, 'en_UK', 'Swaziland', '', '', ''),
+(170, 'en_US', 'Swaziland', '', '', ''),
 (170, 'es_ES', 'Swazilandia', '', '', ''),
 (170, 'fr_FR', 'Swaziland', '', '', ''),
-(171, 'en_UK', 'Syria', '', '', ''),
+(171, 'en_US', 'Syria', '', '', ''),
 (171, 'es_ES', 'Siria', '', '', ''),
 (171, 'fr_FR', 'Syrie', '', '', ''),
-(172, 'en_UK', 'Tajikistan', '', '', ''),
+(172, 'en_US', 'Tajikistan', '', '', ''),
 (172, 'es_ES', 'Tayikistán', '', '', ''),
 (172, 'fr_FR', 'Tadjikistan', '', '', ''),
-(173, 'en_UK', 'Tanzania', '', '', ''),
+(173, 'en_US', 'Tanzania', '', '', ''),
 (173, 'es_ES', 'Tanzanía', '', '', ''),
 (173, 'fr_FR', 'Tanzanie', '', '', ''),
-(174, 'en_UK', 'Chad', '', '', ''),
+(174, 'en_US', 'Chad', '', '', ''),
 (174, 'es_ES', 'Chad', '', '', ''),
 (174, 'fr_FR', 'Tchad', '', '', ''),
-(175, 'en_UK', 'Thailand', '', '', ''),
+(175, 'en_US', 'Thailand', '', '', ''),
 (175, 'es_ES', 'Tailandia', '', '', ''),
 (175, 'fr_FR', 'Thaïlande', '', '', ''),
-(176, 'en_UK', 'Togo', '', '', ''),
+(176, 'en_US', 'Togo', '', '', ''),
 (176, 'es_ES', 'Togo', '', '', ''),
 (176, 'fr_FR', 'Togo', '', '', ''),
-(177, 'en_UK', 'Tonga', '', '', ''),
+(177, 'en_US', 'Tonga', '', '', ''),
 (177, 'es_ES', 'Tonga', '', '', ''),
 (177, 'fr_FR', 'Tonga', '', '', ''),
-(178, 'en_UK', 'Trinidad and Tobago', '', '', ''),
+(178, 'en_US', 'Trinidad and Tobago', '', '', ''),
 (178, 'es_ES', 'Trinidad y Tabago', '', '', ''),
 (178, 'fr_FR', 'Trinité-et-Tobago', '', '', ''),
-(179, 'en_UK', 'Tunisia', '', '', ''),
+(179, 'en_US', 'Tunisia', '', '', ''),
 (179, 'es_ES', 'Túnez', '', '', ''),
 (179, 'fr_FR', 'Tunisie', '', '', ''),
-(180, 'en_UK', 'Turkmenistan', '', '', ''),
+(180, 'en_US', 'Turkmenistan', '', '', ''),
 (180, 'es_ES', 'Turkmenistán', '', '', ''),
 (180, 'fr_FR', 'Turkménistan', '', '', ''),
-(181, 'en_UK', 'Turkey', '', '', ''),
+(181, 'en_US', 'Turkey', '', '', ''),
 (181, 'es_ES', 'Turquía', '', '', ''),
 (181, 'fr_FR', 'Turquie', '', '', ''),
-(182, 'en_UK', 'Tuvalu', '', '', ''),
+(182, 'en_US', 'Tuvalu', '', '', ''),
 (182, 'es_ES', 'Tuvalu', '', '', ''),
 (182, 'fr_FR', 'Tuvalu', '', '', ''),
-(183, 'en_UK', 'Ukraine', '', '', ''),
+(183, 'en_US', 'Ukraine', '', '', ''),
 (183, 'es_ES', 'Ucrania', '', '', ''),
 (183, 'fr_FR', 'Ukraine', '', '', ''),
-(184, 'en_UK', 'Uruguay', '', '', ''),
+(184, 'en_US', 'Uruguay', '', '', ''),
 (184, 'es_ES', 'Uruguay', '', '', ''),
 (184, 'fr_FR', 'Uruguay', '', '', ''),
-(185, 'en_UK', 'The Vatican', '', '', ''),
+(185, 'en_US', 'The Vatican', '', '', ''),
 (185, 'es_ES', 'El Vatican', '', '', ''),
 (185, 'fr_FR', 'Vatican', '', '', ''),
-(186, 'en_UK', 'Vanuatu', '', '', ''),
+(186, 'en_US', 'Vanuatu', '', '', ''),
 (186, 'es_ES', 'Vanuatu', '', '', ''),
 (186, 'fr_FR', 'Vanuatu', '', '', ''),
-(187, 'en_UK', 'Venezuela', '', '', ''),
+(187, 'en_US', 'Venezuela', '', '', ''),
 (187, 'es_ES', 'Venezuela', '', '', ''),
 (187, 'fr_FR', 'Venezuela', '', '', ''),
-(188, 'en_UK', 'Vietnam', '', '', ''),
+(188, 'en_US', 'Vietnam', '', '', ''),
 (188, 'es_ES', 'Viet Nam', '', '', ''),
 (188, 'fr_FR', 'Viêt Nam', '', '', ''),
-(189, 'en_UK', 'Yemen', '', '', ''),
+(189, 'en_US', 'Yemen', '', '', ''),
 (189, 'es_ES', 'Yemen', '', '', ''),
 (189, 'fr_FR', 'Yémen', '', '', ''),
-(190, 'en_UK', 'Yougoslavia', '', '', ''),
+(190, 'en_US', 'Yougoslavia', '', '', ''),
 (190, 'es_ES', 'Yugoslavia', '', '', ''),
 (190, 'fr_FR', 'Yougoslavie', '', '', ''),
-(191, 'en_UK', 'Zaire', '', '', ''),
+(191, 'en_US', 'Zaire', '', '', ''),
 (191, 'es_ES', 'Zaire', '', '', ''),
 (191, 'fr_FR', 'Zaïre', '', '', ''),
-(192, 'en_UK', 'Zambia', '', '', ''),
+(192, 'en_US', 'Zambia', '', '', ''),
 (192, 'es_ES', 'Zambia', '', '', ''),
 (192, 'fr_FR', 'Zambie', '', '', ''),
-(193, 'en_UK', 'Zimbabwe', '', '', ''),
+(193, 'en_US', 'Zimbabwe', '', '', ''),
 (193, 'es_ES', 'Zimbabwe', '', '', ''),
 (193, 'fr_FR', 'Zimbabwe', '', '', ''),
-(196, 'en_UK', 'USA - Alaska', '', '', ''),
+(196, 'en_US', 'USA - Alaska', '', '', ''),
 (196, 'es_ES', 'USA - Alaska', '', '', ''),
 (196, 'fr_FR', 'USA - Alaska', '', '', ''),
-(197, 'en_UK', 'USA - Arizona', '', '', ''),
+(197, 'en_US', 'USA - Arizona', '', '', ''),
 (197, 'es_ES', 'USA - Arizona', '', '', ''),
 (197, 'fr_FR', 'USA - Arizona', '', '', ''),
-(198, 'en_UK', 'USA - Arkansas', '', '', ''),
+(198, 'en_US', 'USA - Arkansas', '', '', ''),
 (198, 'es_ES', 'USA - Arkansas', '', '', ''),
 (198, 'fr_FR', 'USA - Arkansas', '', '', ''),
-(199, 'en_UK', 'USA - California', '', '', ''),
+(199, 'en_US', 'USA - California', '', '', ''),
 (199, 'es_ES', 'USA - California', '', '', ''),
 (199, 'fr_FR', 'USA - California', '', '', ''),
-(200, 'en_UK', 'USA - Colorado', '', '', ''),
+(200, 'en_US', 'USA - Colorado', '', '', ''),
 (200, 'es_ES', 'USA - Colorado', '', '', ''),
 (200, 'fr_FR', 'USA - Colorado', '', '', ''),
-(201, 'en_UK', 'USA - Connecticut', '', '', ''),
+(201, 'en_US', 'USA - Connecticut', '', '', ''),
 (201, 'es_ES', 'USA - Connecticut', '', '', ''),
 (201, 'fr_FR', 'USA - Connecticut', '', '', ''),
-(202, 'en_UK', 'USA - Delaware', '', '', ''),
+(202, 'en_US', 'USA - Delaware', '', '', ''),
 (202, 'es_ES', 'USA - Delaware', '', '', ''),
 (202, 'fr_FR', 'USA - Delaware', '', '', ''),
-(203, 'en_UK', 'USA - District Of Columbia', '', '', ''),
+(203, 'en_US', 'USA - District Of Columbia', '', '', ''),
 (203, 'es_ES', 'USA - District Of Columbia', '', '', ''),
 (203, 'fr_FR', 'USA - District Of Columbia', '', '', ''),
-(204, 'en_UK', 'USA - Florida', '', '', ''),
+(204, 'en_US', 'USA - Florida', '', '', ''),
 (204, 'es_ES', 'USA - Florida', '', '', ''),
 (204, 'fr_FR', 'USA - Florida', '', '', ''),
-(205, 'en_UK', 'USA - Georgia', '', '', ''),
+(205, 'en_US', 'USA - Georgia', '', '', ''),
 (205, 'es_ES', 'USA - Georgia', '', '', ''),
 (205, 'fr_FR', 'USA - Georgia', '', '', ''),
-(206, 'en_UK', 'USA - Hawaii', '', '', ''),
+(206, 'en_US', 'USA - Hawaii', '', '', ''),
 (206, 'es_ES', 'USA - Hawaii', '', '', ''),
 (206, 'fr_FR', 'USA - Hawaii', '', '', ''),
-(207, 'en_UK', 'USA - Idaho', '', '', ''),
+(207, 'en_US', 'USA - Idaho', '', '', ''),
 (207, 'es_ES', 'USA - Idaho', '', '', ''),
 (207, 'fr_FR', 'USA - Idaho', '', '', ''),
-(208, 'en_UK', 'USA - Illinois', '', '', ''),
+(208, 'en_US', 'USA - Illinois', '', '', ''),
 (208, 'es_ES', 'USA - Illinois', '', '', ''),
 (208, 'fr_FR', 'USA - Illinois', '', '', ''),
-(209, 'en_UK', 'USA - Indiana', '', '', ''),
+(209, 'en_US', 'USA - Indiana', '', '', ''),
 (209, 'es_ES', 'USA - Indiana', '', '', ''),
 (209, 'fr_FR', 'USA - Indiana', '', '', ''),
-(210, 'en_UK', 'USA - Iowa', '', '', ''),
+(210, 'en_US', 'USA - Iowa', '', '', ''),
 (210, 'es_ES', 'USA - Iowa', '', '', ''),
 (210, 'fr_FR', 'USA - Iowa', '', '', ''),
-(211, 'en_UK', 'USA - Kansas', '', '', ''),
+(211, 'en_US', 'USA - Kansas', '', '', ''),
 (211, 'es_ES', 'USA - Kansas', '', '', ''),
 (211, 'fr_FR', 'USA - Kansas', '', '', ''),
-(212, 'en_UK', 'USA - Kentucky', '', '', ''),
+(212, 'en_US', 'USA - Kentucky', '', '', ''),
 (212, 'es_ES', 'USA - Kentucky', '', '', ''),
 (212, 'fr_FR', 'USA - Kentucky', '', '', ''),
-(213, 'en_UK', 'USA - Louisiana', '', '', ''),
+(213, 'en_US', 'USA - Louisiana', '', '', ''),
 (213, 'es_ES', 'USA - Louisiana', '', '', ''),
 (213, 'fr_FR', 'USA - Louisiana', '', '', ''),
-(214, 'en_UK', 'USA - Maine', '', '', ''),
+(214, 'en_US', 'USA - Maine', '', '', ''),
 (214, 'es_ES', 'USA - Maine', '', '', ''),
 (214, 'fr_FR', 'USA - Maine', '', '', ''),
-(215, 'en_UK', 'USA - Maryland', '', '', ''),
+(215, 'en_US', 'USA - Maryland', '', '', ''),
 (215, 'es_ES', 'USA - Maryland', '', '', ''),
 (215, 'fr_FR', 'USA - Maryland', '', '', ''),
-(216, 'en_UK', 'USA - Massachusetts', '', '', ''),
+(216, 'en_US', 'USA - Massachusetts', '', '', ''),
 (216, 'es_ES', 'USA - Massachusetts', '', '', ''),
 (216, 'fr_FR', 'USA - Massachusetts', '', '', ''),
-(217, 'en_UK', 'USA - Michigan', '', '', ''),
+(217, 'en_US', 'USA - Michigan', '', '', ''),
 (217, 'es_ES', 'USA - Michigan', '', '', ''),
 (217, 'fr_FR', 'USA - Michigan', '', '', ''),
-(218, 'en_UK', 'USA - Minnesota', '', '', ''),
+(218, 'en_US', 'USA - Minnesota', '', '', ''),
 (218, 'es_ES', 'USA - Minnesota', '', '', ''),
 (218, 'fr_FR', 'USA - Minnesota', '', '', ''),
-(219, 'en_UK', 'USA - Mississippi', '', '', ''),
+(219, 'en_US', 'USA - Mississippi', '', '', ''),
 (219, 'es_ES', 'USA - Mississippi', '', '', ''),
 (219, 'fr_FR', 'USA - Mississippi', '', '', ''),
-(220, 'en_UK', 'USA - Missouri', '', '', ''),
+(220, 'en_US', 'USA - Missouri', '', '', ''),
 (220, 'es_ES', 'USA - Missouri', '', '', ''),
 (220, 'fr_FR', 'USA - Missouri', '', '', ''),
-(221, 'en_UK', 'USA - Montana', '', '', ''),
+(221, 'en_US', 'USA - Montana', '', '', ''),
 (221, 'es_ES', 'USA - Montana', '', '', ''),
 (221, 'fr_FR', 'USA - Montana', '', '', ''),
-(222, 'en_UK', 'USA - Nebraska', '', '', ''),
+(222, 'en_US', 'USA - Nebraska', '', '', ''),
 (222, 'es_ES', 'USA - Nebraska', '', '', ''),
 (222, 'fr_FR', 'USA - Nebraska', '', '', ''),
-(223, 'en_UK', 'USA - Nevada', '', '', ''),
+(223, 'en_US', 'USA - Nevada', '', '', ''),
 (223, 'es_ES', 'USA - Nevada', '', '', ''),
 (223, 'fr_FR', 'USA - Nevada', '', '', ''),
-(224, 'en_UK', 'USA - New Hampshire', '', '', ''),
+(224, 'en_US', 'USA - New Hampshire', '', '', ''),
 (224, 'es_ES', 'USA - New Hampshire', '', '', ''),
 (224, 'fr_FR', 'USA - New Hampshire', '', '', ''),
-(225, 'en_UK', 'USA - New Jersey', '', '', ''),
+(225, 'en_US', 'USA - New Jersey', '', '', ''),
 (225, 'es_ES', 'USA - New Jersey', '', '', ''),
 (225, 'fr_FR', 'USA - New Jersey', '', '', ''),
-(226, 'en_UK', 'USA - New Mexico', '', '', ''),
+(226, 'en_US', 'USA - New Mexico', '', '', ''),
 (226, 'es_ES', 'USA - New Mexico', '', '', ''),
 (226, 'fr_FR', 'USA - New Mexico', '', '', ''),
-(227, 'en_UK', 'USA - New York', '', '', ''),
+(227, 'en_US', 'USA - New York', '', '', ''),
 (227, 'es_ES', 'USA - New York', '', '', ''),
 (227, 'fr_FR', 'USA - New York', '', '', ''),
-(228, 'en_UK', 'USA - North Carolina', '', '', ''),
+(228, 'en_US', 'USA - North Carolina', '', '', ''),
 (228, 'es_ES', 'USA - North Carolina', '', '', ''),
 (228, 'fr_FR', 'USA - North Carolina', '', '', ''),
-(229, 'en_UK', 'USA - North Dakota', '', '', ''),
+(229, 'en_US', 'USA - North Dakota', '', '', ''),
 (229, 'es_ES', 'USA - North Dakota', '', '', ''),
 (229, 'fr_FR', 'USA - North Dakota', '', '', ''),
-(230, 'en_UK', 'USA - Ohio', '', '', ''),
+(230, 'en_US', 'USA - Ohio', '', '', ''),
 (230, 'es_ES', 'USA - Ohio', '', '', ''),
 (230, 'fr_FR', 'USA - Ohio', '', '', ''),
-(231, 'en_UK', 'USA - Oklahoma', '', '', ''),
+(231, 'en_US', 'USA - Oklahoma', '', '', ''),
 (231, 'es_ES', 'USA - Oklahoma', '', '', ''),
 (231, 'fr_FR', 'USA - Oklahoma', '', '', ''),
-(232, 'en_UK', 'USA - Oregon', '', '', ''),
+(232, 'en_US', 'USA - Oregon', '', '', ''),
 (232, 'es_ES', 'USA - Oregon', '', '', ''),
 (232, 'fr_FR', 'USA - Oregon', '', '', ''),
-(233, 'en_UK', 'USA - Pennsylvania', '', '', ''),
+(233, 'en_US', 'USA - Pennsylvania', '', '', ''),
 (233, 'es_ES', 'USA - Pennsylvania', '', '', ''),
 (233, 'fr_FR', 'USA - Pennsylvania', '', '', ''),
-(234, 'en_UK', 'USA - Rhode Island', '', '', ''),
+(234, 'en_US', 'USA - Rhode Island', '', '', ''),
 (234, 'es_ES', 'USA - Rhode Island', '', '', ''),
 (234, 'fr_FR', 'USA - Rhode Island', '', '', ''),
-(235, 'en_UK', 'USA - South Carolina', '', '', ''),
+(235, 'en_US', 'USA - South Carolina', '', '', ''),
 (235, 'es_ES', 'USA - South Carolina', '', '', ''),
 (235, 'fr_FR', 'USA - South Carolina', '', '', ''),
-(236, 'en_UK', 'USA - South Dakota', '', '', ''),
+(236, 'en_US', 'USA - South Dakota', '', '', ''),
 (236, 'es_ES', 'USA - South Dakota', '', '', ''),
 (236, 'fr_FR', 'USA - South Dakota', '', '', ''),
-(237, 'en_UK', 'USA - Tennessee', '', '', ''),
+(237, 'en_US', 'USA - Tennessee', '', '', ''),
 (237, 'es_ES', 'USA - Tennessee', '', '', ''),
 (237, 'fr_FR', 'USA - Tennessee', '', '', ''),
-(238, 'en_UK', 'USA - Texas', '', '', ''),
+(238, 'en_US', 'USA - Texas', '', '', ''),
 (238, 'es_ES', 'USA - Texas', '', '', ''),
 (238, 'fr_FR', 'USA - Texas', '', '', ''),
-(239, 'en_UK', 'USA - Utah', '', '', ''),
+(239, 'en_US', 'USA - Utah', '', '', ''),
 (239, 'es_ES', 'USA - Utah', '', '', ''),
 (239, 'fr_FR', 'USA - Utah', '', '', ''),
-(240, 'en_UK', 'USA - Vermont', '', '', ''),
+(240, 'en_US', 'USA - Vermont', '', '', ''),
 (240, 'es_ES', 'USA - Vermont', '', '', ''),
 (240, 'fr_FR', 'USA - Vermont', '', '', ''),
-(241, 'en_UK', 'USA - Virginia', '', '', ''),
+(241, 'en_US', 'USA - Virginia', '', '', ''),
 (241, 'es_ES', 'USA - Virginia', '', '', ''),
 (241, 'fr_FR', 'USA - Virginia', '', '', ''),
-(242, 'en_UK', 'USA - Washington', '', '', ''),
+(242, 'en_US', 'USA - Washington', '', '', ''),
 (242, 'es_ES', 'USA - Washington', '', '', ''),
 (242, 'fr_FR', 'USA - Washington', '', '', ''),
-(243, 'en_UK', 'USA - West Virginia', '', '', ''),
+(243, 'en_US', 'USA - West Virginia', '', '', ''),
 (243, 'es_ES', 'USA - West Virginia', '', '', ''),
 (243, 'fr_FR', 'USA - West Virginia', '', '', ''),
-(244, 'en_UK', 'USA - Wisconsin', '', '', ''),
+(244, 'en_US', 'USA - Wisconsin', '', '', ''),
 (244, 'es_ES', 'USA - Wisconsin', '', '', ''),
 (244, 'fr_FR', 'USA - Wisconsin', '', '', ''),
-(245, 'en_UK', 'USA - Wyoming', '', '', ''),
+(245, 'en_US', 'USA - Wyoming', '', '', ''),
 (245, 'es_ES', 'USA - Wyoming', '', '', ''),
 (245, 'fr_FR', 'USA - Wyoming', '', '', ''),
-(246, 'en_UK', 'Canada - Colombie-Britannique', '', '', ''),
+(246, 'en_US', 'Canada - Colombie-Britannique', '', '', ''),
 (246, 'es_ES', 'Canada - Colombie-Britannique', '', '', ''),
 (246, 'fr_FR', 'Canada - Colombie-Britannique', '', '', ''),
-(247, 'en_UK', 'Canada - Alberta', '', '', ''),
+(247, 'en_US', 'Canada - Alberta', '', '', ''),
 (247, 'es_ES', 'Canada - Alberta', '', '', ''),
 (247, 'fr_FR', 'Canada - Alberta', '', '', ''),
-(248, 'en_UK', 'Canada - Saskatchewan', '', '', ''),
+(248, 'en_US', 'Canada - Saskatchewan', '', '', ''),
 (248, 'es_ES', 'Canada - Saskatchewan', '', '', ''),
 (248, 'fr_FR', 'Canada - Saskatchewan', '', '', ''),
-(249, 'en_UK', 'Canada - Manitoba', '', '', ''),
+(249, 'en_US', 'Canada - Manitoba', '', '', ''),
 (249, 'es_ES', 'Canada - Manitoba', '', '', ''),
 (249, 'fr_FR', 'Canada - Manitoba', '', '', ''),
-(250, 'en_UK', 'Canada - Ontario', '', '', ''),
+(250, 'en_US', 'Canada - Ontario', '', '', ''),
 (250, 'es_ES', 'Canada - Ontario', '', '', ''),
 (250, 'fr_FR', 'Canada - Ontario', '', '', ''),
-(251, 'en_UK', 'Canada - Québec', '', '', ''),
+(251, 'en_US', 'Canada - Québec', '', '', ''),
 (251, 'es_ES', 'Canada - Québec', '', '', ''),
 (251, 'fr_FR', 'Canada - Québec', '', '', ''),
-(252, 'en_UK', 'Canada - Nouveau-Brunswick', '', '', ''),
+(252, 'en_US', 'Canada - Nouveau-Brunswick', '', '', ''),
 (252, 'es_ES', 'Canada - Nouveau-Brunswick', '', '', ''),
 (252, 'fr_FR', 'Canada - Nouveau-Brunswick', '', '', ''),
-(253, 'en_UK', 'Canada - Nouvelle-Écosse', '', '', ''),
+(253, 'en_US', 'Canada - Nouvelle-Écosse', '', '', ''),
 (253, 'es_ES', 'Canada - Nouvelle-Écosse', '', '', ''),
 (253, 'fr_FR', 'Canada - Nouvelle-Écosse', '', '', ''),
-(254, 'en_UK', 'Canada - Île-du-Prince-Édouard    ', '', '', ''),
+(254, 'en_US', 'Canada - Île-du-Prince-Édouard    ', '', '', ''),
 (254, 'es_ES', 'Canada - Île-du-Prince-Édouard    ', '', '', ''),
 (254, 'fr_FR', 'Canada - Île-du-Prince-Édouard    ', '', '', ''),
-(255, 'en_UK', 'Canada - Terre-Neuve-et-Labrador    ', '', '', ''),
+(255, 'en_US', 'Canada - Terre-Neuve-et-Labrador    ', '', '', ''),
 (255, 'es_ES', 'Canada - Terre-Neuve-et-Labrador    ', '', '', ''),
 (255, 'fr_FR', 'Canada - Terre-Neuve-et-Labrador    ', '', '', ''),
-(256, 'en_UK', 'Canada - Yukon', '', '', ''),
+(256, 'en_US', 'Canada - Yukon', '', '', ''),
 (256, 'es_ES', 'Canada - Yukon', '', '', ''),
 (256, 'fr_FR', 'Canada - Yukon', '', '', ''),
-(257, 'en_UK', 'Canada - Territoires-du-Nord-Ouest', '', '', ''),
+(257, 'en_US', 'Canada - Territoires-du-Nord-Ouest', '', '', ''),
 (257, 'es_ES', 'Canada - Territoires-du-Nord-Ouest', '', '', ''),
 (257, 'fr_FR', 'Canada - Territoires-du-Nord-Ouest', '', '', ''),
-(258, 'en_UK', 'Canada - Nunavut', '', '', ''),
+(258, 'en_US', 'Canada - Nunavut', '', '', ''),
 (258, 'es_ES', 'Canada - Nunavut', '', '', ''),
 (258, 'fr_FR', 'Canada - Nunavut', '', '', ''),
-(259, 'en_UK', 'Guadeloupe', '', '', ''),
+(259, 'en_US', 'Guadeloupe', '', '', ''),
 (259, 'es_ES', 'Guadeloupe', '', '', ''),
 (259, 'fr_FR', 'Guadeloupe', '', '', ''),
-(260, 'en_UK', 'Guyane Française', '', '', ''),
+(260, 'en_US', 'Guyane Française', '', '', ''),
 (260, 'es_ES', 'Guyane Française', '', '', ''),
 (260, 'fr_FR', 'Guyane Française', '', '', ''),
-(261, 'en_UK', 'Martinique', '', '', ''),
+(261, 'en_US', 'Martinique', '', '', ''),
 (261, 'es_ES', 'Martinique', '', '', ''),
 (261, 'fr_FR', 'Martinique', '', '', ''),
-(262, 'en_UK', 'Mayotte', '', '', ''),
+(262, 'en_US', 'Mayotte', '', '', ''),
 (262, 'es_ES', 'Mayotte', '', '', ''),
 (262, 'fr_FR', 'Mayotte', '', '', ''),
-(263, 'en_UK', 'Réunion(La)', '', '', ''),
+(263, 'en_US', 'Réunion(La)', '', '', ''),
 (263, 'es_ES', 'Réunion(La)', '', '', ''),
 (263, 'fr_FR', 'Réunion(La)', '', '', ''),
-(264, 'en_UK', 'St Pierre et Miquelon', '', '', ''),
+(264, 'en_US', 'St Pierre et Miquelon', '', '', ''),
 (264, 'es_ES', 'St Pierre et Miquelon', '', '', ''),
 (264, 'fr_FR', 'St Pierre et Miquelon', '', '', ''),
-(265, 'en_UK', 'Nouvelle-Calédonie', '', '', ''),
+(265, 'en_US', 'Nouvelle-Calédonie', '', '', ''),
 (265, 'es_ES', 'Nouvelle-Calédonie', '', '', ''),
 (265, 'fr_FR', 'Nouvelle-Calédonie', '', '', ''),
-(266, 'en_UK', 'Polynésie française', '', '', ''),
+(266, 'en_US', 'Polynésie française', '', '', ''),
 (266, 'es_ES', 'Polynésie française', '', '', ''),
 (266, 'fr_FR', 'Polynésie française', '', '', ''),
-(267, 'en_UK', 'Wallis-et-Futuna', '', '', ''),
+(267, 'en_US', 'Wallis-et-Futuna', '', '', ''),
 (267, 'es_ES', 'Wallis-et-Futuna', '', '', ''),
 (267, 'fr_FR', 'Wallis-et-Futuna', '', '', ''),
-(268, 'en_UK', 'USA - Alabama', '', '', ''),
+(268, 'en_US', 'USA - Alabama', '', '', ''),
 (268, 'es_ES', 'USA - Alabama', '', '', ''),
 (268, 'fr_FR', 'USA - Alabama', '', '', '');
diff --git a/reset_install.bat b/reset_install.bat
index d117e525b..0a12c43d2 100644
--- a/reset_install.bat
+++ b/reset_install.bat
@@ -14,10 +14,10 @@ if exist local\config\database.yml (
     ..\..\bin\propel build -v --output-dir=../../core/lib/
 
     echo [INFO] Building SQL CREATE file
-    ..\..\bin\propel sql:build -v --output-dir=../../install/
+    ..\..\bin\propel sql:build -v --output-dir=..\..\install
 
 
-    echo [INFO] Reloaded Thelia2 database
+    echo [INFO] Reloading Thelia2 database
     cd ..\..
     del install\sqldb.map
     php Thelia thelia:dev:reloadDB
diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index 59004fdc7..226355b7a 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -36,6 +36,8 @@
     {* Modules css are included here *}
 
     {module_include location='head_css'}
+
+    {debugbar_renderHead}
 </head>
 
 <body>
@@ -233,5 +235,7 @@
     {debugbar_render}
 	{* Modules scripts are included now *}
 	{module_include location='footer_js'}
+
+	{debugbar_render}
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/admin/default/configuration.html b/templates/admin/default/configuration.html
index 75e9d523c..70b7cffb8 100644
--- a/templates/admin/default/configuration.html
+++ b/templates/admin/default/configuration.html
@@ -25,21 +25,21 @@
                         {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.product_templates"}
 		                <tr>
 		                    <td><a href="{url path='/admin/configuration/product_templates'}">{intl l='Product templates'}</a></td>
-		                    <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/product_templates'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/product-templates'}"><i class="glyphicon glyphicon-edit"></i></a></td>
 		                </tr>
 		                {/loop}
 
                         {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.product_attributes"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/product_attributes'}">{intl l='Product attributes'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/product_attributes'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/product-attributes'}"><i class="glyphicon glyphicon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
                         {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.product_features"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/product_features'}">{intl l='Product features'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/product_features'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/product-features'}"><i class="glyphicon glyphicon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
diff --git a/templates/admin/default/includes/generic-create-dialog.html b/templates/admin/default/includes/generic-create-dialog.html
index c6a00a01b..f30825d5a 100755
--- a/templates/admin/default/includes/generic-create-dialog.html
+++ b/templates/admin/default/includes/generic-create-dialog.html
@@ -26,8 +26,7 @@ A generic modal creation dialog template. Parameters
             <form method="POST" action="{$form_action nofilter}" {$form_enctype nofilter}>
 
                 <div class="modal-body">
-
-                    {if ! empty($form_error_message)}<div class="alert alert-block alert-error" id="{$dialog_id}_error">{$form_error_message nofilter}</div>{/if}
+                    {if ! empty($form_error_message)}<div class="alert alert-danger" id="{$dialog_id}_error">{$form_error_message nofilter}</div>{/if}
 
                     {$dialog_body nofilter}
                 </div>

From 3c67903bd772624792558290ea1d2a169d79c8fa Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 15:46:19 +0200
Subject: [PATCH 07/55] add part of customer form in customer admin template

---
 core/lib/Thelia/Form/CustomerCreation.php | 13 +++-
 templates/default/register.html           | 90 +++++++++++++++--------
 2 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index 0627e770a..958f781b5 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -62,7 +62,7 @@ class CustomerCreation extends BaseForm
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label_for" => array(
+                "label_attr" => array(
                     "for" => "address"
                 ),
                 "label" => Translator::getInstance()->trans("Street Address")
@@ -79,6 +79,12 @@ class CustomerCreation extends BaseForm
                     "for" => "address3"
                 )
             ))
+            ->add("company", "text", array(
+                "label" => Translator::getInstance()->trans("Company name"),
+                "label_attr" => array(
+                    "for" => "company"
+                )
+            ))
             ->add("phone", "text", array(
                 "label" => Translator::getInstance()->trans("Phone"),
                 "label_attr" => array(
@@ -172,7 +178,10 @@ class CustomerCreation extends BaseForm
                         array($this, "verifyPasswordField")
                     )))
                 ),
-                "label" => "password confirmation"
+                "label" => "Password confirmation",
+                "label_attr" => array(
+                    "for" => "password_confirmation"
+                )
             ))
 
         ;
diff --git a/templates/default/register.html b/templates/default/register.html
index faa780674..7eea94239 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -18,7 +18,7 @@
 
             <h1 id="main-label" class="page-header">{intl l="Create New Account"}</h1>
             {form name="thelia.customer.creation"}
-            <form id="form-register" class="form-horizontal" action="" method="post" role="form">
+            <form id="form-register" class="form-horizontal" action="{url path="/customer/create"}" method="post" role="form">
 
                 <fieldset id="register-info" class="panel panel">
                     <div class="panel-heading">
@@ -26,49 +26,77 @@
                     </div>
 
                     <div class="panel-body">
-                        <div class="form-group group-firstname has-success">
-                            <label class="control-label" for="firstname">First Name: <span class="required">*</span></label>
-                            <div class="control-input">
-                                <input type="text" name="firstname" id="firstname" class="form-control" placeholder="John" autofocus required>
-                                <span class="help-block"><i class="icon-ok"></i> Available input!</span>
-                            </div>
-                        </div><!--/.form-group-->
-
-                        <div class="form-group group-lastname has-error">
-                            <label class="control-label " for="lastname">Last Name: <span class="required">*</span></label>
-                            <div class="control-input">
-                                <input type="text" name="lastname" id="lastname" class="form-control" placeholder="Doe" required>
-                                <span class="help-block"><i class="icon-remove"></i> Invalid input!</span>
-                            </div>
-                        </div><!--/.form-group-->
-                        {form_field form=$form field="email"}
-                        <div class="form-group group-email">
+                        {form_field form=$form field="firstname"}
+                        <div class="form-group group-firstname {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
                             <div class="control-input">
-                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" required value="">
+                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
+                                {if $error }
+                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                {elseif $value != "" && !$error}
+                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                {/if}
                             </div>
                         </div><!--/.form-group-->
                         {/form_field}
-
-                        <div class="form-group group-phone">
-                            <label class="control-label" for="phone">Telephone: <span class="required">*</span></label>
+                        {form_field form=$form field="lastname"}
+                            <div class="form-group group-lastname {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="email"}
+                        <div class="form-group group-email {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
                             <div class="control-input">
-                                <input type="tel" name="phone" id="phone" class="form-control" placeholder="(01) 02 03 04 05 " required>
-                            </div>
-                        </div><!--/.form-group-->
-
-                        <div class="form-group group-fax">
-                            <label class="control-label" for="fax">Fax: </label>
-                            <div class="control-input">
-                                <input type="tel" name="fax" id="fax" class="form-control" placeholder="(01) 02 03 04 05 ">
+                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" required value="{$smarty.get.email|default:$value}">
+                                {if $error }
+                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                {elseif $value != "" && !$error}
+                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                {/if}
                             </div>
                         </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="phone"}
+                            <div class="form-group group-phone {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="cellphone"}
+                            <div class="form-group group-cellphone {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
                     </div>
                 </fieldset>
 
                 <fieldset id="register-delivery" class="panel">
                     <div class="panel-heading">
-                        2. Delivery Informations
+                        2. {intl l="Delivery Informations"}
                     </div>
 
                     <div class="panel-body">

From eb7bc629642e0473aedffd68e1c9825256d06ebf Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 16:13:53 +0200
Subject: [PATCH 08/55] integrate new customer creation form

---
 core/lib/Thelia/Form/CustomerCreation.php | 81 ++++++++++++++++++-----
 1 file changed, 65 insertions(+), 16 deletions(-)

diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index 1bc88407b..958f781b5 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -26,6 +26,7 @@ use Symfony\Component\Validator\Constraints;
 use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\CustomerQuery;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class CustomerCreation
@@ -43,55 +44,94 @@ class CustomerCreation extends BaseForm
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "firstname"
+                "label" => Translator::getInstance()->trans("First Name"),
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "lastname"
+                "label" => Translator::getInstance()->trans("Last Name"),
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "address"
+                "label_attr" => array(
+                    "for" => "address"
+                ),
+                "label" => Translator::getInstance()->trans("Street Address")
             ))
             ->add("address2", "text", array(
-                "label" => "Address Line 2"
+                "label" => Translator::getInstance()->trans("Address Line 2"),
+                "label_attr" => array(
+                    "for" => "address2"
+                )
             ))
             ->add("address3", "text", array(
-                "label" => "Address Line 3"
+                "label" => Translator::getInstance()->trans("Address Line 3"),
+                "label_attr" => array(
+                    "for" => "address3"
+                )
+            ))
+            ->add("company", "text", array(
+                "label" => Translator::getInstance()->trans("Company name"),
+                "label_attr" => array(
+                    "for" => "company"
+                )
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "city"
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "country"
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "title"
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title"
+                )
             ))
             ->add("email", "email", array(
                 "constraints" => array(
@@ -104,9 +144,12 @@ class CustomerCreation extends BaseForm
                         )
                     ))
                 ),
-                "label" => "email"
+                "label" => Translator::getInstance()->trans("Email Address"),
+                "label_attr" => array(
+                    "for" => "email"
+                )
             ))
-            ->add("email_confirm", "email", array(
+/*            ->add("email_confirm", "email", array(
                 "constraints" => array(
                     new Constraints\Callback(array(
                         "methods" => array(
@@ -116,13 +159,16 @@ class CustomerCreation extends BaseForm
                     ))
                 ),
                 "label" => "email confirmation"
-            ))
+            ))*/
             ->add("password", "password", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
                     new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
                 ),
-                "label" => "password"
+                "label" => Translator::getInstance()->trans("Password"),
+                "label_attr" => array(
+                    "for" => "password"
+                )
             ))
             ->add("password_confirm", "password", array(
                 "constraints" => array(
@@ -132,7 +178,10 @@ class CustomerCreation extends BaseForm
                         array($this, "verifyPasswordField")
                     )))
                 ),
-                "label" => "password confirmation"
+                "label" => "Password confirmation",
+                "label_attr" => array(
+                    "for" => "password_confirmation"
+                )
             ))
 
         ;

From 5aa49d62fe3be15ea3943a3a1ae7175ca479870c Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 16:14:49 +0200
Subject: [PATCH 09/55] replace smarty variable identifier by $

---
 templates/admin/default/categories.html    |  4 ++--
 templates/admin/default/category-edit.html |  4 ++--
 templates/admin/default/coupon-read.html   | 20 ++++++++++----------
 templates/admin/default/customers.html     | 20 ++++++++++----------
 templates/admin/default/login.html         |  2 +-
 templates/admin/default/message-edit.html  |  2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index f08721828..1d1cf53c2 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -93,7 +93,7 @@
 
 		                        <td>
 		                        {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-		                          <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="#IMAGE_URL" alt="#TITLE" /></a>
+		                          <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
 		                        {/loop}
 		                        </td>
 
@@ -258,7 +258,7 @@
 		                    	<td>
                                 {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
                                   <a href="{url path='admin/product/edit' id=$ID}" title="{intl l='Edit this product'}">
-                                    <img src="#IMAGE_URL" alt="#TITLE" />
+                                    <img src="{$IMAGE_URL}" alt="{$TITLE}" />
                                   </a>
                                 {/loop}
 
diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html
index 13327ca3d..7f59fd38e 100755
--- a/templates/admin/default/category-edit.html
+++ b/templates/admin/default/category-edit.html
@@ -146,7 +146,7 @@
                                                     </label>
 
                                                     <div class="controls">
-                                                        <input type="text" name="id" disabled="disabled" value="#ID" />
+                                                        <input type="text" name="id" disabled="disabled" value="{$ID}" />
                                                     </div>
                                                 </div>
                                             </div>
@@ -162,7 +162,7 @@
                                                             <option value="0">{intl l="Top level"}</option>
 
                                                             {loop name="cat-parent" type="category-tree" visible="*" category="0" exclude="{$current_category_id}"}
-                                                                 <option value="#ID" style="padding-left: {3 + $LEVEL * 20}px" {if $parent_category_id == $ID}selected="selected"{/if}>{$TITLE}</option>
+                                                                 <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $parent_category_id == $ID}selected="selected"{/if}>{$TITLE}</option>
                                                             {/loop}
 
                                                         </select>
diff --git a/templates/admin/default/coupon-read.html b/templates/admin/default/coupon-read.html
index f187df7a0..3055a8cb2 100755
--- a/templates/admin/default/coupon-read.html
+++ b/templates/admin/default/coupon-read.html
@@ -21,18 +21,18 @@
             {loop type="coupon" name="read_coupon" id=1 backend_context="true"}
 			<div class="alert alert-info">				
 				<span class="glyphicon glyphicon-question-sign"></span>
-                {if #IS_ENABLED}{else}This coupon is disabled, you can enable to the bottom of this form.{/if}
+                {if !$IS_ENABLED}This coupon is disabled, you can enable to the bottom of this form.{/if}
 			</div>
 
             <table class="table table-striped">
 				<tbody>
 					<tr>
 						<td>Code</td>
-						<td>#CODE</td>
+						<td>{$CODE}</td>
 					</tr>
 					<tr>
 						<td>Title</td>
-						<td>#TITLE</td>
+						<td>{$TITLE}</td>
 					</tr>
 					<tr>
 						<td>Expiration date</td>
@@ -41,9 +41,9 @@
 	    			<tr>
 	    				<td>Usage left</td>
 	    				<td>
-                            {if #USAGE_LEFT}
+                            {if $USAGE_LEFT}
                             <span class="label label-success">
-                                #USAGE_LEFT
+                                {$USAGE_LEFT}
                             </span>
                             {else}
                             <span class="label label-important">
@@ -53,14 +53,14 @@
                         </td>
 	    			</tr>
                     <tr>
-                        <td colspan="2">#SHORT_DESCRIPTION</td>
+                        <td colspan="2">{$SHORT_DESCRIPTION}</td>
                     </tr>
                     <tr>
-                        <td colspan="2">#DESCRIPTION</td>
+                        <td colspan="2">{$DESCRIPTION}</td>
                     </tr>
 	    			<tr>
                         <td colspan="2">
-                        {if #IS_CUMULATIVE}
+                        {if $IS_CUMULATIVE}
                             <span class="label label-success">
                                 {intl l="May be cumulative"}
                             </span>
@@ -73,7 +73,7 @@
 	    			</tr>
 	    			<tr>
 	    				<td colspan="2">
-                            {if #IS_REMOVING_POSTAGE}
+                            {if $IS_REMOVING_POSTAGE}
                                 <span class="label label-important">
                                     {intl l="Will remove postage"}
                                 </span>
@@ -86,7 +86,7 @@
 	    			</tr>
 	    			<tr>
 	    				<td>Amount</td>
-	    				<td>#AMOUNT</td>
+	    				<td>{$AMOUNT}</td>
 	    			</tr>
 	    			<tr>
 	    				<td>Conditions of application</td>
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index ea498f72c..a8b248665 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -61,14 +61,14 @@
                         <tbody>
                         {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
                             <tr>
-                                <td>{#REF}</td>
+                                <td>{$REF}</td>
 
                                 <td>
-                                    {#COMPANY}
+                                    {$COMPANY}
                                 </td>
 
                                 <td class="object-title">
-                                    {#FIRSTNAME} {#LASTNAME}
+                                    {$FIRSTNAME} {$LASTNAME}
                                 </td>
 
                                 {module_include location='customer_list_row'}
@@ -87,7 +87,7 @@
                                             <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
                                         {/loop}
                                         {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
+                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
                                         {/loop}
                                         {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
                                             <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
@@ -110,21 +110,21 @@
         <div class="col-md-12 text-center">
 
             <ul class="pagination pagination-centered">
-                {if #customer_page != 1}
+                {if $customer_page != 1}
                     <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
                 {else}
                     <li class="disabled"><a href="#">&laquo;</a></li>
                 {/if}
 
             {pageloop rel="customer_list"}
-                {if #PAGE != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
+                {if $PAGE != $CURRENT}
+                    <li><a href="{url path="/admin/customers" page="$PAGE"}">{$PAGE}</a></li>
                 {else}
-                    <li class="active"><a href="#">#PAGE</a></li>
+                    <li class="active"><a href="#">{$PAGE}</a></li>
                 {/if}
 
-                {if #PAGE == #LAST && #LAST != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">&raquo;</a></li>
+                {if $PAGE == $LAST && $LAST != $CURRENT}
+                    <li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
                 {else}
                     <li class="disabled"><a href="#">&raquo;</a></li>
                 {/if}
diff --git a/templates/admin/default/login.html b/templates/admin/default/login.html
index 8815eb982..bddc9fb08 100755
--- a/templates/admin/default/login.html
+++ b/templates/admin/default/login.html
@@ -18,7 +18,7 @@
 				{form name="thelia.admin.login"}
 				<form action="{url path='/admin/checklogin'}" method="post" class="well form-inline" {form_enctype form=$form}>
 
-					{if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+					{if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
 	                {form_hidden_fields form=$form}
 
diff --git a/templates/admin/default/message-edit.html b/templates/admin/default/message-edit.html
index a2c524c2e..4014940a5 100644
--- a/templates/admin/default/message-edit.html
+++ b/templates/admin/default/message-edit.html
@@ -50,7 +50,7 @@
 		                        <input type="hidden" name="{$name}" value="{{$edit_language_locale}}" />
 		                        {/form_field}
 
-					            {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
+					            {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 								
 								{form_field form=$form field='name'}
 								<div class="form-group {if $error}has-error{/if}">

From a4854564318d623416c780cc32923c9433a551bd Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Tue, 10 Sep 2013 16:35:34 +0200
Subject: [PATCH 10/55] Add route and view for customer creation

---
 .../Thelia/Config/Resources/routing/admin.xml |   5 +
 .../Controller/Admin/CustomerController.php   |   8 +
 core/lib/Thelia/Form/CustomerCreation.php     |  60 +++-
 templates/admin/default/customers.html        | 260 +++++++++++-------
 4 files changed, 225 insertions(+), 108 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 3235171df..7aaad391a 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -37,6 +37,11 @@
         <default key="_controller">Thelia\Controller\Admin\CustomerController::indexAction</default>
     </route>
 
+    <route id="admin.customer.update.view" path="/admin/customer/update/{customer_id}">
+        <default key="_controller">Thelia\Controller\Admin\CustomerController::viewAction</default>
+        <requirement key="customer_id">\d+</requirement>
+    </route>
+
     <!-- end Customer rule management -->
 
     <!-- Categories management -->
diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php
index 04c8842cd..99ae37d21 100644
--- a/core/lib/Thelia/Controller/Admin/CustomerController.php
+++ b/core/lib/Thelia/Controller/Admin/CustomerController.php
@@ -37,4 +37,12 @@ class CustomerController extends BaseAdminController
 
         return $this->render("customers", array("display_customer" => 20));
     }
+
+    public function viewAction($customer_id)
+    {
+
+    	return $this->render("customer-edit", array(
+    		"customer_id" => $customer_id
+    	));
+    }
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index 1bc88407b..f95dd33d5 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -43,19 +43,28 @@ class CustomerCreation extends BaseForm
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "firstname"
+                "label" => "Firstname",
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "lastname"
+                "label" => "Lastname",
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "address"
+                "label" => "Address",
+                "label_attr" => array(
+                    "for" => "address"
+                )
             ))
             ->add("address2", "text", array(
                 "label" => "Address Line 2"
@@ -64,28 +73,43 @@ class CustomerCreation extends BaseForm
                 "label" => "Address Line 3"
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => "Phone",
+                "label_attr" => array(
+                    "for" => "phone"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => "Cellphone",
+                "label_attr" => array(
+                    "for" => "cellphone"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => "Zip code",
+                "label_attr" => array(
+                    "for" => "zipcode"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "city"
+                "label" => "City",
+                "label_attr" => array(
+                    "for" => "city"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "country"
+                "label" => "Country",
+                "label_attr" => array(
+                    "for" => "country"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
@@ -104,7 +128,10 @@ class CustomerCreation extends BaseForm
                         )
                     ))
                 ),
-                "label" => "email"
+                "label" => "Email",
+                "label_attr" => array(
+                    "for" => "email"
+                )
             ))
             ->add("email_confirm", "email", array(
                 "constraints" => array(
@@ -115,14 +142,20 @@ class CustomerCreation extends BaseForm
                         )
                     ))
                 ),
-                "label" => "email confirmation"
+                "label" => "Email confirmation",
+                "label_attr" => array(
+                    "for" => "email-confirmation"
+                )
             ))
             ->add("password", "password", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
                     new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
                 ),
-                "label" => "password"
+                "label" => "Password",
+                "label_attr" => array(
+                    "for" => "password"
+                )
             ))
             ->add("password_confirm", "password", array(
                 "constraints" => array(
@@ -132,7 +165,10 @@ class CustomerCreation extends BaseForm
                         array($this, "verifyPasswordField")
                     )))
                 ),
-                "label" => "password confirmation"
+                "label" => "Password confirmation",
+                "label_attr" => array(
+                    "for" => "password-confirmation"
+                )
             ))
 
         ;
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index ea498f72c..e7a8c37d2 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -10,130 +10,198 @@
 
 
     <div class="catalog">
-    <div id="wrapper" class="container">
+        <div id="wrapper" class="container">
 
 
-    {module_include location='customer_top'}
+            {module_include location='customer_top'}
 
-    <div class="row">
-        <div class="col-md-12">
-            <div class="general-block-decorator">
-                <table class="table table-striped table-condensed" id="customer_list">
-                    <caption>
-                        {intl l="Customers list"}
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="general-block-decorator">
+                        <table class="table table-striped table-condensed" id="customer_list">
+                            <caption>
+                                {intl l="Customers list"}
 
-                        {module_include location='customer_list_caption'}
+                                {module_include location='customer_list_caption'}
 
-                        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
-                            <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
-                                <span class="glyphicon glyphicon-plus-sign"></span>
-                            </a>
-                        {/loop}
-                    </caption>
+                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
+                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
+                                        <span class="glyphicon glyphicon-plus-sign"></span>
+                                    </a>
+                                {/loop}
+                            </caption>
 
-                    {ifloop rel="customer_list"}
-                        <thead>
-                        <tr>
-                            <th class="object-title">
-                                {intl l="customer ref"}
-                            </th>
+                            {ifloop rel="customer_list"}
+                                <thead>
+                                <tr>
+                                    <th class="object-title">
+                                        {intl l="customer ref"}
+                                    </th>
 
-                            <th class="object-title">
-                                {intl l="company"}
-                            </th>
+                                    <th class="object-title">
+                                        {intl l="company"}
+                                    </th>
 
-                            {module_include location='category_list_header'}
+                                    {module_include location='category_list_header'}
 
-                            <th>
-                                {intl l="firstname & lastname"}
-                            </th>
+                                    <th>
+                                        {intl l="firstname & lastname"}
+                                    </th>
 
-                            <th>
-                                {intl l="last order"}
-                            </th>
+                                    <th>
+                                        {intl l="last order"}
+                                    </th>
 
-                            <th>{intl l='order amount'}</th>
+                                    <th>{intl l='order amount'}</th>
 
-                            <th>{intl l='Actions'}</th>
-                        </tr>
-                        </thead>
+                                    <th>{intl l='Actions'}</th>
+                                </tr>
+                                </thead>
 
-                        <tbody>
-                        {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
-                            <tr>
-                                <td>{#REF}</td>
+                                <tbody>
+                                {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
+                                    <tr>
+                                        <td>{#REF}</td>
 
-                                <td>
-                                    {#COMPANY}
-                                </td>
+                                        <td>
+                                            {#COMPANY}
+                                        </td>
 
-                                <td class="object-title">
-                                    {#FIRSTNAME} {#LASTNAME}
-                                </td>
+                                        <td class="object-title">
+                                            {#FIRSTNAME} {#LASTNAME}
+                                        </td>
 
-                                {module_include location='customer_list_row'}
+                                        {module_include location='customer_list_row'}
 
-                                <td>
-                                    {format_date date=$LASTORDER_DATE}
-                                </td>
+                                        <td>
+                                            {format_date date=$LASTORDER_DATE}
+                                        </td>
 
-                                <td>
-                                    {format_number number=$LASTORDER_AMOUNT}
-                                </td>
-                                <td>
-                                    <div class="btn-group">
+                                        <td>
+                                            {format_number number=$LASTORDER_AMOUNT}
+                                        </td>
+                                        <td>
+                                            <div class="btn-group">
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
-                                            <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
-                                        {/loop}
-                                        {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
-                                        {/loop}
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
-                                            <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                        {/loop}
-                                    </div>
-                                </td>
+                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
+                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
+                                                {/loop}
+                                                {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
+                                                    <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
+                                                {/loop}
+                                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
+                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                {/loop}
+                                            </div>
+                                        </td>
 
-                            </tr>
-                        {/loop}
-                        </tbody>
-                    {/ifloop}
-                </table>
+                                    </tr>
+                                {/loop}
+                                </tbody>
+                            {/ifloop}
+                        </table>
+                    </div>
+                </div>
             </div>
+
+
+            {module_include location='customer_bottom'}
+            <div class="row">
+                <div class="col-md-12 text-center">
+
+                    <ul class="pagination pagination-centered">
+                        {if #customer_page != 1}
+                            <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
+                        {else}
+                            <li class="disabled"><a href="#">&laquo;</a></li>
+                        {/if}
+
+                    {pageloop rel="customer_list"}
+                        {if #PAGE != #CURRENT}
+                            <li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
+                        {else}
+                            <li class="active"><a href="#">#PAGE</a></li>
+                        {/if}
+
+                        {if #PAGE == #LAST && #LAST != #CURRENT}
+                            <li><a href="{url path="/admin/customers" page="#PAGE"}">&raquo;</a></li>
+                        {else}
+                            <li class="disabled"><a href="#">&raquo;</a></li>
+                        {/if}
+                    {/pageloop}
+                    </ul>
+                </div>
+            </div>
+
         </div>
     </div>
 
+    {* Adding a new Category *}
 
-    {module_include location='customer_bottom'}
-    <div class="row">
-        <div class="col-md-12 text-center">
 
-            <ul class="pagination pagination-centered">
-                {if #customer_page != 1}
-                    <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
-                {else}
-                    <li class="disabled"><a href="#">&laquo;</a></li>
-                {/if}
+    {form name="thelia.customer.creation"}
 
-            {pageloop rel="customer_list"}
-                {if #PAGE != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
-                {else}
-                    <li class="active"><a href="#">#PAGE</a></li>
-                {/if}
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "customer_creation_dialog"}
 
-                {if #PAGE == #LAST && #LAST != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">&raquo;</a></li>
-                {else}
-                    <li class="disabled"><a href="#">&raquo;</a></li>
-                {/if}
-            {/pageloop}
-            </ul>
-        </div>
-    </div>
+            {form_hidden_fields form=$form}
 
-    </div>
-    </div>
+            {form_field form=$form field='success_url'}
+               {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
+               <input type="hidden" name="{$name}" value="{url path='/admin/customer/update/_ID_'}" />
+            {/form_field}
+            
+            {form_field form=$form field='firstname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Firstname'}" placeholder="{intl l='Firstname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='lastname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Lastname'}" placeholder="{intl l='Lastname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='address1'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Address'}" placeholder="{intl l='Address'}">                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address2'}
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Additional address'}" placeholder="{intl l='Additional address'}">
+                    {/form_field}                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address3'}
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Additional address'}" placeholder="{intl l='Additional address'}">
+                    {/form_field}
+                </div>
+            {/form_field}
+
+            
+            
+        {/capture}
+
+        {include
+            file = "includes/generic-create-dialog.html"
+
+            dialog_id    = "add_customer_dialog"
+            dialog_title = {intl l="Create a new customer"}
+            dialog_body  = {$smarty.capture.customer_creation_dialog nofilter}
+
+            dialog_ok_label     = {intl l="Create this customer"}
+            dialog_cancel_label = {intl l="Cancel"}
+
+            form_action        = {url path='/admin/customer/create'}
+            form_enctype       = {form_enctype form=$form}
+            form_error_message = $form_error_message
+        }
+    {/form}
 
 {/block}
\ No newline at end of file

From 5ab3d4fb88a8d9e509f043597923e1899c54a445 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 16:54:13 +0200
Subject: [PATCH 11/55] replace smarty variable identifier by $

---
 templates/admin/default/variable-edit.html |  2 +-
 templates/default/index.html               | 36 ++++++------
 templates/default/layout.tpl               |  6 +-
 templates/default/login.html               |  2 +-
 templates/default_save/address.html        |  4 +-
 templates/default_save/address_edit.html   |  4 +-
 templates/default_save/address_list.html   |  2 +-
 templates/default_save/cart.html           |  4 +-
 templates/default_save/category.html       | 66 +++++++++++-----------
 templates/default_save/connexion.html      | 10 ++--
 templates/default_save/customer.html       | 52 ++++++++---------
 templates/default_save/delivery_list.html  |  6 +-
 templates/default_save/folder.html         | 12 ++--
 templates/default_save/images.html         | 66 +++++++++++-----------
 templates/default_save/included.html       | 12 ++--
 templates/default_save/login.html          |  4 +-
 templates/default_save/pagination.html     | 38 ++++++-------
 templates/default_save/product.html        | 40 ++++++-------
 templates/default_save/tester.html         |  4 +-
 19 files changed, 185 insertions(+), 185 deletions(-)

diff --git a/templates/admin/default/variable-edit.html b/templates/admin/default/variable-edit.html
index 5bccab1cd..ea2701f66 100644
--- a/templates/admin/default/variable-edit.html
+++ b/templates/admin/default/variable-edit.html
@@ -56,7 +56,7 @@
 			                        <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
 			                        {/form_field}
 
-						            {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
+						            {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 									
 									{form_field form=$form field='name'}
 						            <div class="form-group {if $error}has-error{/if}">
diff --git a/templates/default/index.html b/templates/default/index.html
index 2c0657dd9..bdf18cec8 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -39,23 +39,23 @@
                         <meta itemprop="condition" content="new"> <!-- List of condition : new, used, refurbished -->
                         <meta itemprop="identifier" content="mpn:925872"> <!-- List of identifier : asin, isbn, mpn, upc, sku -->
 
-                        <a href="#URL" itemprop="url" tabindex="-1" class="product-image">
+                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_new" }
                                 <img itemprop="image"
-                            {loop name="image_product_new" type="image" limit="1" product="{#ID}"}
-                                src="{#IMAGE_URL}"
+                            {loop name="image_product_new" type="image" limit="1" product="{$ID}"}
+                                src="{$IMAGE_URL}"
                             {/loop}
-                                alt="Product #{#LOOP_COUNT}" >
+                                alt="Product #{$LOOP_COUNT}" >
                             {/ifloop}
                             {elseloop rel="image_product_new"}
-                                {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{#LOOP_COUNT}">{/images}
+                                {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
                             {/elseloop}
                             <span class="mask"></span>
                         </a>
 
-                        <a href="{#URL}" class="product-info">
-                            <h3 class="name"><span itemprop="name">{#TITLE}</span></h3>
-                            <div class="short-description" itemprop="description">{#CHAPO}</div>
+                        <a href="{$URL}" class="product-info">
+                            <h3 class="name"><span itemprop="name">{$TITLE}</span></h3>
+                            <div class="short-description" itemprop="description">{$CHAPO}</div>
 
                             <div class="product-price">
                                 <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
@@ -68,7 +68,7 @@
                                             preorder : http://schema.org/PreOrder
                                             online_only : http://schema.org/OnlineOnly
                                     -->
-                                    <span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{#BEST_TAXED_PRICE}"}
+                                    <span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{$BEST_TAXED_PRICE}"}
 </span></span>
                                 </div>
                             </div>
@@ -97,22 +97,22 @@
                         <meta itemprop="condition" content="new"> <!-- List of condition : new, used, refurbished -->
                         <meta itemprop="identifier" content="mpn:925872"> <!-- List of identifier : asin, isbn, mpn, upc, sku -->
 
-                        <a href="{#URL}" itemprop="url" tabindex="-1" class="product-image">
+                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_promo" }
                             <img itemprop="image"
-                                    {loop name="image_product_promo" type="image" limit="1" product="{#ID}"}
-                                        src="{#IMAGE_URL}"
+                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}"}
+                                        src="{$IMAGE_URL}"
                                     {/loop}
-                                 alt="Product #{#LOOP_COUNT}" >
+                                 alt="Product #{$LOOP_COUNT}" >
                             {/ifloop}
                             {elseloop rel="image_product_promo"}
-                                {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{#LOOP_COUNT}">{/images}
+                                {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{$LOOP_COUNT}">{/images}
                             {/elseloop}
                             <span class="mask"></span>
                         </a>
 
                         <div class="product-info">
-                            <h3 class="name"><a href="{#URL}"><span itemprop="name">{#CHAPO}</span></a></h3>
+                            <h3 class="name"><a href="{$URL}"><span itemprop="name">{$CHAPO}</span></a></h3>
                         </div>
 
                         <div class="product-price">
@@ -126,9 +126,9 @@
                                     preorder : http://schema.org/PreOrder
                                     online_only : http://schema.org/OnlineOnly
                                 -->
-                                {loop name="productSaleElements_promo" type="product_sale_elements" product="{#ID}" limit="1"}
-                                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{#TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
-                                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{#TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"}
+                                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
+                                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                                 {/loop}
                             </div>
                         </div>
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index e89c7eb81..8cd5d0129 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -80,7 +80,7 @@ URL: http://www.thelia.net
                         </ul>
                     </li>
                     {loop type="category" name="category.navigation" parent="0" limit="3"}
-                        <li><a href="{#URL}">{#TITLE}</a></li>
+                        <li><a href="{$URL}">{$TITLE}</a></li>
                     {/loop}
                 </ul>
                 <ul class="nav navbar-nav navbar-cart navbar-right">
@@ -124,7 +124,7 @@ URL: http://www.thelia.net
                     <a class="current dropdown-toggle" data-toggle="dropdown" href="language.html">{lang attr="title"}</a>
                     <ul class="select dropdown-menu">
                         {loop type="lang" name="lang_available" exclude="{lang attr="id"}"}
-                            <li><a href="?lang={#CODE}">{#TITLE}</a></li>
+                            <li><a href="?lang={$CODE}">{$TITLE}</a></li>
                         {/loop}
                     </ul>
                 </div>
@@ -134,7 +134,7 @@ URL: http://www.thelia.net
                     <a class="current dropdown-toggle" data-toggle="dropdown" href="currency.html">{currency attr="code"}</a>
                     <ul class="select dropdown-menu">
                         {loop type="currency" name="currency_available" exclude="{currency attr="id"}" }
-                            <li><a href="?currency={#ISOCODE}">{#SYMBOL} - {#NAME}</a></li>
+                            <li><a href="?currency={$ISOCODE}">{$SYMBOL} - {$NAME}</a></li>
                         {/loop}
                     </ul>
                 </div>
diff --git a/templates/default/login.html b/templates/default/login.html
index 4fe25f276..c7eb03986 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -18,7 +18,7 @@
             <h1 id="main-label" class="page-header">{intl l="Login"}</h1>
             {form name="thelia.customer.login"}
             <form id="form-login" action="{url path="/customer/login"}" method="post" role="form" {form_enctype form=$form}>
-                {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
+                {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
                 {form_field form=$form field='success_url'}
                     <input type="hidden" name="{$name}" value="{navigate to="return_to"}" /> {* the url the user is redirected to on login success *}
                 {/form_field}
diff --git a/templates/default_save/address.html b/templates/default_save/address.html
index afae59197..f02dc7689 100644
--- a/templates/default_save/address.html
+++ b/templates/default_save/address.html
@@ -26,7 +26,7 @@
         <label> <span>{intl l="{$label}"} : </span></label>
         <select name="{$name}">
             {loop type="title" name="title1"}
-                <option value="#ID">#LONG</option>
+                <option value="{$ID}">{$LONG}</option>
             {/loop}
 
         </select>
@@ -78,7 +78,7 @@
         <label> <span>{intl l="{$label}"} : </span></label>
         <select name="{$name}">
             {loop type="country" name="country1"}
-            <option value="#ID">#TITLE</option>
+            <option value="{$ID}">{$TITLE}</option>
             {/loop}
 
         </select>
diff --git a/templates/default_save/address_edit.html b/templates/default_save/address_edit.html
index 22e70289a..c6cf1b120 100644
--- a/templates/default_save/address_edit.html
+++ b/templates/default_save/address_edit.html
@@ -27,7 +27,7 @@
             <label> <span>{intl l="{$label}"} : </span></label>
             <select name="{$name}">
                 {loop type="title" name="title1"}
-                    <option value="#ID">#LONG</option>
+                    <option value="{$ID}">{$LONG}</option>
                 {/loop}
 
             </select>
@@ -79,7 +79,7 @@
             <label> <span>{intl l="{$label}"} : </span></label>
             <select name="{$name}">
                 {loop type="country" name="country1"}
-                    <option value="#ID">#TITLE</option>
+                    <option value="{$ID}">{$TITLE}</option>
                 {/loop}
 
             </select>
diff --git a/templates/default_save/address_list.html b/templates/default_save/address_list.html
index 88a483e23..6dc1d5378 100644
--- a/templates/default_save/address_list.html
+++ b/templates/default_save/address_list.html
@@ -4,7 +4,7 @@
 
 <ul>
 {loop type="address" name="customer_list" customer="current"}
-    <li>{#LABEL} - {#FIRSTNAME} {#LASTNAME} - <a href="{url path="/address/edit/{#ID}"}">edit</a></li>
+    <li>{$LABEL} - {$FIRSTNAME} {$LASTNAME} - <a href="{url path="/address/edit/{$ID}"}">edit</a></li>
 {/loop}
 </ul>
 
diff --git a/templates/default_save/cart.html b/templates/default_save/cart.html
index a503e3bd4..38e3e7716 100755
--- a/templates/default_save/cart.html
+++ b/templates/default_save/cart.html
@@ -3,7 +3,7 @@
 <h1>{intl l='cart'}</h1>
 <ul>
 {loop name="cart" type="cart"}
-    <li>Item {$LOOP_COUNT}/{$LOOP_TOTAL} : #ITEM_ID #TITLE - quantity : #QUANTITY</li>
+    <li>Item {$LOOP_COUNT}/{$LOOP_TOTAL} : {$ITEM_ID} {$TITLE} - quantity : {$QUANTITY}</li>
 {/loop}
 </ul>
 
@@ -16,7 +16,7 @@
         and passed back to the form plugin through the ParserContext.
         *}
 
-        {if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+        {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
         {form_hidden_fields form=$form}
 
diff --git a/templates/default_save/category.html b/templates/default_save/category.html
index a888605ff..2e216d0c0 100755
--- a/templates/default_save/category.html
+++ b/templates/default_save/category.html
@@ -12,13 +12,13 @@
 
 {loop name="category0" type="category" parent="0" order="manual"}
 <div style="border: solid 4px blue; padding: 20px; margin: 10px;">
-    <h2>CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
+    <h2>CATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})</h2>
 
     {ifloop rel="prod_ass_cont"}
         <h5>Associated Content</h5>
         <ul>
-            {loop name="prod_ass_cont" type="associated_content" category="#ID" order="associated_content"}
-            <li>#TITLE</li>
+            {loop name="prod_ass_cont" type="associated_content" category="$ID" order="associated_content"}
+            <li>{$TITLE}</li>
             {/loop}
         </ul>
     {/ifloop}
@@ -26,23 +26,23 @@
         <h5>No associated content</h5>
     {/elseloop}
 
-    {loop name="product" type="product" category="#ID"}
+    {loop name="product" type="product" category="$ID"}
     <div style="border: dashed 2px red; padding: 20px; margin: 10px;">
-        <h3><a href="#URL">PRODUCT #ID : #REF (#LOOP_COUNT / #LOOP_TOTAL)</a></h3>
-        <h4>#TITLE</h4>
-        <p>#DESCRIPTION</p>
+        <h3><a href="{$URL}">PRODUCT {$ID} : {$REF} ({$LOOP_COUNT} / {$LOOP_TOTA}L)</a></h3>
+        <h4>{$TITLE}</h4>
+        <p>{$DESCRIPTION}</p>
 
-        <p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
+        <p>Starting by {$BEST_PRICE} € HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} € TTC)</p>
 
         {ifloop rel="ft"}
             <h5>Features</h5>
             <ul>
-                {assign var=current_product value=#ID}
-                {loop name="ft" type="feature" order="manual" product="#ID"}
+                {assign var=current_product value=$ID}
+                {loop name="ft" type="feature" order="manual" product="$ID"}
                 <li>
-                    <strong>#TITLE</strong> :
-                    {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"}
-                        #TITLE / #PERSONAL_VALUE
+                    <strong>{$TITLE}</strong> :
+                    {loop name="ft_v" type="feature_value" product="{$current_product}" feature="{$ID}"}
+                        {$TITLE} / {$PERSONAL_VALUE}
                     {/loop}
                 </li>
                 {/loop}
@@ -53,15 +53,15 @@
         {/elseloop}
     </div>
     {/loop}
-    {loop name="catgory1" type="category" parent="#ID"}
+    {loop name="catgory1" type="category" parent="$ID"}
     <div style="border: double 4px lightseagreen; padding: 20px; margin: 10px;">
-        <h3>SUBCATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
+        <h3>SUBCATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
 
         {ifloop rel="prod_ass_cont"}
             <h5>Associated Content</h5>
             <ul>
-                {loop name="prod_ass_cont" type="associated_content" category="#ID" order="associated_content"}
-                <li>#TITLE</li>
+                {loop name="prod_ass_cont" type="associated_content" category="$ID" order="associated_content"}
+                <li>{$TITLE}</li>
                 {/loop}
             </ul>
         {/ifloop}
@@ -69,22 +69,22 @@
             <h5>No associated content</h5>
         {/elseloop}
 
-        {loop name="product" type="product" category="#ID"}
+        {loop name="product" type="product" category="$ID"}
 
             <div style="border: solid 1px green; padding: 20px; margin: 10px;">
-                <h3><a href="#URL">PRODUCT #ID : #REF (#LOOP_COUNT / #LOOP_TOTAL)</a></h3>
-                <h4>#TITLE</h4>
-                <p>#DESCRIPTION</p>
+                <h3><a href="{$URL}">PRODUCT {$ID} : {$REF} ({$LOOP_COUNT} / {$LOOP_TOTAL})</a></h3>
+                <h4>{$TITLE}</h4>
+                <p>{$DESCRIPTION}</p>
 
                 {ifloop rel="ft"}
                 <h5>Features</h5>
                 <ul>
-                    {assign var=current_product value=#ID}
-                    {loop name="ft" type="feature" order="manual" product="#ID"}
+                    {assign var=current_product value=$ID}
+                    {loop name="ft" type="feature" order="manual" product="$ID"}
                     <li>
-                        <strong>#TITLE</strong> :
-                        {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"}
-                        #TITLE / #PERSONAL_VALUE
+                        <strong>{$TITLE}</strong> :
+                        {loop name="ft_v" type="feature_value" product="{$current_product}" feature="$ID"}
+                        {$TITLE} / {$PERSONAL_VALUE}
                         {/loop}
                     </li>
                     {/loop}
@@ -109,10 +109,10 @@
 <ul>
     {loop name="ft" type="feature" order="manual"}
     <li>
-        #TITLE
+        {$TITLE}
         <ul>
-            {loop name="ftav" type="feature_availability" order="manual" feature="#ID"}
-                <li>#TITLE</li>
+            {loop name="ftav" type="feature_availability" order="manual" feature="$ID"}
+                <li>{$TITLE}</li>
             {/loop}
         </ul>
     </li>
@@ -126,10 +126,10 @@
 <ul>
     {loop name="attr" type="attribute" order="manual"}
     <li>
-        #TITLE
+        {$TITLE}
         <ul>
-            {loop name="attrav" type="attribute_availability" order="manual" attribute="#ID"}
-            <li>#TITLE</li>
+            {loop name="attrav" type="attribute_availability" order="manual" attribute="$ID"}
+            <li>{$TITLE}</li>
             {/loop}
         </ul>
     </li>
@@ -143,7 +143,7 @@
 <ul>
     {loop name="cur" type="currency"}
     <li>
-        #NAME (#SYMBOL)
+        {$NAME} ({$SYMBOL})
     </li>
     {/loop}
 </ul>
diff --git a/templates/default_save/connexion.html b/templates/default_save/connexion.html
index b3867782f..3c52d1a53 100755
--- a/templates/default_save/connexion.html
+++ b/templates/default_save/connexion.html
@@ -27,7 +27,7 @@
 	and passed back to the form plugin through the ParserContext.
 	*}
 
-	{if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+	{if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
 
     {form_hidden_fields form=$form}
@@ -132,28 +132,28 @@
 
     {form_field form=$form field="email"}
         {form_error form=$form field="email"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="email" name="{$name}" value="{$value}" {$attr} ><br />
     {/form_field}
 
     {form_field form=$form field="email_confirm"}
         {form_error form=$form field="email_confirm"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="email" name="{$name}" {$attr} ><br />
     {/form_field}
 
     {form_field form=$form field="password"}
         {form_error form=$form field="password"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="password" name="{$name}" {$attr} ><br />
     {/form_field}
 
     {form_field form=$form field="password_confirm"}
         {form_error form=$form field="password_confirm"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="password" name="{$name}" {$attr} ><br />
     {/form_field}
diff --git a/templates/default_save/customer.html b/templates/default_save/customer.html
index 02e7104f9..a4d79ca33 100755
--- a/templates/default_save/customer.html
+++ b/templates/default_save/customer.html
@@ -7,43 +7,43 @@
 <table border="1" cellspacing="0" cellpadding="5">
         <tr>
             <td>ID</td>
-            <td>#ID</td>
+            <td>{$ID}</td>
         </tr>
         <tr>
             <td>Réference</td>
-            <td>#REF</td>
+            <td>{$REF}</td>
         </tr>
         <tr>
             <td>Title</td>
             <td>
-                {loop name="title" type="title" id="#TITLE"}
-                #LONG (#SHORT)
+                {loop name="title" type="title" id="$TITLE"}
+                {$LONG} ({$SHORT})
                 {/loop}
             </td>
         </tr>
         <tr>
             <td>Firstname</td>
-            <td>#FIRSTNAME</td>
+            <td>{$FIRSTNAME}</td>
         </tr>
         <tr>
             <td>Lastname</td>
-            <td>#LASTNAME</td>
+            <td>{$LASTNAME}</td>
         </tr>
         <tr>
             <td>Email</td>
-            <td>#EMAIL</td>
+            <td>{$EMAIL}</td>
         </tr>
         <tr>
             <td>Is reseller</td>
-            <td>#RESELLER</td>
+            <td>{$RESELLER}</td>
         </tr>
         <tr>
             <td>Sponsor</td>
-            <td>#SPONSOR</td>
+            <td>{$SPONSOR}</td>
         </tr>
         <tr>
             <td>Discount</td>
-            <td>#DISCOUNT %</td>
+            <td>{$DISCOUNT} %</td>
         </tr>
 </table>
 
@@ -56,20 +56,20 @@
 <table border="1" cellspacing="0" cellpadding="5">
     <tr>
         <td>ID</td>
-        <td>#ID</td>
+        <td>{$ID}</td>
     </tr>
     <tr>
         <td>Name</td>
-        <td>#NAME</td>
+        <td>{$NAME}</td>
     </tr>
     <tr>
         <td>Title</td>
         <td>
             <ul>
-                {assign var=current_title value=#TITLE}
+                {assign var=current_title value=$TITLE}
                 {loop name="title" type="title"}
-                <li {if $current_title==#ID}style="background-color: yellow"{/if}>
-                #LONG (#SHORT)
+                <li {if $current_title==$ID}style="background-color: yellow"{/if}>
+                {$LONG} ({$SHORT})
                 </li>
                 {/loop}
             </ul>
@@ -77,36 +77,36 @@
     </tr>
     <tr>
         <td>Company</td>
-        <td>#COMPANY</td>
+        <td>{$COMPANY}</td>
     </tr>
     <tr>
         <td>Firstname</td>
-        <td>#FIRSTNAME</td>
+        <td>{$FIRSTNAME}</td>
     </tr>
     <tr>
         <td>Lastname</td>
-        <td>#LASTNAME</td>
+        <td>{$LASTNAME}</td>
     </tr>
     <tr>
         <td>Address</td>
-        <td>#ADDRESS1<br/>#ADDRESS2<br/>#ADDRESS3</td>
+        <td>{$ADDRESS1}<br/>{$ADDRESS2}<br/>{$ADDRESS3}</td>
     </tr>
     <tr>
         <td>Zipcode</td>
-        <td>#ZIPCODE</td>
+        <td>{$ZIPCODE}</td>
     </tr>
     <tr>
         <td>City</td>
-        <td>#CITY</td>
+        <td>{$CITY}</td>
     </tr>
     <tr>
         <td>Country</td>
         <td>
             <select>
-                {assign var=current_country value=#COUNTRY}
+                {assign var=current_country value=$COUNTRY}
                 {loop name="country" type="country"}
-                <option {if $current_country==#ID}selected="selected"{/if}>
-                    #TITLE (#ID - #ISOCODE - #ISOALPHA2 - #ISOALPHA3)
+                <option {if $current_country==$ID}selected="selected"{/if}>
+                    {$TITLE} ({$ID} - {$ISOCODE} - {$ISOALPHA2} - {$ISOALPHA3})
                 </option>
                 {/loop}
             </select>
@@ -114,11 +114,11 @@
     </tr>
     <tr>
         <td>Phone</td>
-        <td>#PHONE</td>
+        <td>{$PHONE}</td>
     </tr>
     <tr>
         <td>Cellphone</td>
-        <td>#CELLPHONE</td>
+        <td>{$CELLPHONE}</td>
     </tr>
 </table>
 
diff --git a/templates/default_save/delivery_list.html b/templates/default_save/delivery_list.html
index 2ea3cc166..a652af31b 100644
--- a/templates/default_save/delivery_list.html
+++ b/templates/default_save/delivery_list.html
@@ -4,9 +4,9 @@
 {loop type="delivery" name="delivery.list"}
     <li>
         <ul>
-            <li>id : {#ID}</li>
-            <li>prix : {#PRICE}</li>
-            <li>Choisir : <a href="{url path="/delivery/choose/{#ID}"}">Choisir</a></li>
+            <li>id : {$ID}</li>
+            <li>prix : {$PRICE}</li>
+            <li>Choisir : <a href="{url path="/delivery/choose/{$ID}"}">Choisir</a></li>
         </ul>
     </li>
 {/loop}
diff --git a/templates/default_save/folder.html b/templates/default_save/folder.html
index 7d12036f9..7d6abb147 100755
--- a/templates/default_save/folder.html
+++ b/templates/default_save/folder.html
@@ -1,13 +1,13 @@
 {loop name="folder0" type="folder" parent="0" order="alpha_reverse"}
     <div style="border: solid 4px blue; padding: 20px; margin: 10px;">
-    <h2>FOLDER : #TITLE</h2>
-    {loop name="folder1" type="folder" parent="#ID"}
+    <h2>FOLDER : {$TITLE}</h2>
+    {loop name="folder1" type="folder" parent="$ID"}
         <div style="border: double 4px lightseagreen; padding: 20px; margin: 10px;">
-        <h3>SUBFOLDER : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
-        {loop name="content" type="content" folder="#ID"}
+        <h3>SUBFOLDER : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
+        {loop name="content" type="content" folder="$ID"}
             <div style="border: solid 1px green; padding: 20px; margin: 10px;">
-                <h3>CONTENT : #TITLE</h3>
-                <p>#DESCRIPTION</p>
+                <h3>CONTENT : {$TITLE}</h3>
+                <p>{$DESCRIPTION}</p>
             </div>
         {/loop}
         </div>
diff --git a/templates/default_save/images.html b/templates/default_save/images.html
index c72beaecd..cd6834f9f 100755
--- a/templates/default_save/images.html
+++ b/templates/default_save/images.html
@@ -5,22 +5,22 @@
     <h2>Category Images</h2>
     <ul>
     {loop type="category" name="jsvdfk"}
-        <li><p>Category id #ID: #TITLE</p>
+        <li><p>Category id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" category="#ID" width="200" height="100" resize_mode="borders"}
-                  <p>Processed file URL: #IMAGE_URL</p>
-                  <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" category="$ID" width="200" height="100" resize_mode="borders"}
+                  <p>Processed file URL: {$IMAGE_URL}</p>
+                  <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
 
-            {loop type="image" name="image_test" category="#ID"}
-                  <p>Full size file URL: #IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" category="$ID"}
+                  <p>Full size file URL: {$IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
 
-            {loop type="image" name="image_test" source="category" source_id="#ID"}
-                  <p>source="category" source_id="x" argument style: Processed file URL: #IMAGE_URL</p>
+            {loop type="image" name="image_test" source="category" source_id="$ID"}
+                  <p>source="category" source_id="x" argument style: Processed file URL: {$IMAGE_URL}</p>
             {/loop}
             </li>
          </ul>
@@ -34,27 +34,27 @@
     <h2>Product Images</h2>
 	<ul>
 	{loop type="product" name="jsvdfk"}
-        <li><p>Product id #ID: #TITLE</p>
+        <li><p>Product id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="borders" effects="gamma:0.7" background_color="#cc8000"}
-		          <p>Processed file URL: #IMAGE_URL</p>
-		          <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
+            {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="borders" effects="gamma:0.7" background_color="#cc8000"}
+		          <p>Processed file URL: {$IMAGE_URL}</p>
+		          <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
 		          <p>Images:</p>
 
-		          <img src="#IMAGE_URL" />
+		          <img src="{$IMAGE_URL}" />
 		    {/loop}
-		    {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="crop"}
-		    <img src="#IMAGE_URL" />
+		    {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="crop"}
+		    <img src="{$IMAGE_URL}" />
 		    {/loop}
-            {loop type="image" name="image_test" product="#ID" width="100" height="200" resize_mode="borders" background_color="#cc8000"}
-            <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" product="$ID" width="100" height="200" resize_mode="borders" background_color="#cc8000"}
+            <img src="{$IMAGE_URL}" />
             {/loop}
-            {loop type="image" name="image_test" product="#ID" width="100" rotation="-20" background_color="#facabe"}
-            <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" product="$ID" width="100" rotation="-20" background_color="#facabe"}
+            <img src="{$IMAGE_URL}" />
             {/loop}
-            {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="borders" background_color="#facabe" effects="negative"}
-            <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="borders" background_color="#facabe" effects="negative"}
+            <img src="{$IMAGE_URL}" />
             {/loop}
 		    </p>
             </li>
@@ -67,13 +67,13 @@
     <h2>Folder Images</h2>
     <ul>
     {loop type="folder" name="jsvdfk"}
-        <li><p>Folder id #ID: #TITLE</p>
+        <li><p>Folder id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" folder="#ID" width="200" height="100" resize_mode="borders"}
-                  <p>Processed file URL: #IMAGE_URL</p>
-                  <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" folder="$ID" width="200" height="100" resize_mode="borders"}
+                  <p>Processed file URL: {$IMAGE_URL}</p>
+                  <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
             </li>
          </ul>
@@ -86,13 +86,13 @@
     <h2>Content Images</h2>
     <ul>
     {loop type="content" name="jsvdfk"}
-        <li><p>Content id #ID: #TITLE</p>
+        <li><p>Content id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" content="#ID" width="200" height="100" resize_mode="borders"}
-                  <p>Processed file URL: #IMAGE_URL</p>
-                  <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" content="$ID" width="200" height="100" resize_mode="borders"}
+                  <p>Processed file URL: {$IMAGE_URL}</p>
+                  <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
             </li>
          </ul>
diff --git a/templates/default_save/included.html b/templates/default_save/included.html
index 93581ff7f..0d0df5c14 100755
--- a/templates/default_save/included.html
+++ b/templates/default_save/included.html
@@ -1,12 +1,12 @@
 {loop name="included0" type="category" parent="0"}
-    <h2>Out before - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
-    {loop name="category1" type="category" parent="#ID"}
-        <h3>Inner - SUBCATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
+    <h2>Out before - CATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})</h2>
+    {loop name="category1" type="category" parent="$ID"}
+        <h3>Inner - SUBCATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
     {/loop}
 
-    {loop name="category2" type="category" parent="#ID"}
-        <h3>Inner 2 - SUBCATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
+    {loop name="category2" type="category" parent="$ID"}
+        <h3>Inner 2 - SUBCATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
     {/loop}
-    <h2>Out after  - CATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h2>
+    <h2>Out after  - CATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h2>
     <hr />
 {/loop}
\ No newline at end of file
diff --git a/templates/default_save/login.html b/templates/default_save/login.html
index 702f0a710..61232e481 100755
--- a/templates/default_save/login.html
+++ b/templates/default_save/login.html
@@ -25,12 +25,12 @@
 	and passed back to the form plugin through the ParserContext.
 	*}
 
-	{if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+	{if $0form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
     {form_hidden_fields form=$form}
 
     {form_field form=$form field="email"}
-        {if #error}{#message}{/if}
+        {if $error}{$message}{/if}
         <label>{intl l="Your e-mail address"}: </label><input type="email" name="{$name}" {$attr} value="{$value}"><br />
     {/form_field}
 
diff --git a/templates/default_save/pagination.html b/templates/default_save/pagination.html
index cb06db66b..8f60b6b37 100755
--- a/templates/default_save/pagination.html
+++ b/templates/default_save/pagination.html
@@ -7,7 +7,7 @@
 <div style="border: solid 1px; padding: 20px;">
 
 {loop name="cat" type="category" page="{$category_current_page}" limit="2"}
-    <h2>#LOOP_COUNT - #TITLE</h2>
+    <h2>{$LOOP_COUNT} - {$TITLE}</h2>
         <h3>Products :</h3>
 
         <div style="border: solid 1px; padding: 20px;">
@@ -17,23 +17,23 @@
         {assign var=product_current_page value={$smarty.get.$this_product_getter|default:1}}
 
         <ul>
-        {loop name="prod" type="product" category="#ID" page="{$product_current_page}" limit="2"}
+        {loop name="prod" type="product" category="$ID" page="{$product_current_page}" limit="2"}
             <li>
-                #ID:#REF
+                {$ID}:{$REF}
             </li>
         {/loop}
         </ul>
 
         </div>
 
-        <p>#TITLE page choice</p>
+        <p>{$TITLE} page choice</p>
         {pageloop rel="prod"}
-            {if ${PAGE} != {$product_current_page}}
-                <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+            {if $PAGE != $product_current_page}
+                <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}={$PAGE}">{$PAGE}</a>
             {else}
-                { #PAGE }
+                {$PAGE}
             {/if}
-            {if {$PAGE} != {$LAST}}
+            {if $PAGE != $LAST}
                 -
             {/if}
         {/pageloop}
@@ -44,12 +44,12 @@
 
 <p>categories page choice</p>
 {pageloop rel="cat"}
-{if ${PAGE} != {$category_current_page}}
-    <a href="index_dev.php?view=pagination&category_page=#PAGE">#PAGE</a>
+{if $PAGE != $category_current_page}
+    <a href="index_dev.php?view=pagination&category_page={$PAGE}">{$PAGE}</a>
 {else}
-    { #PAGE }
+    {$PAGE}
 {/if}
-{if {$PAGE} != {$LAST}}
+{if $PAGE != $LAST}
     -
 {/if}
 {/pageloop}
@@ -62,18 +62,18 @@ Pagination before loop
 {capture name="prod2"}
        {loop name="prod2" type="product" page="{$product_current_page}" limit="2"}
             <li>
-                #ID:#REF
+                {$ID}:{$REF}
             </li>
         {/loop}
 {/capture}
 
 {pageloop rel="prod2"}
     {if ${PAGE} != {$product_current_page}}
-        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}={$PAGE}">{$PAGE}</a>
     {else}
-        { #PAGE }
+        {$PAGE}
     {/if}
-    {if {$PAGE} != {$LAST}}
+    {if $PAGE != $LAST}
         -
     {/if}
 {/pageloop}
@@ -82,11 +82,11 @@ Pagination before loop
 
 {pageloop rel="prod2"}
     {if ${PAGE} != {$product_current_page}}
-        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}={$PAGE}">{$PAGE}</a>
     {else}
-        { #PAGE }
+        {$PAGE}
     {/if}
-    {if {$PAGE} != {$LAST}}
+    {if $PAGE != $LAST}
         -
     {/if}
 {/pageloop}
diff --git a/templates/default_save/product.html b/templates/default_save/product.html
index 4280fc88c..f3d6a4cb6 100755
--- a/templates/default_save/product.html
+++ b/templates/default_save/product.html
@@ -9,17 +9,17 @@ Index : {navigate to="index"}<br />
 {loop type="product" name="product" current="true"}
 
 <div style="border: dashed 2px red; padding: 20px; margin: 10px;">
-    <h2>PRODUCT (#ID) : #REF</h2>
-    <h3>#TITLE</h3>
-    <p>#DESCRIPTION</p>
+    <h2>PRODUCT ({$ID}) : {$REF}</h2>
+    <h3>{$TITLE}</h3>
+    <p>{$DESCRIPTION}</p>
 
-    <p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
+    <p>Starting by {$BEST_PRICE} € HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} € TTC)</p>
 
     {ifloop rel="acc"}
     <h4>Accessories</h4>
     <ul>
-        {loop name="acc" type="accessory" product="#ID" order="accessory"}
-        <li><a href="#URL">#REF</a></li>
+        {loop name="acc" type="accessory" product="$ID" order="accessory"}
+        <li><a href="{$URL}">{$REF}</a></li>
         {/loop}
     </ul>
     {/ifloop}
@@ -30,8 +30,8 @@ Index : {navigate to="index"}<br />
     {ifloop rel="prod_ass_cont"}
     <h4>Associated Content</h4>
     <ul>
-        {loop name="prod_ass_cont" type="associated_content" product="#ID" order="associated_content"}
-        <li>#TITLE</li>
+        {loop name="prod_ass_cont" type="associated_content" product="$ID" order="associated_content"}
+        <li>{$TITLE}</li>
         {/loop}
     </ul>
     {/ifloop}
@@ -42,12 +42,12 @@ Index : {navigate to="index"}<br />
     {ifloop rel="ft"}
     <h4>Features</h4>
     <ul>
-        {assign var=current_product value=#ID}
-        {loop name="ft" type="feature" order="manual" product="#ID"}
+        {assign var=current_product value=$ID}
+        {loop name="ft" type="feature" order="manual" product="$ID"}
         <li>
-            <strong>#TITLE</strong> :
-            {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"}
-            #TITLE / #PERSONAL_VALUE
+            <strong>{$TITLE}</strong> :
+            {loop name="ft_v" type="feature_value" product="{$current_product}" feature="$ID"}
+            {$TITLE} / {$PERSONAL_VALUE}
             {/loop}
         </li>
         {/loop}
@@ -59,18 +59,18 @@ Index : {navigate to="index"}<br />
 
     <h4>Product sale elements</h4>
 
-    {assign var=current_product value=#ID}
-    {loop name="pse" type="product_sale_elements" product="#ID"}
+    {assign var=current_product value=$ID}
+    {loop name="pse" type="product_sale_elements" product="$ID"}
     <div style="border: solid 2px darkorange; padding: 5px; margin: 5px;">
-        {loop name="combi" type="attribute_combination" product_sale_elements="#ID"}
-        #ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE<br />
+        {loop name="combi" type="attribute_combination" product_sale_elements="$ID"}
+        {$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}<br />
         {/loop}
-        <br />#WEIGHT g
-        <br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE € HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE € TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC){else} #PRICE € HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC{/if}</strong>
+        <br />{$WEIGHT} g
+        <br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} € HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} € TTC (instead of {$PRICE HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC){else} {$PRICE} € HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC{/if}</strong>
         <br /><br />
         Add
         <select>
-            {for $will=1 to #QUANTITY}
+            {for $will=1 to $QUANTITY}
             <option>{$will}</option>
             {/for}
         </select>
diff --git a/templates/default_save/tester.html b/templates/default_save/tester.html
index b53396d3f..658339d50 100755
--- a/templates/default_save/tester.html
+++ b/templates/default_save/tester.html
@@ -2,8 +2,8 @@
 {loop name="car" type="category"}
     <li>
         <ul>
-    {loop name="product" type="product" category="#ID"}
-        <li>#REF</li>
+    {loop name="product" type="product" category="$ID"}
+        <li>{$REF}</li>
     {/loop}
         </ul>
     </li>

From 04d517208fca52cf261be8cdd9188a30d9bbf4df Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 16:57:12 +0200
Subject: [PATCH 12/55] remove preThelia smarty filter

---
 core/lib/Thelia/Core/Template/Smarty/SmartyParser.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index 30144a263..ab86f44e8 100755
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -82,19 +82,10 @@ class SmartyParser extends Smarty implements ParserInterface
         // The default HTTP status
         $this->status = 200;
 
-        $this->registerFilter('pre', array($this, "preThelia"));
         $this->registerFilter('output', array($this, "removeBlankLines"));
         $this->registerFilter('variable', array(__CLASS__, "theliaEscape"));
     }
-
-    public function preThelia($tpl_source, \Smarty_Internal_Template $template)
-    {
-        $new_source = preg_replace('`{#([a-zA-Z][a-zA-Z0-9_]*)(.*)}`', '{\$$1$2}', $tpl_source);
-        $new_source = preg_replace('`#([a-zA-Z][a-zA-Z0-9_]*)`', '{\$$1|dieseCanceller:\'#$1\'}', $new_source);
-
-        return $new_source;
-    }
-
+    
     public function removeBlankLines($tpl_source, \Smarty_Internal_Template $template)
     {
         return preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $tpl_source);

From 66d6f86b9ad52745bedbebf7060b22f13cfa1174 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 17:07:20 +0200
Subject: [PATCH 13/55] replace <i> tag by <span> for displaying icons

---
 .../Core/Template/Smarty/SmartyParser.php     |  2 +-
 templates/default/index.html                  |  4 +--
 templates/default/layout.tpl                  | 32 +++++++++----------
 templates/default/login.html                  |  4 +--
 templates/default/register.html               |  4 +--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index ab86f44e8..f0b207425 100755
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -85,7 +85,7 @@ class SmartyParser extends Smarty implements ParserInterface
         $this->registerFilter('output', array($this, "removeBlankLines"));
         $this->registerFilter('variable', array(__CLASS__, "theliaEscape"));
     }
-    
+
     public function removeBlankLines($tpl_source, \Smarty_Internal_Template $template)
     {
         return preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $tpl_source);
diff --git a/templates/default/index.html b/templates/default/index.html
index bdf18cec8..e0411d6b9 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -17,8 +17,8 @@
                     </figure>
                 </div>
             </div>
-            <a class="left carousel-control" href="#carousel" data-slide="prev"><i class="icon-prev"></i></a>
-            <a class="right carousel-control" href="#carousel" data-slide="next"><i class="icon-next"></i></a>
+            <a class="left carousel-control" href="#carousel" data-slide="prev"><span class="icon-prev"></span></a>
+            <a class="right carousel-control" href="#carousel" data-slide="next"><span class="icon-next"></span></a>
         </div>
     </section><!-- #carousel -->
 
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 8cd5d0129..6bf781a3c 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -113,7 +113,7 @@ URL: http://www.thelia.net
                         <div class="input-group">
                             <input type="search" name="q" id="q" placeholder="Search..." class="form-control" aria-required="true" required pattern=". { 2,}" title="Minmimum 2 characters.">
                             <div class="input-group-btn">
-                                <button type="submit" class="btn btn-search"><i class="icon-search"></i> <span>Search</span></button>
+                                <button type="submit" class="btn btn-search"><span class="icon-search"></span> <span>Search</span></button>
                             </div>
                         </div>
                     </form>
@@ -158,15 +158,15 @@ URL: http://www.thelia.net
         <div class="container">
             <div class="banner banner-col-3">
                 <div class="col">
-                    <i class="icon-truck icon-flip-horizontal"></i>
+                    <span class="icon-truck icon-flip-horizontal"></span>
                     Free shipping <small>Orders over $50</small>
                 </div>
                 <div class="col">
-                    <i class="icon-credit-card"></i>
+                    <span class="icon-credit-card"></span>
                     Secure payment <small>Multi-payment plateform</small>
                 </div>
                 <div class="col">
-                    <i class="icon-info"></i>
+                    <span class="icon-info"></span>
                     Need help ? <small>Questions ? See or F.A.Q.</small>
                 </div>
             </div>
@@ -228,48 +228,48 @@ URL: http://www.thelia.net
                                 <li>
                                     <a href="http://facebook.com" class="facebook" data-toggle="tooltip" data-placement="top" title="facebook" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-facebook icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-facebook icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://twitter.com" class="twitter" data-toggle="tooltip" data-placement="top" title="twitter" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-twitter icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-twitter icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://instagram.com" class="instagram" data-toggle="tooltip" data-placement="top" title="instagram" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-instagram icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-instagram icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://google.com" class="google-plus" data-toggle="tooltip" data-placement="top" title="google+" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-google-plus icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-google-plus icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://youtube.com" class="youtube" data-toggle="tooltip" data-placement="top" title="youtube" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-youtube icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-youtube icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="#rss" class="rss" data-toggle="tooltip" data-placement="top" title="rss" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-rss icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-rss icon-light"></span>
 												</span>
                                     </a>
                                 </li>
diff --git a/templates/default/login.html b/templates/default/login.html
index c7eb03986..484125e5d 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -34,7 +34,7 @@
                             <div class="control-input">
                             <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" {$attr}  aria-required="true" autofocus required>
                             {if $error}
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                             {/if}
                             </div>
                         </div>
@@ -58,7 +58,7 @@
                             <div class="control-input">
                             <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off">
                             {if $error}
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                             {/if}
                             </div>
                         </div>
diff --git a/templates/default/register.html b/templates/default/register.html
index e38830743..f8f26e4c1 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -30,7 +30,7 @@
                             <label class="control-label" for="firstname">First Name: <span class="required">*</span></label>
                             <div class="control-input">
                                 <input type="text" name="firstname" id="firstname" class="form-control" placeholder="John" autofocus required>
-                                <span class="help-block"><i class="icon-ok"></i> Available input!</span>
+                                <span class="help-block"><span class="icon-ok"></span> Available input!</span>
                             </div>
                         </div><!--/.form-group-->
 
@@ -38,7 +38,7 @@
                             <label class="control-label " for="lastname">Last Name: <span class="required">*</span></label>
                             <div class="control-input">
                                 <input type="text" name="lastname" id="lastname" class="form-control" placeholder="Doe" required>
-                                <span class="help-block"><i class="icon-remove"></i> Invalid input!</span>
+                                <span class="help-block"><span class="icon-remove"></span> Invalid input!</span>
                             </div>
                         </div><!--/.form-group-->
 

From 6187dbae2245f46df08c900115ff9e40aa775200 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Tue, 10 Sep 2013 18:58:21 +0200
Subject: [PATCH 14/55] thelia loop with currency - TODO : best price whin in
 AND max args

---
 .../lib/Thelia/Core/Template/Loop/Product.php | 176 ++++++++++++------
 .../Template/Loop/ProductSaleElements.php     |  34 +++-
 core/lib/Thelia/Core/Thelia.php               |   1 +
 core/lib/Thelia/Model/Currency.php            |  14 ++
 templates/default_save/product.html           |  15 +-
 5 files changed, 167 insertions(+), 73 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index 22860adbb..2b8aa95fc 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -25,6 +25,7 @@ namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\ActiveQuery\Join;
+use Propel\Runtime\Exception\PropelException;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
@@ -35,6 +36,7 @@ use Thelia\Log\Tlog;
 
 use Thelia\Model\CategoryQuery;
 use Thelia\Model\CountryQuery;
+use Thelia\Model\CurrencyQuery;
 use Thelia\Model\Map\FeatureProductTableMap;
 use Thelia\Model\Map\ProductPriceTableMap;
 use Thelia\Model\Map\ProductSaleElementsTableMap;
@@ -54,8 +56,6 @@ use Thelia\Type\BooleanOrBothType;
  * Class Product
  * @package Thelia\Core\Template\Loop
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
- *
- * @todo : manage currency in price filter
  */
 class Product extends BaseI18nLoop
 {
@@ -137,6 +137,10 @@ class Product extends BaseI18nLoop
      */
     public function exec(&$pagination)
     {
+        $currency = $this->request->getSession()->getCurrency();
+        $defaultCurrency = CurrencyQuery::create()->findOneByByDefault(1);
+        $defaultCurrencySuffix = '_default_currency';
+
         $search = ProductQuery::create();
 
         /* manage translations */
@@ -144,7 +148,7 @@ class Product extends BaseI18nLoop
 
         $attributeNonStrictMatch = $this->getAttribute_non_strict_match();
         $isPSELeftJoinList = array();
-        $isProductPriceLeftJoinList = array();
+        $isProductPriceFirstLeftJoin = array();
 
         $id = $this->getId();
 
@@ -232,46 +236,6 @@ class Product extends BaseI18nLoop
                 ->where('NOT ISNULL(`is_max_weight`.ID)');
         }
 
-        $min_price = $this->getMin_price();
-
-        if(null !== $min_price) {
-            $isPSELeftJoinList[] = 'is_min_price';
-            $isProductPriceLeftJoinList['is_min_price'] = 'min_price_data';
-            $minPriceJoin = new Join();
-            $minPriceJoin->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_min_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'min_price_data');
-            $minPriceJoin->setJoinType(Criteria::LEFT_JOIN);
-
-            $search->joinProductSaleElements('is_min_price', Criteria::LEFT_JOIN)
-                ->addJoinObject($minPriceJoin)
-                ->condition('in_promo', '`is_min_price`.promo'. Criteria::EQUAL .'1')
-                ->condition('not_in_promo', '`is_min_price`.promo'. Criteria::NOT_EQUAL .'1')
-                ->condition('min_promo_price', '`min_price_data`.promo_price' . Criteria::GREATER_EQUAL . '?', $min_price, \PDO::PARAM_STR)
-                ->condition('min_price', '`min_price_data`.price' . Criteria::GREATER_EQUAL . '?', $min_price, \PDO::PARAM_STR)
-                ->combine(array('in_promo', 'min_promo_price'), Criteria::LOGICAL_AND, 'in_promo_min_price')
-                ->combine(array('not_in_promo', 'min_price'), Criteria::LOGICAL_AND, 'not_in_promo_min_price')
-                ->where(array('not_in_promo_min_price', 'in_promo_min_price'), Criteria::LOGICAL_OR);
-        }
-
-        $max_price = $this->getMax_price();
-
-        if(null !== $max_price) {
-            $isPSELeftJoinList[] = 'is_max_price';
-            $isProductPriceLeftJoinList['is_max_price'] = 'max_price_data';
-            $minPriceJoin = new Join();
-            $minPriceJoin->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_max_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'max_price_data');
-            $minPriceJoin->setJoinType(Criteria::LEFT_JOIN);
-
-            $search->joinProductSaleElements('is_max_price', Criteria::LEFT_JOIN)
-                ->addJoinObject($minPriceJoin)
-                ->condition('in_promo', '`is_max_price`.promo'. Criteria::EQUAL .'1')
-                ->condition('not_in_promo', '`is_max_price`.promo'. Criteria::NOT_EQUAL .'1')
-                ->condition('min_promo_price', '`max_price_data`.promo_price' . Criteria::LESS_EQUAL . '?', $max_price, \PDO::PARAM_STR)
-                ->condition('max_price', '`max_price_data`.price' . Criteria::LESS_EQUAL . '?', $max_price, \PDO::PARAM_STR)
-                ->combine(array('in_promo', 'min_promo_price'), Criteria::LOGICAL_AND, 'in_promo_max_price')
-                ->combine(array('not_in_promo', 'max_price'), Criteria::LOGICAL_AND, 'not_in_promo_max_price')
-                ->where(array('not_in_promo_max_price', 'in_promo_max_price'), Criteria::LOGICAL_OR);
-        }
-
         if( $attributeNonStrictMatch != '*' ) {
             if($attributeNonStrictMatch == 'none') {
                 $actuallyUsedAttributeNonStrictMatchList = $isPSELeftJoinList;
@@ -286,13 +250,92 @@ class Product extends BaseI18nLoop
             }
         }
 
+        $min_price = $this->getMin_price();
+
+        if(null !== $min_price) {
+            $isPSELeftJoinList[] = 'is_min_price';
+            $isProductPriceFirstLeftJoin = array('is_min_price', 'min_price_data');
+
+            $minPriceJoin = new Join();
+            $minPriceJoin->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_min_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'min_price_data');
+            $minPriceJoin->setJoinType(Criteria::LEFT_JOIN);
+
+            $search->joinProductSaleElements('is_min_price', Criteria::LEFT_JOIN)
+                ->addJoinObject($minPriceJoin, 'is_min_price_join')
+                ->addJoinCondition('is_min_price_join', '`min_price_data`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
+
+            if($defaultCurrency->getId() != $currency->getId()) {
+                $minPriceJoinDefaultCurrency = new Join();
+                $minPriceJoinDefaultCurrency->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_min_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'min_price_data' . $defaultCurrencySuffix);
+                $minPriceJoinDefaultCurrency->setJoinType(Criteria::LEFT_JOIN);
+
+                $search->addJoinObject($minPriceJoinDefaultCurrency, 'is_min_price_join' . $defaultCurrencySuffix)
+                    ->addJoinCondition('is_min_price_join' . $defaultCurrencySuffix, '`min_price_data' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT);
+
+                $MinPriceToCompareAsSQL = 'CASE WHEN `is_min_price`.PROMO=1 THEN `min_price_data' . $defaultCurrencySuffix . '`.PROMO_PRICE ELSE `min_price_data' . $defaultCurrencySuffix . '`.PRICE END';
+                /**
+                 * In propel we trust : $currency->getRate() always returns a float.
+                 * Or maybe not : rate value is checked as a float in overloaded getRate method.
+                 */
+                $MinPriceToCompareAsSQL = 'CASE WHEN ISNULL(CASE WHEN `is_min_price`.PROMO=1 THEN `min_price_data`.PROMO_PRICE ELSE `min_price_data`.PRICE END) THEN
+                    CASE WHEN `is_min_price`.PROMO=1 THEN `min_price_data' . $defaultCurrencySuffix . '`.PROMO_PRICE ELSE `min_price_data' . $defaultCurrencySuffix . '`.PRICE END * ' . $currency->getRate() . '
+                ELSE
+                    CASE WHEN `is_min_price`.PROMO=1 THEN `min_price_data`.PROMO_PRICE ELSE `min_price_data`.PRICE END
+                END';
+            } else {
+                $MinPriceToCompareAsSQL = 'CASE WHEN `is_min_price`.PROMO=1 THEN `min_price_data`.PROMO_PRICE ELSE `min_price_data`.PRICE END';
+            }
+
+            $search->where('ROUND(' . $MinPriceToCompareAsSQL . ', 2)>=?', $min_price, \PDO::PARAM_STR);
+        }
+
+        $max_price = $this->getMax_price();
+
+        if(null !== $max_price) {
+            $isPSELeftJoinList[] = 'is_max_price';
+            $isProductPriceFirstLeftJoin = array('is_max_price', 'max_price_data');
+
+            $maxPriceJoin = new Join();
+            $maxPriceJoin->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_max_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'max_price_data');
+            $maxPriceJoin->setJoinType(Criteria::LEFT_JOIN);
+
+            $search->joinProductSaleElements('is_max_price', Criteria::LEFT_JOIN)
+                ->addJoinObject($maxPriceJoin, 'is_max_price_join')
+                ->addJoinCondition('is_max_price_join', '`max_price_data`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
+
+            if($defaultCurrency->getId() != $currency->getId()) {
+                $maxPriceJoinDefaultCurrency = new Join();
+                $maxPriceJoinDefaultCurrency->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_max_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'max_price_data' . $defaultCurrencySuffix);
+                $maxPriceJoinDefaultCurrency->setJoinType(Criteria::LEFT_JOIN);
+
+                $search->addJoinObject($maxPriceJoinDefaultCurrency, 'is_max_price_join' . $defaultCurrencySuffix)
+                    ->addJoinCondition('is_max_price_join' . $defaultCurrencySuffix, '`max_price_data' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT);
+
+                /**
+                 * In propel we trust : $currency->getRate() always returns a float.
+                 * Or maybe not : rate value is checked as a float in overloaded getRate method.
+                 */
+                $MaxPriceToCompareAsSQL = 'CASE WHEN ISNULL(CASE WHEN `is_max_price`.PROMO=1 THEN `max_price_data`.PROMO_PRICE ELSE `max_price_data`.PRICE END) THEN
+                    CASE WHEN `is_max_price`.PROMO=1 THEN `max_price_data' . $defaultCurrencySuffix . '`.PROMO_PRICE ELSE `max_price_data' . $defaultCurrencySuffix . '`.PRICE END * ' . $currency->getRate() . '
+                ELSE
+                    CASE WHEN `is_max_price`.PROMO=1 THEN `max_price_data`.PROMO_PRICE ELSE `max_price_data`.PRICE END
+                END';
+
+            } else {
+                $MaxPriceToCompareAsSQL = 'CASE WHEN `is_max_price`.PROMO=1 THEN `max_price_data`.PROMO_PRICE ELSE `max_price_data`.PRICE END';
+            }
+
+            $search->where('ROUND(' . $MaxPriceToCompareAsSQL . ', 2)<=?', $max_price, \PDO::PARAM_STR);
+        }
+
         /*
          * for ordering and outputs, the product will be :
          * - new if at least one the criteria matching PSE is new
          * - in promo if at least one the criteria matching PSE is in promo
          */
 
-        if(count($isProductPriceLeftJoinList) == 0) {
+        /* if we don't have any join yet, let's make a global one */
+        if(empty($isProductPriceFirstLeftJoin)) {
             if(count($isPSELeftJoinList) == 0) {
                 $joiningTable = "global";
                 $isPSELeftJoinList[] = $joiningTable;
@@ -301,15 +344,22 @@ class Product extends BaseI18nLoop
                 $joiningTable = $isPSELeftJoinList[0];
             }
 
-            $isProductPriceLeftJoinList[$joiningTable] = 'global_price_data';
+            $isProductPriceFirstLeftJoin = array($joiningTable, 'global_price_data');
 
-            $minPriceJoin = new Join();
-            $minPriceJoin->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', $joiningTable, ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'global_price_data');
-            $minPriceJoin->setJoinType(Criteria::LEFT_JOIN);
+            $globalPriceJoin = new Join();
+            $globalPriceJoin->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', $joiningTable, ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'global_price_data');
+            $globalPriceJoin->setJoinType(Criteria::LEFT_JOIN);
 
-            $currency = $this->request->getSession()->getCurrency();
-            $search->addJoinObject($minPriceJoin, 'min_price_join')
-                ->addJoinCondition('min_price_join', '`global_price_data`.`currency_id` = ?', $currency, null, \PDO::PARAM_INT);
+            $search->addJoinObject($globalPriceJoin, 'global_price_join')
+                ->addJoinCondition('global_price_join', '`global_price_data`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
+
+            if($defaultCurrency->getId() != $currency->getId()) {
+                $globalPriceJoinDefaultCurrency = new Join();
+                $globalPriceJoinDefaultCurrency->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', $joiningTable, ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'global_price_data' . $defaultCurrencySuffix);
+                $globalPriceJoinDefaultCurrency->setJoinType(Criteria::LEFT_JOIN);
+                $search->addJoinObject($globalPriceJoinDefaultCurrency, 'global_price_join' . $defaultCurrencySuffix)
+                    ->addJoinCondition('global_price_join' . $defaultCurrencySuffix, '`global_price_data' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT);
+            }
         }
 
         /*
@@ -332,18 +382,24 @@ class Product extends BaseI18nLoop
             $booleanMatchedPromoList[] = '`' . $isPSELeftJoin . '`.PROMO';
             $booleanMatchedNewnessList[] = '`' . $isPSELeftJoin . '`.NEWNESS';
         }
-        $booleanMatchedPriceList = array();
-        foreach($isProductPriceLeftJoinList as $pSE => $isProductPriceLeftJoin) {
-            $booleanMatchedPriceList[] = 'CASE WHEN `' . $pSE . '`.PROMO=1 THEN `' . $isProductPriceLeftJoin . '`.PROMO_PRICE ELSE `' . $isProductPriceLeftJoin . '`.PRICE END';
-        }
         $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPromoList) . '), 2)', 'main_product_is_promo');
         $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedNewnessList) . '), 2)', 'main_product_is_new');
-        $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_highest_price');
-        $search->withColumn('ROUND(MIN(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_lowest_price');
 
-        $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_highest_price_default_currency');
-        $search->withColumn('ROUND(MIN(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_lowest_price_default_currency');
+        $booleanMatchedPrice = 'CASE WHEN `' . $isProductPriceFirstLeftJoin[0] . '`.PROMO=1 THEN `' . $isProductPriceFirstLeftJoin[1] . '`.PROMO_PRICE ELSE `' . $isProductPriceFirstLeftJoin[1] . '`.PRICE END';
+        $booleanMatchedPriceDefaultCurrency = 'CASE WHEN `' . $isProductPriceFirstLeftJoin[0] . '`.PROMO=1 THEN `' . $isProductPriceFirstLeftJoin[1] . $defaultCurrencySuffix . '`.PROMO_PRICE ELSE `' . $isProductPriceFirstLeftJoin[1] . $defaultCurrencySuffix . '`.PRICE END';
 
+        if($defaultCurrency->getId() != $currency->getId()) {
+            /**
+             * In propel we trust : $currency->getRate() always returns a float.
+             * Or maybe not : rate value is checked as a float in overloaded getRate method.
+             */
+            $priceToCompareAsSQL = 'CASE WHEN ISNULL(' . $booleanMatchedPrice .') THEN ' . $booleanMatchedPriceDefaultCurrency . ' * ' . $currency->getRate() . ' ELSE ' . $booleanMatchedPrice . ' END';
+        } else {
+            $priceToCompareAsSQL = $booleanMatchedPrice;
+        }
+
+        $search->withColumn('ROUND(MAX(' . $priceToCompareAsSQL . '), 2)', 'real_highest_price');
+        $search->withColumn('ROUND(MIN(' . $priceToCompareAsSQL . '), 2)', 'real_lowest_price');
 
         $current = $this->getCurrent();
 
@@ -507,8 +563,6 @@ class Product extends BaseI18nLoop
             }
         }
 
-        var_dump($search->toString());
-
         /* perform search */
         $products = $this->search($search, $pagination);
 
diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index ec4c73230..38d4d2e94 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -36,6 +36,7 @@ use Thelia\Log\Tlog;
 use Thelia\Model\Base\ProductSaleElementsQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\CountryQuery;
+use Thelia\Model\CurrencyQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
@@ -94,22 +95,37 @@ class ProductSaleElements extends BaseLoop
 
         foreach($orders as $order) {
             switch ($order) {
-                case "alpha":
-                    //$search->addAscendingOrderByColumn(\Thelia\Model\Map\AttributeI18nTableMap::TITLE);
+                case "min_price":
+                    $search->addAscendingOrderByColumn('real_lowest_price', Criteria::ASC);
                     break;
-                case "alpha_reverse":
-                    //$search->addDescendingOrderByColumn(\Thelia\Model\Map\AttributeI18nTableMap::TITLE);
+                case "max_price":
+                    $search->addDescendingOrderByColumn('real_lowest_price');
                     break;
-                case "attribute":
-                    //$search->orderByPosition(Criteria::ASC);
+                case "promo":
+                    $search->addDescendingOrderByColumn('main_product_is_promo');
                     break;
-                case "attribute_reverse":
-                    //$search->orderByPosition(Criteria::DESC);
+                case "new":
+                    $search->addDescendingOrderByColumn('main_product_is_new');
                     break;
+                case "random":
+                    $search->clearOrderByColumns();
+                    $search->addAscendingOrderByColumn('RAND()');
+                    break(2);
             }
         }
 
-        $currency = $this->getCurrency();
+        $currencyId = $this->getCurrency();
+        if(null !== $currency) {
+            $currency = CurrencyQuery::create()->findOneById($currencyId);
+            if(null === $currency) {
+                throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop');
+            }
+        } else {
+            $currency = $this->request->getSession()->getCurrency();
+        }
+
+        $defaultCurrency = CurrencyQuery::create()->findOneByByDefault(1);
+        $defaultCurrencySuffix = '_default_currency';
 
         $search->joinProductPrice('price', Criteria::INNER_JOIN);
             //->addJoinCondition('price', '');
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index e5148e408..8920126b0 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -83,6 +83,7 @@ class Thelia extends Kernel
         $serviceContainer->setConnectionManager('thelia', $manager);
 
         if ($this->isDebug()) {
+            $serviceContainer->setLogger('defaultLogger', Tlog::getInstance());
             $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME);
             $con->useDebug(true);
         }
diff --git a/core/lib/Thelia/Model/Currency.php b/core/lib/Thelia/Model/Currency.php
index 843211d5a..fb59022b8 100755
--- a/core/lib/Thelia/Model/Currency.php
+++ b/core/lib/Thelia/Model/Currency.php
@@ -80,4 +80,18 @@ class Currency extends BaseCurrency {
     {
         $this->dispatchEvent(TheliaEvents::AFTER_DELETECURRENCY, new CurrencyEvent($this));
     }
+
+    /**
+     * Get the [rate] column value.
+     *
+     * @return   double
+     */
+    public function getRate()
+    {
+        if(false === filter_var($this->rate, FILTER_VALIDATE_FLOAT)) {
+            throw new PropelException('Currency::rate is not float value');
+        }
+
+        return $this->rate;
+    }
 }
\ No newline at end of file
diff --git a/templates/default_save/product.html b/templates/default_save/product.html
index 4280fc88c..c3e68fd71 100755
--- a/templates/default_save/product.html
+++ b/templates/default_save/product.html
@@ -1,3 +1,8 @@
+<html>
+<head>
+
+</head>
+<body>
 Here you are : {navigate to="current"}<br />
 From : {navigate to="return_to"}<br />
 Index : {navigate to="index"}<br />
@@ -13,7 +18,7 @@ Index : {navigate to="index"}<br />
     <h3>#TITLE</h3>
     <p>#DESCRIPTION</p>
 
-    <p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
+    <p>Starting by #BEST_PRICE {currency attr="symbol"} HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE {currency attr="symbol"} TTC)</p>
 
     {ifloop rel="acc"}
     <h4>Accessories</h4>
@@ -66,7 +71,7 @@ Index : {navigate to="index"}<br />
         #ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE<br />
         {/loop}
         <br />#WEIGHT g
-        <br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE € HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE € TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC){else} #PRICE € HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC{/if}</strong>
+        <br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE {currency attr="symbol"} HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE {currency attr="symbol"} TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE {currency attr="symbol"} TTC){else} #PRICE {currency attr="symbol"} HT // TAX : #PRICE_TAX ; #TAXED_PRICE {currency attr="symbol"} TTC{/if}</strong>
         <br /><br />
         Add
         <select>
@@ -87,4 +92,8 @@ Index : {navigate to="index"}<br />
 
 {elseloop rel="product"}
     <h2>Produit introuvable !</h2>
-{/elseloop}
\ No newline at end of file
+{/elseloop}
+
+
+</body>
+</html>
\ No newline at end of file

From 8b209291d3b7265d3f96a5b58e53bc744c7aa945 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Tue, 10 Sep 2013 19:03:46 +0200
Subject: [PATCH 15/55] use_tax_free_amounts binary config variable +
 ConfigQuery::useTaxFreeAmounts() helper method

---
 core/lib/Thelia/Model/ConfigQuery.php | 5 +++++
 install/insert.sql                    | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Model/ConfigQuery.php b/core/lib/Thelia/Model/ConfigQuery.php
index 87b506e93..ced3783fe 100755
--- a/core/lib/Thelia/Model/ConfigQuery.php
+++ b/core/lib/Thelia/Model/ConfigQuery.php
@@ -42,4 +42,9 @@ class ConfigQuery extends BaseConfigQuery {
     {
         return self::read('active-template', 'default');
     }
+
+    public static function useTaxFreeAmounts()
+    {
+        return self::read('use_tax_free_amounts', 'default') == 1;
+    }
 } // ConfigQuery
diff --git a/install/insert.sql b/install/insert.sql
index 917966893..d72765d20 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -7,6 +7,7 @@ INSERT INTO `lang`(`id`,`title`,`code`,`locale`,`url`,`date_format`,`time_format
 INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
 ('session_config.default', '1', 1, 1, NOW(), NOW()),
 ('verifyStock', '1', 0, 0, NOW(), NOW()),
+('active-template', 'default', 0, 0, NOW(), NOW()),
 ('default_lang_without_translation', '1', 0, 0, NOW(), NOW()),
 ('rewriting_enable', '0', 0, 0, NOW(), NOW()),
 ('imagine_graphic_driver', 'gd', 0, 0, NOW(), NOW()),
@@ -15,7 +16,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('images_library_path', 'local/media/images', 0, 0, NOW(), NOW()),
 ('image_cache_dir_from_web_root', 'cache/images', 0, 0, NOW(), NOW()),
 ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()),
-('page_not_found_view', '404.html', 0, 0, NOW(), NOW());
+('page_not_found_view', '404.html', 0, 0, NOW(), NOW()),
+('use_tax_free_amounts', 1, 1, 0, NOW(), NOW());
 
 
 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES

From f70cecbbe98d1dcfc9a3b1ddab7d31207c9ffc2e Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Tue, 10 Sep 2013 19:13:28 +0200
Subject: [PATCH 16/55] bug fix

---
 core/lib/Thelia/Core/Template/Loop/Product.php | 7 +++++--
 core/lib/Thelia/Model/Currency.php             | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index 2b8aa95fc..e7d1cf8a3 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -25,7 +25,6 @@ namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\ActiveQuery\Join;
-use Propel\Runtime\Exception\PropelException;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
@@ -253,6 +252,11 @@ class Product extends BaseI18nLoop
         $min_price = $this->getMin_price();
 
         if(null !== $min_price) {
+
+            if(false === ConfigQuery::useTaxFreeAmounts()) {
+                // @todo
+            }
+
             $isPSELeftJoinList[] = 'is_min_price';
             $isProductPriceFirstLeftJoin = array('is_min_price', 'min_price_data');
 
@@ -272,7 +276,6 @@ class Product extends BaseI18nLoop
                 $search->addJoinObject($minPriceJoinDefaultCurrency, 'is_min_price_join' . $defaultCurrencySuffix)
                     ->addJoinCondition('is_min_price_join' . $defaultCurrencySuffix, '`min_price_data' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT);
 
-                $MinPriceToCompareAsSQL = 'CASE WHEN `is_min_price`.PROMO=1 THEN `min_price_data' . $defaultCurrencySuffix . '`.PROMO_PRICE ELSE `min_price_data' . $defaultCurrencySuffix . '`.PRICE END';
                 /**
                  * In propel we trust : $currency->getRate() always returns a float.
                  * Or maybe not : rate value is checked as a float in overloaded getRate method.
diff --git a/core/lib/Thelia/Model/Currency.php b/core/lib/Thelia/Model/Currency.php
index fb59022b8..6ec452456 100755
--- a/core/lib/Thelia/Model/Currency.php
+++ b/core/lib/Thelia/Model/Currency.php
@@ -2,6 +2,7 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\Exception\PropelException;
 use Thelia\Model\Base\Currency as BaseCurrency;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\Connection\ConnectionInterface;
@@ -85,6 +86,7 @@ class Currency extends BaseCurrency {
      * Get the [rate] column value.
      *
      * @return   double
+     * @throws PropelException
      */
     public function getRate()
     {

From a050b0c3629c62a7a565d30bbc95a5a10b11ccdf Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 19:21:56 +0200
Subject: [PATCH 17/55] remove # for smarty variable delimiter

---
 templates/admin/default/includes/generic-js-dialog.html | 2 +-
 templates/admin/default/includes/thelia_news_feed.html  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/admin/default/includes/generic-js-dialog.html b/templates/admin/default/includes/generic-js-dialog.html
index f1be39f03..051aefd29 100644
--- a/templates/admin/default/includes/generic-js-dialog.html
+++ b/templates/admin/default/includes/generic-js-dialog.html
@@ -15,7 +15,7 @@ Parameters:
 {* re-display the form creation dialog if it contains errors *}
 
 {form name="{$form_name}"}
-    {if #form_error}
+    {if $form_error}
         $('#{$dialog_id}').modal();
     {/if}
 {/form}
diff --git a/templates/admin/default/includes/thelia_news_feed.html b/templates/admin/default/includes/thelia_news_feed.html
index 8ef8e2528..6b957c426 100755
--- a/templates/admin/default/includes/thelia_news_feed.html
+++ b/templates/admin/default/includes/thelia_news_feed.html
@@ -3,8 +3,8 @@
 {loop type="feed" name="thelia_feeds" url="http://thelia.net/Flux-rss.html?id_rubrique=8" limit="3"}
      <div class="span4 feed-list-item">
          <h3>{$DATE}</h3>
-         <h2><a href="#URL" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags}</a></h2>
+         <h2><a href="{$URL}" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags}</a></h2>
          <p>{$DESCRIPTION|strip_tags|truncate:250:"...":true}</p>
-         <p><a class="btn" href="#URL" target="_blank">{intl l='Lire la suite »'}</a></p>
+         <p><a class="btn" href="{$URL}" target="_blank">{intl l='Lire la suite »'}</a></p>
      </div>
 {/loop}

From 8be785e9b37ef4e0912243594a5687459f0d2608 Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Tue, 10 Sep 2013 20:00:43 +0200
Subject: [PATCH 18/55] WIP - Coupon Add/Edit/Delete rule AJAX

---
 core/lib/Thelia/Action/Coupon.php             |  54 ++--
 .../Rule/AvailableForTotalAmountManager.php   | 144 -----------
 .../Rule/AvailableForXArticlesManager.php     | 123 +--------
 .../Controller/Admin/CouponController.php     | 200 ++++++++-------
 core/lib/Thelia/Core/Event/TheliaEvents.php   |  16 --
 core/lib/Thelia/Model/Coupon.php              |  92 +++----
 templates/admin/default/coupon-create.html    |   2 +-
 templates/admin/default/coupon-update.html    | 140 +++++++---
 templates/admin/default/coupon/form.html      | 240 +++++++++---------
 .../admin/default/coupon/rule-input-ajax.html |  14 +-
 templates/admin/default/coupon/rules.html     |   6 +-
 11 files changed, 409 insertions(+), 622 deletions(-)

diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php
index fee349585..7a7babf01 100755
--- a/core/lib/Thelia/Action/Coupon.php
+++ b/core/lib/Thelia/Action/Coupon.php
@@ -24,6 +24,7 @@
 namespace Thelia\Action;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Thelia\Constraint\ConstraintFactory;
 use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Coupon as CouponModel;
@@ -68,18 +69,6 @@ class Coupon extends BaseAction implements EventSubscriberInterface
         $this->createOrUpdate($coupon, $event);
     }
 
-    /**
-     * Occurring when a Coupon rule is about to be created
-     *
-     * @param CouponCreateOrUpdateEvent $event Event creation or update Event
-     */
-    public function createRule(CouponCreateOrUpdateEvent $event)
-    {
-        $coupon = $event->getCoupon();
-
-        $this->createOrUpdate($coupon, $event);
-    }
-
     /**
      * Occurring when a Coupon rule is about to be updated
      *
@@ -89,19 +78,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
     {
         $coupon = $event->getCoupon();
 
-        $this->createOrUpdate($coupon, $event);
-    }
-
-    /**
-     * Occurring when a Coupon rule is about to be deleted
-     *
-     * @param CouponCreateOrUpdateEvent $event Event creation or update Event
-     */
-    public function deleteRule(CouponCreateOrUpdateEvent $event)
-    {
-        $coupon = $event->getCoupon();
-
-        $this->createOrUpdate($coupon, $event);
+        $this->createOrUpdateRule($coupon, $event);
     }
 
     /**
@@ -130,6 +107,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
             $event->getTitle(),
             $event->getAmount(),
             $event->getEffect(),
+            $event->isRemovingPostage(),
             $event->getShortDescription(),
             $event->getDescription(),
             $event->isEnabled(),
@@ -137,7 +115,28 @@ class Coupon extends BaseAction implements EventSubscriberInterface
             $event->isAvailableOnSpecialOffers(),
             $event->isCumulative(),
             $event->getMaxUsage(),
-            $event->getRules(),
+            $event->getLocale()
+        );
+
+        $event->setCoupon($coupon);
+    }
+
+    /**
+     * Call the Model and delegate the create or delete action
+     * Feed the Event with the updated model
+     *
+     * @param CouponModel               $coupon Model to save
+     * @param CouponCreateOrUpdateEvent $event  Event containing data
+     */
+    protected function createOrUpdateRule(CouponModel $coupon, CouponCreateOrUpdateEvent $event)
+    {
+        $coupon->setDispatcher($this->getDispatcher());
+
+        /** @var ConstraintFactory $constraintFactory */
+        $constraintFactory = $this->container->get('thelia.constraint.factory');
+
+        $coupon->createOrUpdateRules(
+            $constraintFactory->serializeCouponRuleCollection($event->getRules()),
             $event->getLocale()
         );
 
@@ -172,8 +171,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
             TheliaEvents::COUPON_DISABLE => array("disable", 128),
             TheliaEvents::COUPON_ENABLE => array("enable", 128),
             TheliaEvents::COUPON_CONSUME => array("consume", 128),
-            TheliaEvents::COUPON_RULE_UPDATE => array("updateRule", 128),
-            TheliaEvents::COUPON_RULE_DELETE => array("deleteRule", 128)
+            TheliaEvents::COUPON_RULE_UPDATE => array("updateRule", 128)
         );
     }
 }
diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php
index 6ab746e6c..9f1bf23a0 100644
--- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php
+++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php
@@ -73,70 +73,6 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract
        )
     );
 
-//    /** @var RuleValidator Price Validator */
-//    protected $priceValidator = null;
-
-//    /**
-//     * Check if backoffice inputs are relevant or not
-//     *
-//     * @throws InvalidRuleOperatorException if Operator is not allowed
-//     * @throws InvalidRuleValueException    if Value is not allowed
-//     * @return bool
-//     */
-//    public function checkBackOfficeInput()
-//    {
-//        if (!isset($this->validators)
-//            || empty($this->validators)
-//            ||!isset($this->validators[self::PARAM1_PRICE])
-//            ||!isset($this->validators[self::PARAM1_PRICE])
-//        ) {
-//            throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE);
-//        }
-//
-//        /** @var RuleValidator $ruleValidator */
-//        $ruleValidator = $this->validators[self::PARAM1_PRICE];
-//        /** @var PriceParam $price */
-//        $price = $ruleValidator->getParam();
-//
-//        if (!$price instanceof PriceParam) {
-//            throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE);
-//        }
-//
-//        $this->checkBackOfficeInputsOperators();
-//
-//        return $this->isPriceValid($price->getPrice(), $price->getCurrency());
-//    }
-
-//    /**
-//     * Check if Checkout inputs are relevant or not
-//     *
-//     * @throws InvalidRuleValueException if Value is not allowed
-//     * @return bool
-//     */
-//    public function checkCheckoutInput()
-//    {
-//        $currency = $this->adapter->getCheckoutCurrency();
-//        if (empty($currency)) {
-//            throw new InvalidRuleValueException(
-//                get_class(), self::PARAM1_CURRENCY
-//            );
-//        }
-//
-//        $price = $this->adapter->getCartTotalPrice();
-//        if (empty($price)) {
-//            throw new InvalidRuleValueException(
-//                get_class(), self::PARAM1_PRICE
-//            );
-//        }
-//
-//        $this->paramsToValidate = array(
-//            self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(),
-//            self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency()
-//        );
-//
-//        return $this->isPriceValid($price, $currency);
-//    }
-
     /**
      * Check validators relevancy and store them
      *
@@ -249,49 +185,6 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract
         return false;
     }
 
-//    /**
-//     * Check if a price is valid
-//     *
-//     * @param float  $price    Price to check
-//     * @param string $currency Price currency
-//     *
-//     * @throws InvalidRuleValueException if Value is not allowed
-//     * @return bool
-//     */
-//    protected function isPriceValid($price, $currency)
-//    {
-//        $priceValidator = $this->priceValidator;
-//
-//        /** @var PriceParam $param */
-//        $param = $priceValidator->getParam();
-//        if ($currency == $param->getCurrency()) {
-//            try {
-//                $priceValidator->getParam()->compareTo($price);
-//            } catch(\InvalidArgumentException $e) {
-//                throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE);
-//            }
-//        } else {
-//            throw new InvalidRuleValueException(get_class(), self::PARAM1_CURRENCY);
-//        }
-//
-//        return true;
-//    }
-
-//    /**
-//     * Generate current Rule param to be validated from adapter
-//     *
-//     * @return $this
-//     */
-//    protected function setParametersToValidate()
-//    {
-//        $this->paramsToValidate = array(
-//            self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(),
-//            self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency()
-//        );
-//
-//        return $this;
-//    }
-
     /**
      * Get I18n name
      *
@@ -377,41 +270,4 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract
         );
     }
 
-//    /**
-//     * Populate a Rule from a form admin
-//     *
-//     * @param array $operators Rule Operator set by the Admin
-//     * @param array $values    Rule Values set by the Admin
-//     *
-//     * @throws \InvalidArgumentException
-//     * @return $this
-//     */
-//    public function populateFromForm(array $operators, array $values)
-//    {
-//        if ($values[self::PARAM1_PRICE] === null
-//            || $values[self::PARAM1_CURRENCY] === null
-//        ) {
-//            throw new \InvalidArgumentException(
-//                'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_PRICE . ', ' . self::PARAM1_CURRENCY . ')'
-//            );
-//        }
-//
-//        $this->priceValidator = new RuleValidator(
-//            $operators[self::PARAM1_PRICE],
-//            new PriceParam(
-//                $this->translator,
-//                $values[self::PARAM1_PRICE],
-//                $values[self::PARAM1_CURRENCY]
-//            )
-//        );
-//
-//        $this->validators = array(self::PARAM1_PRICE => $this->priceValidator);
-//
-//        return $this;
-//    }
-
-
-
-
-
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php
index 20d7eddca..26c7a8aeb 100644
--- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php
+++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php
@@ -63,77 +63,6 @@ class AvailableForXArticlesManager extends CouponRuleAbstract
         )
     );
 
-//    /** @var QuantityParam Quantity Validator */
-//    protected $quantityValidator = null;
-
-//    /**
-//     * Check if backoffice inputs are relevant or not
-//     *
-//     * @throws InvalidRuleOperatorException if Operator is not allowed
-//     * @throws InvalidRuleValueException    if Value is not allowed
-//     * @return bool
-//     */
-//    public function checkBackOfficeInput()
-//    {
-//        if (!isset($this->validators)
-//            || empty($this->validators)
-//            ||!isset($this->validators[self::PARAM1_QUANTITY])
-//            ||!isset($this->validators[self::PARAM1_QUANTITY])
-//        ) {
-//            throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY);
-//        }
-//
-//        /** @var RuleValidator $ruleValidator */
-//        $ruleValidator = $this->validators[self::PARAM1_QUANTITY];
-//        /** @var QuantityParam $quantity */
-//        $quantity = $ruleValidator->getParam();
-//
-//        if (!$quantity instanceof QuantityParam) {
-//            throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY);
-//        }
-//
-//        $this->checkBackOfficeInputsOperators();
-//
-//        return $this->isQuantityValid($quantity->getInteger());
-//    }
-
-//    /**
-//     * Generate current Rule param to be validated from adapter
-//     *
-//     * @param CouponAdapterInterface $adapter allowing to gather
-//     *                               all necessary Thelia variables
-//     *
-//     * @return $this
-//     */
-//    protected function setParametersToValidate()
-//    {
-//        $this->paramsToValidate = array(
-//            self::PARAM1_QUANTITY => $this->adapter->getNbArticlesInCart()
-//        );
-//
-//        return $this;
-//    }
-
-//    /**
-//     * Check if Checkout inputs are relevant or not
-//     *
-//     * @throws \Thelia\Exception\InvalidRuleValueException
-//     * @return bool
-//     */
-//    public function checkCheckoutInput()
-//    {
-//        if (!isset($this->paramsToValidate)
-//            || empty($this->paramsToValidate)
-//            ||!isset($this->paramsToValidate[self::PARAM1_QUANTITY])
-//        ) {
-//            throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY);
-//        }
-//
-//        $price = $this->paramsToValidate[self::PARAM1_QUANTITY];
-//
-//        return $this->isQuantityValid($price);
-//    }
-
     /**
      * Check validators relevancy and store them
      *
@@ -174,7 +103,7 @@ class AvailableForXArticlesManager extends CouponRuleAbstract
             );
         }
 
-        if (!is_int($quantityValue) || $quantityValue <= 0) {
+        if ((int) $quantityValue <= 0) {
             throw new \InvalidArgumentException(
                 'Value for quantity field is not legit'
             );
@@ -210,26 +139,6 @@ class AvailableForXArticlesManager extends CouponRuleAbstract
         return false;
     }
 
-//    /**
-//     * Check if a quantity is valid
-//     *
-//     * @param int $quantity Quantity to check
-//     *
-//     * @throws InvalidRuleValueException if Value is not allowed
-//     * @return bool
-//     */
-//    protected function isQuantityValid($quantity)
-//    {
-//        $quantityValidator = $this->quantityValidator;
-//        try {
-//            $quantityValidator->getParam()->compareTo($quantity);
-//        } catch(InvalidArgumentException $e) {
-//            throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY);
-//        }
-//
-//        return true;
-//    }
-
     /**
      * Get I18n name
      *
@@ -267,36 +176,6 @@ class AvailableForXArticlesManager extends CouponRuleAbstract
         return $toolTip;
     }
 
-//    /**
-//     * Populate a Rule from a form admin
-//     *
-//     * @param array $operators Rule Operator set by the Admin
-//     * @param array $values    Rule Values set by the Admin
-//     *
-//     * @throws InvalidArgumentException
-//     * @return $this
-//     */
-//    public function populateFromForm(array $operators, array $values)
-//    {
-//        if ($values[self::PARAM1_QUANTITY] === null) {
-//            throw new InvalidArgumentException(
-//                'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_QUANTITY. ')'
-//            );
-//        }
-//
-//        $this->quantityValidator = new RuleValidator(
-//            $operators[self::PARAM1_QUANTITY],
-//            new QuantityParam(
-//                $this->adapter,
-//                $values[self::PARAM1_QUANTITY]
-//            )
-//        );
-//
-//        $this->validators = array(self::PARAM1_QUANTITY => $this->quantityValidator);
-//
-//        return $this;
-//    }
-
     /**
      * Generate inputs ready to be drawn
      *
diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php
index e11fcf09e..cd8521d7a 100755
--- a/core/lib/Thelia/Controller/Admin/CouponController.php
+++ b/core/lib/Thelia/Controller/Admin/CouponController.php
@@ -158,6 +158,13 @@ class CouponController extends BaseAdminController
             );
         } else {
             // Prepare the data that will hydrate the form
+
+            /** @var ConstraintFactory $constraintFactory */
+            $constraintFactory = $this->container->get('thelia.constraint.factory');
+            $rules = $constraintFactory->unserializeCouponRuleCollection(
+                $coupon->getSerializedRules()
+            );
+
             $data = array(
                 'code' => $coupon->getCode(),
                 'title' => $coupon->getTitle(),
@@ -171,18 +178,12 @@ class CouponController extends BaseAdminController
                 'isCumulative' => ($coupon->getIsCumulative() == 1),
                 'isRemovingPostage' => ($coupon->getIsRemovingPostage() == 1),
                 'maxUsage' => $coupon->getMaxUsage(),
-                'rules' => new CouponRuleCollection(array()),
+                'rules' => $rules,
                 'locale' => $coupon->getLocale(),
             );
 
             $args['rulesObject'] = array();
 
-            /** @var ConstraintFactory $constraintFactory */
-            $constraintFactory = $this->container->get('thelia.constraint.factory');
-            $rules = $constraintFactory->unserializeCouponRuleCollection(
-                $coupon->getSerializedRules()
-            );
-
             /** @var CouponRuleInterface $rule */
             foreach ($rules->getRules() as $rule) {
                 $args['rulesObject'][] = array(
@@ -193,6 +194,8 @@ class CouponController extends BaseAdminController
                 );
             }
 
+            $args['rules'] = $this->cleanRuleForTemplate($rules);
+
             // Setup the object form
             $changeForm = new CouponCreationForm($this->getRequest(), 'form', $data);
 
@@ -216,100 +219,101 @@ class CouponController extends BaseAdminController
 
         $args['formAction'] = 'admin/coupon/update/' . $couponId;
 
-        return $this->render(
-            'coupon-update',
-            $args
-        );
+        return $this->render('coupon-update', $args);
     }
 
 
-    /**
-     * Manage Coupons Rule creation display
-     *
-     * @param int $couponId Coupon id
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function createRuleAction($couponId)
-    {
-        // Check current user authorization
-        $response = $this->checkAuth('admin.coupon.update');
-        if ($response !==  null) {
-            return $response;
-        }
-
-        /** @var Coupon $coupon */
-        $coupon = CouponQuery::create()->findOneById($couponId);
-        if (!$coupon) {
-            $this->pageNotFound();
-        }
-
-        // Parameters given to the template
-        $args = array();
-
-        $i18n = new I18n();
-        /** @var Lang $lang */
-        $lang = $this->getSession()->get('lang');
-        $eventToDispatch = TheliaEvents::COUPON_RULE_CREATE;
-
-        if ($this->getRequest()->isMethod('POST')) {
-            $this->validateCreateOrUpdateForm(
-                $i18n,
-                $lang,
-                $eventToDispatch,
-                'updated',
-                'update'
-            );
-        } else {
-            // Prepare the data that will hydrate the form
-            $data = array(
-                'code' => $coupon->getCode(),
-                'title' => $coupon->getTitle(),
-                'amount' => $coupon->getAmount(),
-                'effect' => $coupon->getType(),
-                'shortDescription' => $coupon->getShortDescription(),
-                'description' => $coupon->getDescription(),
-                'isEnabled' => ($coupon->getIsEnabled() == 1),
-                'expirationDate' => $coupon->getExpirationDate($lang->getDateFormat()),
-                'isAvailableOnSpecialOffers' => ($coupon->getIsAvailableOnSpecialOffers() == 1),
-                'isCumulative' => ($coupon->getIsCumulative() == 1),
-                'isRemovingPostage' => ($coupon->getIsRemovingPostage() == 1),
-                'maxUsage' => $coupon->getMaxUsage(),
-                'rules' => new CouponRuleCollection(array()),
-                'locale' => $coupon->getLocale(),
-            );
-
-            /** @var CouponAdapterInterface $adapter */
-            $adapter = $this->container->get('thelia.adapter');
-            /** @var Translator $translator */
-            $translator = $this->container->get('thelia.translator');
-
-            $args['rulesObject'] = array();
-            /** @var CouponRuleInterface $rule */
-            foreach ($coupon->getRules()->getRules() as $rule) {
-                $args['rulesObject'][] = array(
-                    'name' => $rule->getName($translator),
-                    'tooltip' => $rule->getToolTip($translator),
-                    'validators' => $rule->getValidators()
-                );
-            }
-
+//    /**
+//     * Manage Coupons Rule creation display
+//     *
+//     * @param int $couponId Coupon id
+//     *
+//     * @return \Symfony\Component\HttpFoundation\Response
+//     */
+//    public function createRuleAction($couponId)
+//    {
+//        // Check current user authorization
+//        $response = $this->checkAuth('admin.coupon.update');
+//        if ($response !==  null) {
+//            return $response;
+//        }
+//
+//        /** @var Coupon $coupon */
+//        $coupon = CouponQuery::create()->findOneById($couponId);
+//        if (!$coupon) {
+//            $this->pageNotFound();
+//        }
+//
+//        // Parameters given to the template
+//        $args = array();
+//
+//        $i18n = new I18n();
+//        /** @var Lang $lang */
+//        $lang = $this->getSession()->get('lang');
+//        $eventToDispatch = TheliaEvents::COUPON_RULE_CREATE;
+//
+//        if ($this->getRequest()->isMethod('POST')) {
+//            $this->validateCreateOrUpdateForm(
+//                $i18n,
+//                $lang,
+//                $eventToDispatch,
+//                'updated',
+//                'update'
+//            );
+//        } else {
+//            // Prepare the data that will hydrate the form
+//
+//            /** @var ConstraintFactory $constraintFactory */
+//            $constraintFactory = $this->container->get('thelia.constraint.factory');
+//
+//            $data = array(
+//                'code' => $coupon->getCode(),
+//                'title' => $coupon->getTitle(),
+//                'amount' => $coupon->getAmount(),
+//                'effect' => $coupon->getType(),
+//                'shortDescription' => $coupon->getShortDescription(),
+//                'description' => $coupon->getDescription(),
+//                'isEnabled' => ($coupon->getIsEnabled() == 1),
+//                'expirationDate' => $coupon->getExpirationDate($lang->getDateFormat()),
+//                'isAvailableOnSpecialOffers' => ($coupon->getIsAvailableOnSpecialOffers() == 1),
+//                'isCumulative' => ($coupon->getIsCumulative() == 1),
+//                'isRemovingPostage' => ($coupon->getIsRemovingPostage() == 1),
+//                'maxUsage' => $coupon->getMaxUsage(),
+//                'rules' => $constraintFactory->unserializeCouponRuleCollection($coupon->getSerializedRules()),
+//                'locale' => $coupon->getLocale(),
+//            );
+//
+//            /** @var CouponAdapterInterface $adapter */
+//            $adapter = $this->container->get('thelia.adapter');
+//            /** @var Translator $translator */
+//            $translator = $this->container->get('thelia.translator');
+//
+//            $args['rulesObject'] = array();
+//            /** @var CouponRuleInterface $rule */
+//            foreach ($coupon->getRules()->getRules() as $rule) {
+//                $args['rulesObject'][] = array(
+//                    'name' => $rule->getName($translator),
+//                    'tooltip' => $rule->getToolTip($translator),
+//                    'validators' => $rule->getValidators()
+//                );
+//            }
+//
 //            $args['rules'] = $this->cleanRuleForTemplate($coupon->getRules()->getRules());
-
-            // Setup the object form
-            $changeForm = new CouponCreationForm($this->getRequest(), 'form', $data);
-
-            // Pass it to the parser
-            $this->getParserContext()->addForm($changeForm);
-        }
-
-        $args['formAction'] = 'admin/coupon/update/' . $couponId;
-
-        return $this->render(
-            'coupon-update',
-            $args
-        );
-    }
+//
+//            // Setup the object form
+//            $changeForm = new CouponCreationForm($this->getRequest(), 'form', $data);
+//
+//            // Pass it to the parser
+//            $this->getParserContext()->addForm($changeForm);
+//        }
+//
+//        $args['formAction'] = 'admin/coupon/update/' . $couponId;
+//
+//        return $this->render(
+//            'coupon-update',
+//            $args
+//        );
+//    }
 
 
 
@@ -413,7 +417,6 @@ class CouponController extends BaseAdminController
         $constraintFactory = $this->container->get('thelia.constraint.factory');
         $rulesReceived = json_decode($this->getRequest()->get('rules'));
         foreach ($rulesReceived as $ruleReceived) {
-            var_dump('building ', $ruleReceived->values);
             $rule = $constraintFactory->build(
                 $ruleReceived->serviceId,
                 (array) $ruleReceived->operators,
@@ -442,6 +445,7 @@ class CouponController extends BaseAdminController
             $rules,
             $coupon->getLocale()
         );
+        $couponEvent->setCoupon($coupon);
 
         $eventToDispatch = TheliaEvents::COUPON_RULE_UPDATE;
         // Dispatch Event to the Action
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 500803f53..de7a09e4a 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -296,22 +296,6 @@ final class TheliaEvents
      */
     const AFTER_COUPON_RULE_UPDATE 	= "action.after_update_coupon_rule";
 
-    /**
-     * Sent when attempting to delete Coupon Rule
-     */
-    const COUPON_RULE_DELETE 	= "action.delete_coupon_rule";
-
-    /**
-     * Sent just before an attempt to delete a Coupon Rule
-     */
-    const BEFORE_COUPON_RULE_DELETE 	= "action.before_delete_coupon_rule";
-
-    /**
-     * Sent just after an attempt to delete a Coupon Rule
-     */
-    const AFTER_COUPON_RULE_DELETE 	= "action.after_delete_coupon_rule";
-
-
     // -- Configuration management ---------------------------------------------
 
     const CONFIG_CREATE   = "action.createConfig";
diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php
index f5788ff4f..7a7ce1e4a 100755
--- a/core/lib/Thelia/Model/Coupon.php
+++ b/core/lib/Thelia/Model/Coupon.php
@@ -49,24 +49,25 @@ class Coupon extends BaseCoupon
 
 
     /**
-     * Constructor
+     * Create or Update this Coupon
      *
-     * @param string               $code                       Coupon Code
-     * @param string               $title                      Coupon title
-     * @param float                $amount                     Amount removed from the Total Checkout
-     * @param string               $effect                     Coupon effect
-     * @param string               $shortDescription           Coupon short description
-     * @param string               $description                Coupon description
-     * @param boolean              $isEnabled                  Enable/Disable
-     * @param \DateTime            $expirationDate             Coupon expiration date
-     * @param boolean              $isAvailableOnSpecialOffers Is available on special offers
-     * @param boolean              $isCumulative               Is cumulative
-     * @param boolean              $isRemovingPostage          Is removing Postage
-     * @param int                  $maxUsage                   Coupon quantity
-     * @param CouponRuleCollection $rules                      CouponRuleInterface to add
-     * @param string               $locale                       Coupon Language code ISO (ex: fr_FR)
+     * @param string    $code                       Coupon Code
+     * @param string    $title                      Coupon title
+     * @param float     $amount                     Amount removed from the Total Checkout
+     * @param string    $effect                     Coupon effect
+     * @param bool      $isRemovingPostage          Is removing Postage
+     * @param string    $shortDescription           Coupon short description
+     * @param string    $description                Coupon description
+     * @param boolean   $isEnabled                  Enable/Disable
+     * @param \DateTime $expirationDate             Coupon expiration date
+     * @param boolean   $isAvailableOnSpecialOffers Is available on special offers
+     * @param boolean   $isCumulative               Is cumulative
+     * @param int       $maxUsage                   Coupon quantity
+     * @param string    $locale                     Coupon Language code ISO (ex: fr_FR)
+     *
+     * @throws \Exception
      */
-    function createOrUpdate($code, $title, $amount, $effect, $shortDescription, $description, $isEnabled, $expirationDate, $isAvailableOnSpecialOffers, $isCumulative, $maxUsage, $rules, $locale = null)
+    function createOrUpdate($code, $title, $amount, $effect, $isRemovingPostage, $shortDescription, $description, $isEnabled, $expirationDate, $isAvailableOnSpecialOffers, $isCumulative, $maxUsage, $locale = null)
     {
         $this->setCode($code)
             ->setTitle($title)
@@ -74,13 +75,13 @@ class Coupon extends BaseCoupon
             ->setDescription($description)
             ->setType($effect)
             ->setAmount($amount)
+            ->setIsRemovingPostage($isRemovingPostage)
             ->setType($amount)
             ->setIsEnabled($isEnabled)
             ->setExpirationDate($expirationDate)
             ->setIsAvailableOnSpecialOffers($isAvailableOnSpecialOffers)
             ->setIsCumulative($isCumulative)
-            ->setMaxUsage($maxUsage)
-            ->setRules($rules);
+            ->setMaxUsage($maxUsage);
 
         // Set object language (i18n)
         if (!is_null($locale)) {
@@ -99,33 +100,34 @@ class Coupon extends BaseCoupon
         }
     }
 
-//    /**
-//     * Set the value of [serialized_rules] column.
-//     * Convert a CouponRuleCollection into a serialized array of SerializableRule
-//     *
-//     * @param CouponRuleCollection $rules A set of Rules
-//     *
-//     * @return   \Thelia\Model\Coupon The current object (for fluent API support)
-//     */
-//    public function setRules(CouponRuleCollection $rules)
-//    {
-//        $serializedRules = null;
-//        if ($rules !== null) {
-//            /** @var $rule CouponRuleInterface */
-//            foreach ($rules->getRules() as $rule) {
-//                $serializedRules[] = $rule->getSerializableRule();
-//            }
-//
-//            $serializedRules = (string) base64_encode(serialize($serializedRules));
-//        }
-//
-//        if ($this->serialized_rules !== $serializedRules) {
-//            $this->serialized_rules = $serializedRules;
-//            $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES;
-//        }
-//
-//        return $this;
-//    }
+    /**
+     * Create or Update this coupon rule
+     *
+     * @param string $serializableRules Serialized rules ready to be saved
+     * @param string $locale            Coupon Language code ISO (ex: fr_FR)
+     *
+     * @throws \Exception
+     */
+    function createOrUpdateRules($serializableRules, $locale)
+    {
+        $this->setSerializedRules($serializableRules);
+
+        // Set object language (i18n)
+        if (!is_null($locale)) {
+            $this->setLocale($locale);
+        }
+
+        $con = Propel::getWriteConnection(CouponTableMap::DATABASE_NAME);
+        $con->beginTransaction();
+        try {
+            $this->save($con);
+            $con->commit();
+
+        } catch(\Exception $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
 
 
 
diff --git a/templates/admin/default/coupon-create.html b/templates/admin/default/coupon-create.html
index 7cb31ee09..e8fcb73f5 100755
--- a/templates/admin/default/coupon-create.html
+++ b/templates/admin/default/coupon-create.html
@@ -16,7 +16,7 @@
     </div>
 
     {form name="thelia.admin.coupon.creation"}
-    {include file='coupon/form.html' formAction={url path={$formAction}}}
+    {include file='coupon/form.html' formAction={url path={$formAction}} noRules=true}
     {/form}
 
 </section> <!-- #wrapper -->
diff --git a/templates/admin/default/coupon-update.html b/templates/admin/default/coupon-update.html
index 9b6387cd7..1971fafff 100755
--- a/templates/admin/default/coupon-update.html
+++ b/templates/admin/default/coupon-update.html
@@ -16,7 +16,7 @@
     </div>
 
     {form name="thelia.admin.coupon.creation"}
-        {include file='coupon/form.html' formAction={url path={$formAction}} form=$form}
+        {include file='coupon/form.html' formAction={url path={$formAction}} form=$form noRules=false}
     {/form}
 
 </section> <!-- #wrapper -->
@@ -43,11 +43,19 @@
 
 
 
-
+            Array.prototype.clean = function(deleteValue) {
+                for (var i = 0; i < this.length; i++) {
+                    if (this[i] == deleteValue) {
+                        this.splice(i, 1);
+                        i--;
+                    }
+                }
+                return this;
+            };
 
 
             // Init Rules
-            var initRule = function() {
+            var initRules = function() {
                 var rules = [];
                 {foreach from=$rulesObject key=k item=rule}
                     var rule = {};
@@ -67,16 +75,13 @@
 
             // Save Rules AJAX
             var saveRuleAjax = function() {
+                console.log('rulesToSave');
+                console.log(rulesToSave);
                 var $url = '{$urlAjaxUpdateRules}';
-                console.log('save');
-                console.log('{$urlAjaxUpdateRules}');
-                console.log(rules);
-                console.log(JSON.stringify(rules));
                 $.ajax({
                     type: "POST",
                     url: $url,
-                    {*data: {literal}{{/literal}rules:rules{literal}}{/literal},*}
-                    data: {literal}{{/literal}rules:JSON.stringify(rules){literal}}{/literal},
+                    data: {literal}{{/literal}rules:JSON.stringify(rulesToSave){literal}}{/literal},
                     statusCode: {
                         404: function() {
                             $('#constraint-add-operators-values').html(
@@ -91,20 +96,83 @@
             }
 
             // Remove 1 Rule then Save Rules AJAX
-            var removeRuleAjax = function($id) {
-                rules.slice($id, 1);
+            var removeRuleAjax = function(id) {
+                // Delete rule in temporary array
+                delete rulesToSave[id];
+                rulesToSave.clean(undefined);
+
+                // Save
                 saveRuleAjax();
             }
 
-            // Add 1 Rule then Save Rules AJAX
-            var addRuleAjax = function() {
-                rules.push(ruleToSave);
+            // Add 1 Rule / or update the temporary Rules array then Save Rules via AJAX
+            var addRuleAjax = function(id) {
+                if(typeof id === 'number' && id % 1 == 0) {
+                    rulesToSave[id] = ruleToSave;
+                } else {
+                    rulesToSave.push(ruleToSave);
+                }
+
                 saveRuleAjax();
             }
 
+            // Set rule inputs to allow editing
+            var updateRuleAjax = function(id) {
+                ruleToSave = rulesToSave[id];
+                var ruleToUpdate = ruleToSave;
 
-            var rules = initRule();
-            console.log(rules);
+                // Deleting this rule, we will reset it
+                delete rulesToSave[id];
+
+                // Set the rule seletor
+                $("#category-rule option").filter(function() {
+                    return $(this).val() == ruleToSave.serviceId;
+                }).prop('selected', true);
+
+                // Force rule input refresh
+                loadRuleInputs(ruleToSave.serviceId, ruleToUpdate, function(ruleToUpdate) {
+                    fillInRuleInputs(ruleToUpdate);
+                });
+            }
+
+            // Fill in rule inputs
+            var fillInRuleInputs = function(ruleToUpdate) {
+                var valueId = null;
+                var operatorId = null;
+
+                for (idName in ruleToUpdate.operators) {
+                    // Setting idName operator input
+                    operatorId = idName + '-operator';
+                    $('#' + operatorId).val(ruleToUpdate.operators[idName]);
+                    // Setting idName value input
+                    valueId = idName + '-value';
+                    $('#' + valueId).val(ruleToUpdate.values[idName]);
+                }
+            }
+
+
+
+
+
+            // Reload rule inputs
+            var loadRuleInputs = function(ruleId, ruleToSave, callBack) {
+                $('#constraint-add-operators-values').html('<div class="loading" ></div>');
+                var url = "{$urlAjaxGetRuleInput}";
+                url = url.replace('ruleId', ruleId)
+                $.ajax({
+                    url: url,
+                    statusCode: {
+                        404: function() {
+                            $('#constraint-add-operators-values').html(
+                                '{intl l='Please select another rule'}'
+                            );
+                        }
+                    }
+                }).done(function(data) {
+                    $('#constraint-add-operators-values').html(data);
+                    return callBack(ruleToSave);
+                });
+            }
 
 
             // Save rules on click
@@ -117,12 +185,24 @@
 
             // Remove rule on click
             var onClickDeleteRule = function() {
-                $('#constraint-delete-btn').on('click', function (e) {
-//                    removeRuleAjax();
+                $('.constraint-delete-btn').on('click', function (e) {
+                    e.preventDefault();
+                    var $this = $(this);
+                    removeRuleAjax($this.attr('data-int'));
                 });
             }
             onClickDeleteRule();
 
+            // Remove rule on click
+            var onClickUpdateRule = function() {
+                $('.constraint-update-btn').on('click', function (e) {
+                    e.preventDefault();
+                    var $this = $(this);
+                    updateRuleAjax($this.attr('data-int'));
+                });
+            }
+            onClickUpdateRule();
+
             // Reload effect inputs when changing effect
             var onEffectChange = function() {
                 $('#effect').on('change', function (e) {
@@ -135,24 +215,18 @@
             // Reload rule inputs when changing effect
             var onRuleChange = function() {
                 $('#category-rule').on('change', function (e) {
-                    $('#constraint-add-operators-values').html('<div class="loading" ></div>');
-                    var url = "{$urlAjaxGetRuleInput}";
-                    url = url.replace('ruleId', $(this).val())
-                    $.ajax({
-                        url: url,
-                        statusCode: {
-                            404: function() {
-                                $('#constraint-add-operators-values').html(
-                                    '{intl l='Please select another rule'}'
-                                );
-                            }
-                        }
-                    }).done(function(data) {
-                        $('#constraint-add-operators-values').html(data);
-                    });
+                    loadRuleInputs($(this).val(), null, function(ruleToSave) {});
                 });
             }
             onRuleChange();
+
+
+
+
+            // Rule to save
+            var ruleToSave = {literal}{}{/literal};
+            // Rules which will be saved
+            var rulesToSave = initRules();
         });
 
 
diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html
index e22136d41..5d30d201d 100644
--- a/templates/admin/default/coupon/form.html
+++ b/templates/admin/default/coupon/form.html
@@ -161,134 +161,122 @@
 
         </div>
     </section>
-
-    <section class="row">
-        <div class="col-md-12 general-block-decorator">
-            <table class="table table-striped">
-                <caption class="clearfix">
-                    {intl l='Rules'}
-                </caption>
-                <thead>
-                <tr>
-                    <th>{intl l='Conditions'}</th>
-                    <th>{intl l='Actions'}</th>
-                </tr>
-                </thead>
-                <tbody id="constraint-list">
-                    {include file='coupon/rules.html' rules=$rulesObject}
-                    {*{foreach from=$rulesObject item=rule name=rulesForeach}*}
-                        {*<tr>*}
-                            {*<td>*}
-                                {*{if !$smarty.foreach.rulesForeach.first}*}
-                                    {*<span class="label label-info">{intl l='And'}</span>*}
-                                {*{/if}*}
-                                {*{$rule.tooltip nofilter}*}
-                            {*</td>*}
-
-                            {*<td>*}
-                                {*<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> {intl l='Edit'}</a>*}
-                                {*<a href="#url" class="btn btn-default btn-danger btn-medium" data-toggle="confirm" data-target="#delete"><span class="glyphicon glyphicon-remove"></span> {intl l='Delete'}</a>*}
-                            {*</td>*}
-                        {*</tr>*}
-                    {*{/foreach}*}
-                </tbody>
-            </table>
-        </div>
-    </section>
-
-    <section class="row">
-        <div class="col-md-12 general-block-decorator clearfix">
-            <a id="constraint-save-btn" title="{intl l='Save this rule'}" class="btn btn-default btn-primary pull-right">
-                <span class="glyphicon glyphicon-plus-sign"></span>
-            </a>
-
-            <div id="rule-add-organizer" class="form-group col-md-2">
-                <label for="type">{intl l='Condition type :'}</label>
-                <label class="radio">
-                    <input type="radio" name="type" id="type" value="1" checked> {intl l='And'}
-                </label>
-                <label class="radio">
-                    <input type="radio" name="type" value="2"> {intl l='Or'}
-                </label>
+    {if $noRules}
+        {include file='includes/notifications.html' message={intl l='Please save your Coupon in oder to affect it some application fields'}}
+    {else}
+        <section class="row">
+            <div class="col-md-12 general-block-decorator">
+                <table class="table table-striped">
+                    <caption class="clearfix">
+                        {intl l='Rules'}
+                    </caption>
+                    <thead>
+                    <tr>
+                        <th>{intl l='Conditions'}</th>
+                        <th>{intl l='Actions'}</th>
+                    </tr>
+                    </thead>
+                    <tbody id="constraint-list">
+                        {include file='coupon/rules.html' rules=$rules}
+                    </tbody>
+                </table>
             </div>
+        </section>
 
-            <div id="rule-add-type" class="form-group col-md-4">
-                <label for="categoryRule">{intl l='Rule\'s category :'}</label>
-                <select name="categoryRule" id="category-rule" class="form-control">
-                    {foreach from=$availableRules item=availableRule}
-                        <option value="{$availableRule.serviceId}" data-description="{$availableRule.toolTip}">{$availableRule.name}</option>
-                    {/foreach}
-                </select>
+        <section class="row">
+            <div class="col-md-12 general-block-decorator clearfix">
+                <a id="constraint-save-btn" title="{intl l='Save this rule'}" class="btn btn-default btn-primary pull-right">
+                    <span class="glyphicon glyphicon-plus-sign"></span>
+                </a>
+
+                <div id="rule-add-organizer" class="form-group col-md-2">
+                    <label for="type">{intl l='Condition type :'}</label>
+                    <label class="radio">
+                        <input type="radio" name="type" id="type" value="1" checked> {intl l='And'}
+                    </label>
+                    <label class="radio">
+                        <input type="radio" name="type" value="2"> {intl l='Or'}
+                    </label>
+                </div>
+
+                <div id="rule-add-type" class="form-group col-md-4">
+                    <label for="categoryRule">{intl l='Rule\'s category :'}</label>
+                    <select name="categoryRule" id="category-rule" class="form-control">
+                        {foreach from=$availableRules item=availableRule}
+                            <option value="{$availableRule.serviceId}" data-description="{$availableRule.toolTip}">{$availableRule.name}</option>
+                        {/foreach}
+                    </select>
+                </div>
+
+                <div id="constraint-add-operators-values" class="form-group col-md-6">
+                    {*<label for="operator">{intl l='Operator :'}</label>*}
+                    {*<div class="row">*}
+                        {*<div class="col-lg-6">*}
+                            {*<select name="operator" id="operator" class="form-control">*}
+                                {*<option value="1">is superior to</option>*}
+                                {*<option value="2">equals to</option>*}
+                                {*<option value="3">is inferior to</option>*}
+                                {*<option value="4">is inferior or equals to</option>*}
+                                {*<option value="5">is superior or equals to</option>*}
+                            {*</select>*}
+                        {*</div>*}
+                        {*<div class="input-group col-lg-6">*}
+                            {*<input type="text" name="value" class="form-control">*}
+                            {*<span class="input-group-addon">&euro;</span>*}
+                        {*</div>*}
+                    {*</div>*}
+                    {**}
+
+                    {*<label for="operator">Operator :</label>*}
+                    {*<div class="row">*}
+                        {*<div class="col-lg-6">*}
+                            {*<select name="operator" id="operator" class="form-control">*}
+                                {*<option value="1">is superior to</option>*}
+                                {*<option value="2">equals to</option>*}
+                                {*<option value="3">is inferior to</option>*}
+                                {*<option value="4">is inferior or equals to</option>*}
+                                {*<option value="5">is superior or equals to</option>*}
+                            {*</select>*}
+                        {*</div>*}
+                        {*<div class="input-group col-lg-6 date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">*}
+                            {*<input type="text" name="value" class="form-control">*}
+                            {*<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span>*}
+                        {*</div>*}
+                    {*</div>*}
+
+                    {*<label for="operator">Operator :</label>*}
+                    {*<div class="row">*}
+                        {*<div class="col-lg-6">*}
+                            {*<select name="operator" id="operator" class="form-control">*}
+                                {*<option value="1">is superior to</option>*}
+                                {*<option value="2">equals to</option>*}
+                                {*<option value="3">is inferior to</option>*}
+                                {*<option value="4">is inferior or equals to</option>*}
+                                {*<option value="5">is superior or equals to</option>*}
+                            {*</select>*}
+                        {*</div>*}
+                        {*<div class="col-lg-6">*}
+                            {*<input type="text" name="value" class="form-control">*}
+                        {*</div>*}
+                    {*</div>*}
+                    {*<div class="row">*}
+                        {*<div class="col-lg-12">*}
+                            {*<table class="table table-bordered">*}
+                                {*<tr>*}
+                                    {*<td id="minibrowser-breadcrumb"></td>*}
+                                {*</tr>*}
+                                {*<tr>*}
+                                    {*<th><span class="icon-th-list"></span> Categories list</th>*}
+                                {*</tr>*}
+                                {*<tr>*}
+                                    {*<td id="minibrowser-categories"></td>*}
+                                {*</tr>*}
+                            {*</table>*}
+                        {*</div>*}
+                    {*</div>*}
+                </div>
             </div>
-
-            <div id="constraint-add-operators-values" class="form-group col-md-6">
-                {*<label for="operator">{intl l='Operator :'}</label>*}
-                {*<div class="row">*}
-                    {*<div class="col-lg-6">*}
-                        {*<select name="operator" id="operator" class="form-control">*}
-                            {*<option value="1">is superior to</option>*}
-                            {*<option value="2">equals to</option>*}
-                            {*<option value="3">is inferior to</option>*}
-                            {*<option value="4">is inferior or equals to</option>*}
-                            {*<option value="5">is superior or equals to</option>*}
-                        {*</select>*}
-                    {*</div>*}
-                    {*<div class="input-group col-lg-6">*}
-                        {*<input type="text" name="value" class="form-control">*}
-                        {*<span class="input-group-addon">&euro;</span>*}
-                    {*</div>*}
-                {*</div>*}
-                {**}
-
-                {*<label for="operator">Operator :</label>*}
-                {*<div class="row">*}
-                    {*<div class="col-lg-6">*}
-                        {*<select name="operator" id="operator" class="form-control">*}
-                            {*<option value="1">is superior to</option>*}
-                            {*<option value="2">equals to</option>*}
-                            {*<option value="3">is inferior to</option>*}
-                            {*<option value="4">is inferior or equals to</option>*}
-                            {*<option value="5">is superior or equals to</option>*}
-                        {*</select>*}
-                    {*</div>*}
-                    {*<div class="input-group col-lg-6 date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">*}
-                        {*<input type="text" name="value" class="form-control">*}
-                        {*<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span>*}
-                    {*</div>*}
-                {*</div>*}
-
-                {*<label for="operator">Operator :</label>*}
-                {*<div class="row">*}
-                    {*<div class="col-lg-6">*}
-                        {*<select name="operator" id="operator" class="form-control">*}
-                            {*<option value="1">is superior to</option>*}
-                            {*<option value="2">equals to</option>*}
-                            {*<option value="3">is inferior to</option>*}
-                            {*<option value="4">is inferior or equals to</option>*}
-                            {*<option value="5">is superior or equals to</option>*}
-                        {*</select>*}
-                    {*</div>*}
-                    {*<div class="col-lg-6">*}
-                        {*<input type="text" name="value" class="form-control">*}
-                    {*</div>*}
-                {*</div>*}
-                {*<div class="row">*}
-                    {*<div class="col-lg-12">*}
-                        {*<table class="table table-bordered">*}
-                            {*<tr>*}
-                                {*<td id="minibrowser-breadcrumb"></td>*}
-                            {*</tr>*}
-                            {*<tr>*}
-                                {*<th><span class="icon-th-list"></span> Categories list</th>*}
-                            {*</tr>*}
-                            {*<tr>*}
-                                {*<td id="minibrowser-categories"></td>*}
-                            {*</tr>*}
-                        {*</table>*}
-                    {*</div>*}
-                {*</div>*}
-            </div>
-        </div>
-    </section>
+        </section>
+    {/if}
 </form>
 
diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html
index cf921932b..d0959a3ad 100644
--- a/templates/admin/default/coupon/rule-input-ajax.html
+++ b/templates/admin/default/coupon/rule-input-ajax.html
@@ -1,4 +1,3 @@
-{*{$inputs.inputs|var_dump}*}
 {foreach from=$inputs.inputs key=name item=input}
     <label for="operator">{$input.title}</label>
     <div class="row">
@@ -71,6 +70,8 @@
     {*</div>*}
 
 <script>
+
+    // Init Rules to set
     var ruleToSave = {};
     ruleToSave['serviceId'] = '{$ruleId}';
     ruleToSave['operators'] = {};
@@ -81,22 +82,23 @@
     {/foreach}
 
 
-    // Update ruleToSave Array ready to be saved
+    // Fill in ready to be saved rule array
     var onInputsChange = function() {literal}{{/literal}
         {foreach from=$inputs.inputs key=name item=input}
             $('#{$name}-operator').change(function (e) {
+
                 var $this = $(this);
+                console.log('{$name}-operator changed by ' + $this.val());
                 ruleToSave['operators']['{$name nofilter}'] = $this.val();
-                console.log('#{$name}-operator changed ' + $this.val());
-                console.log(ruleToSave);
             });
             $('#{$name}-value').change(function (e) {
                 var $this = $(this);
+                console.log('{$name}-value changed by ' + $this);
                 ruleToSave['values']['{$name nofilter}'] = $this.val();
-                console.log('#{$name}-value changed ' + $this.val());
-                console.log(ruleToSave);
             });
         {/foreach}
+        console.log('will save ');
+        console.log(ruleToSave);
     {literal}}{/literal}
     onInputsChange();
 </script>
\ No newline at end of file
diff --git a/templates/admin/default/coupon/rules.html b/templates/admin/default/coupon/rules.html
index 8dca66c49..199ee44c3 100644
--- a/templates/admin/default/coupon/rules.html
+++ b/templates/admin/default/coupon/rules.html
@@ -1,4 +1,4 @@
-{foreach from=$rules item=rule name=rulesForeach}
+{foreach from=$rules item=rule key=i name=rulesForeach}
     <tr>
         <td>
             {if !$smarty.foreach.rulesForeach.first}
@@ -7,10 +7,10 @@
             {$rule nofilter}
         </td>
         <td>
-            <a class="btn btn-default btn-primary btn-medium" href="{$urlEdit}">
+            <a data-int="{$i}" class="btn btn-default btn-primary btn-medium constraint-update-btn" href="{$urlEdit}">
                 <span class="glyphicon glyphicon-edit"></span> {intl l='Edit'}
             </a>
-            <a data-target="#delete" data-toggle="confirm" class="btn btn-default btn-danger btn-medium" href="{$urlDelete}">
+            <a data-int="{$i}" data-target="#delete" data-toggle="confirm" class="btn btn-default btn-danger btn-medium constraint-delete-btn" href="{$urlDelete}">
                 <span class="glyphicon glyphicon-remove"></span> {intl l='Delete'}
             </a>
         </td>

From c4bc273ad52d050d01a3d92400ba19e314048111 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 21:03:48 +0200
Subject: [PATCH 19/55] save duration and memory in debugBar

---
 core/lib/Thelia/Core/Thelia.php               |  1 -
 .../DataCollector/PropelCollector.php         | 48 +++++++++++++++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 8920126b0..e5148e408 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -83,7 +83,6 @@ class Thelia extends Kernel
         $serviceContainer->setConnectionManager('thelia', $manager);
 
         if ($this->isDebug()) {
-            $serviceContainer->setLogger('defaultLogger', Tlog::getInstance());
             $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME);
             $con->useDebug(true);
         }
diff --git a/local/modules/DebugBar/DataCollector/PropelCollector.php b/local/modules/DebugBar/DataCollector/PropelCollector.php
index 881b1b64a..823a31666 100644
--- a/local/modules/DebugBar/DataCollector/PropelCollector.php
+++ b/local/modules/DebugBar/DataCollector/PropelCollector.php
@@ -115,14 +115,52 @@ class PropelCollector extends DataCollector implements Renderable, LoggerInterfa
      */
     public function log($level, $message, array $context = array())
     {
+        list($sql, $duration_str) = $this->parseAndLogSqlQuery($message);
+
+        $message = "$sql ($duration_str)";
+    }
+
+    /**
+     * Parse a log line to extract query information
+     *
+     * @param string $message
+     */
+    protected function parseAndLogSqlQuery($message)
+    {
+        $parts = explode('|', $message, 3);
+        $duration = 0;
+        $memory = 0;
+        if (count($parts) > 1) {
+            $sql = trim($parts[2]);
+
+            if (preg_match('/([0-9]+\.[0-9]+)/', $parts[0], $matches)) {
+                $duration = (float) $matches[1];
+            }
+
+            if (preg_match('/([0-9]+\.[0-9]+)([A-Z]{1,2})/', $parts[1], $matches)) {
+                $memory = (float) $matches[1];
+                if ($matches[2] == 'KB') {
+                    $memory *= 1024;
+                } else if ($matches[2] == 'MB') {
+                    $memory *= 1024 * 1024;
+                }
+            }
+        } else {
+            $sql = $parts[0];
+        }
+
+
         $this->statements[] = array(
-            'sql' => $message,
+            'sql' => $sql,
             'is_success' => true,
-            'duration' => 0,
-            'duration_str' => $this->formatDuration(1),
-            'memory' => 1,
-            'memory_str' => $this->formatBytes(1)
+            'duration' => $duration,
+            'duration_str' => $this->formatDuration($duration),
+            'memory' => $memory,
+            'memory_str' => $this->formatBytes($memory)
         );
+        $this->accumulatedTime += $duration;
+        $this->peakMemory = max($this->peakMemory, $memory);
+        return array($sql, $this->formatDuration($duration));
     }
 
     /**

From fe8680ed76b0bab62bd3cb8d96f93f9b40228db4 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 22:15:55 +0200
Subject: [PATCH 20/55] refactor debugBar plugin

---
 .../DebugBar/Smarty/Plugin/DebugBar.php       | 59 ++++++++++++++++++-
 templates/default/layout.tpl                  |  5 +-
 2 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/local/modules/DebugBar/Smarty/Plugin/DebugBar.php b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php
index 9a333b1d6..70a896433 100644
--- a/local/modules/DebugBar/Smarty/Plugin/DebugBar.php
+++ b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php
@@ -26,6 +26,7 @@ use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
 use Thelia\Core\Template\Smarty\an;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use DebugBar\DebugBar as BaseDebugBar;
+use Thelia\Tools\URL;
 
 /**
  * Class DebugBar
@@ -52,12 +53,63 @@ class DebugBar extends AbstractSmartyPlugin
         return $render;
     }
 
+    public function renderCss($params, \Smarty_Internal_Template $template)
+    {
+        $render = "";
+        if($this->debugMode)
+        {
+            $webFile = "cache/debugbar.css";
+            $cssFile = THELIA_WEB_DIR ."/".$webFile;
+
+            if(!file_exists($cssFile)) {
+                $javascriptRenderer = $this->debugBar->getJavascriptRenderer();
+                $assetCss = $javascriptRenderer->getAsseticCollection("css");
+
+                foreach($assetCss->all() as $asset) {
+                    if(strpos($asset->getSourcePath(), "font-awesome") !== false) {
+                        $assetCss->removeLeaf($asset);
+                    }
+                }
+
+                file_put_contents($cssFile, $assetCss->dump());
+            }
+            $render =  sprintf('<link rel="stylesheet" href="%s">', URL::getInstance()->absoluteUrl($webFile, array(), URL::PATH_TO_FILE));
+        }
+        return $render;
+    }
+
+    public function renderJs($params, \Smarty_Internal_Template $template)
+    {
+        $render = "";
+        if($this->debugMode)
+        {
+            $webFile = "cache/debugbar.js";
+            $cacheFile = THELIA_WEB_DIR ."/".$webFile;
+
+            if (!file_exists($cacheFile)) {
+                $javascriptRenderer = $this->debugBar->getJavascriptRenderer();
+                $assetJs = $javascriptRenderer->getAsseticCollection("js");
+
+                foreach($assetJs->all() as $asset) {
+                    if(strpos($asset->getSourcePath(), "jquery") !== false) {
+                        $assetJs->removeLeaf($asset);
+                    }
+                }
+
+                file_put_contents($cacheFile, $assetJs->dump());
+            }
+
+            $render = sprintf('<script src="%s"></script>', URL::getInstance()->absoluteUrl($webFile, array(), URL::PATH_TO_FILE));
+        }
+        return $render;
+    }
+
     public function renderHead($params, \Smarty_Internal_Template $template)
     {
         $render = "";
         if ($this->debugMode) {
             $javascriptRenderer = $this->debugBar->getJavascriptRenderer();
-            $assets = $javascriptRenderer->getAsseticCollection();
+            $assets = $javascriptRenderer->getAssets();
 
             $cssCollection = $assets[0];
             $jsCollection = $assets[1];
@@ -75,8 +127,9 @@ class DebugBar extends AbstractSmartyPlugin
     public function getPluginDescriptors()
     {
         return array(
-            new SmartyPluginDescriptor("function", "debugbar_renderHead", $this, "renderHead"),
-            new SmartyPluginDescriptor("function", "debugbar_render", $this, "render")
+            new SmartyPluginDescriptor("function", "debugbar_rendercss", $this, "renderCss"),
+            new SmartyPluginDescriptor("function", "debugbar_renderjs", $this, "renderJs"),
+            new SmartyPluginDescriptor("function", "debugbar_renderresult", $this, "render")
         );
     }
 }
\ No newline at end of file
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 8cd5d0129..fccd4dfb8 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -30,7 +30,7 @@ URL: http://www.thelia.net
     {stylesheets file='assets/less/styles.less' filters='less,cssembed'}
         <link rel="stylesheet" href="{$asset_url}">
     {/stylesheets}
-
+    {debugbar_rendercss}
     {block name="stylesheet"}{/block}
 </head>
 
@@ -397,6 +397,9 @@ URL: http://www.thelia.net
     <script src="{$asset_url}"></script>
 {/javascripts}
 
+{debugbar_renderjs}
+{debugbar_renderresult}
+
 <!--[if lt IE 9]>
 <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->

From 08a6b0d1955e4873ccdb0ceaddfa590a9621d9c5 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 22:37:29 +0200
Subject: [PATCH 21/55] activate propel prepare caching

---
 core/lib/Thelia/Core/Thelia.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index e5148e408..29290dd7e 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -32,6 +32,7 @@ namespace Thelia\Core;
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
 
+use Propel\Runtime\Connection\ConnectionWrapper;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Kernel;
@@ -81,9 +82,10 @@ class Thelia extends Kernel
         $manager = new ConnectionManagerSingle();
         $manager->setConfiguration($definePropel->getConfig());
         $serviceContainer->setConnectionManager('thelia', $manager);
-
+        $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME);
+        $con->setAttribute(ConnectionWrapper::PROPEL_ATTR_CACHE_PREPARES, true);
         if ($this->isDebug()) {
-            $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME);
+
             $con->useDebug(true);
         }
     }

From 990ab0e094a42b57ec500f7eaee204caed5e72e5 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 11 Sep 2013 08:19:37 +0200
Subject: [PATCH 22/55] change debugbar render tag in templates

---
 templates/admin/default/admin-layout.tpl    | 8 ++++----
 templates/default_save/includes/footer.html | 3 ++-
 templates/default_save/includes/header.html | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index 1a21b9165..942557600 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -23,7 +23,7 @@
         <link rel="stylesheet" href="{$asset_url}">
     {/stylesheets}
 
-    {debugbar_renderHead}
+    {debugbar_rendercss}
 
     {block name="after-bootstrap-css"}{/block}
 
@@ -36,8 +36,6 @@
     {* Modules css are included here *}
 
     {module_include location='head_css'}
-
-    {debugbar_renderHead}
 </head>
 
 <body>
@@ -225,11 +223,13 @@
 
 	<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
 
+    {debugbar_renderjs}
+    {debugbar_renderresult}
+
 	{block name="after-javascript-include"}{/block}
 
     {block name="javascript-initialization"}{/block}
 
-    {debugbar_render}
 	{* Modules scripts are included now *}
 	{module_include location='footer_js'}
 
diff --git a/templates/default_save/includes/footer.html b/templates/default_save/includes/footer.html
index 2f14e2fd8..0b876c3ac 100755
--- a/templates/default_save/includes/footer.html
+++ b/templates/default_save/includes/footer.html
@@ -13,6 +13,7 @@
 				});
 			});
 		</script>
-        {debugbar_render}
+        {debugbar_renderjs}
+        {debugbar_renderresult}
 	</body>
 </html>
\ No newline at end of file
diff --git a/templates/default_save/includes/header.html b/templates/default_save/includes/header.html
index b605ecbb7..7161145a5 100755
--- a/templates/default_save/includes/header.html
+++ b/templates/default_save/includes/header.html
@@ -7,7 +7,7 @@
 		{stylesheets file='../assets/css/*' filters='less,cssembed'}
 			<link rel="stylesheet" href="{$asset_url}">
 		{/stylesheets}
-        {debugbar_renderHead}
+        {debugbar_rendercss}
     </head>
 <body>
 <div>

From 70d93d1daac76a0f1cd9a915a265f77eab22be50 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 11 Sep 2013 08:27:40 +0200
Subject: [PATCH 23/55] fix cs

---
 core/lib/Thelia/Action/Address.php            |  4 +-
 core/lib/Thelia/Action/BaseAction.php         |  6 +-
 core/lib/Thelia/Action/Cart.php               |  3 -
 core/lib/Thelia/Action/Category.php           |  1 -
 core/lib/Thelia/Action/Config.php             |  1 -
 core/lib/Thelia/Action/Coupon.php             |  3 -
 core/lib/Thelia/Action/Currency.php           | 12 +--
 core/lib/Thelia/Action/Customer.php           | 11 ---
 core/lib/Thelia/Action/Image.php              | 78 ++++++++-----------
 core/lib/Thelia/Action/Message.php            |  1 -
 core/lib/Thelia/Action/PageNotFound.php       |  3 +-
 .../Thelia/Action/PositionManagementTrait.php |  6 +-
 core/lib/Thelia/Cart/CartTrait.php            |  2 +-
 core/lib/Thelia/Command/CacheClear.php        |  2 +-
 core/lib/Thelia/Command/ClearImageCache.php   |  6 +-
 core/lib/Thelia/Command/CreateAdminUser.php   |  5 +-
 .../Thelia/Command/ReloadDatabaseCommand.php  |  3 +-
 .../Thelia/Command/Skeleton/Module/Class.php  |  2 +-
 .../Controller/Admin/AttributeController.php  | 24 ++----
 .../Controller/Admin/BaseAdminController.php  | 54 ++++++-------
 .../Controller/Admin/CategoryController.php   | 62 ++++++---------
 .../Controller/Admin/ConfigController.php     | 47 +++++------
 .../Controller/Admin/CouponController.php     | 11 ---
 .../Controller/Admin/CurrencyController.php   | 60 +++++++-------
 .../Controller/Admin/CustomerController.php   |  4 +-
 .../Controller/Admin/MessageController.php    | 40 ++++------
 .../Controller/Admin/SessionController.php    | 12 +--
 core/lib/Thelia/Controller/BaseController.php | 31 ++++----
 .../Controller/Front/AddressController.php    | 17 ++--
 .../Controller/Front/BaseFrontController.php  |  8 +-
 .../Controller/Front/CartController.php       |  3 +-
 .../Controller/Front/CustomerController.php   | 33 +++-----
 .../Controller/Front/DefaultController.php    |  8 +-
 .../Controller/Front/DeliveryController.php   |  3 +-
 .../Install/BaseInstallController.php         |  3 +-
 .../Controller/Install/InstallController.php  |  9 +--
 core/lib/Thelia/Core/Event/ActionEvent.php    |  4 +-
 .../Core/Event/AddressCreateOrUpdateEvent.php |  6 +-
 core/lib/Thelia/Core/Event/AddressEvent.php   |  6 +-
 .../Core/Event/BaseToggleVisibilityEvent.php  |  4 +-
 .../Core/Event/BaseUpdatePositionEvent.php    |  3 +
 core/lib/Thelia/Core/Event/CartEvent.php      |  1 -
 .../Thelia/Core/Event/CategoryCreateEvent.php |  7 +-
 .../Thelia/Core/Event/CategoryDeleteEvent.php |  5 +-
 core/lib/Thelia/Core/Event/CategoryEvent.php  |  3 +-
 .../Event/CategoryToggleVisibilityEvent.php   |  2 +-
 .../Thelia/Core/Event/CategoryUpdateEvent.php |  8 +-
 .../Event/CategoryUpdatePositionEvent.php     |  2 +-
 .../Thelia/Core/Event/ConfigCreateEvent.php   |  1 -
 .../Thelia/Core/Event/ConfigDeleteEvent.php   |  2 -
 core/lib/Thelia/Core/Event/ConfigEvent.php    |  3 +-
 .../Thelia/Core/Event/ConfigUpdateEvent.php   |  4 +-
 .../Coupon/CouponCreateOrUpdateEvent.php      |  4 +-
 .../Thelia/Core/Event/CurrencyCreateEvent.php |  3 +-
 .../Thelia/Core/Event/CurrencyDeleteEvent.php |  4 +-
 core/lib/Thelia/Core/Event/CurrencyEvent.php  |  3 +-
 .../Thelia/Core/Event/CurrencyUpdateEvent.php |  1 -
 .../Event/CurrencyUpdatePositionEvent.php     |  2 +-
 .../Event/CustomerCreateOrUpdateEvent.php     | 23 +++---
 core/lib/Thelia/Core/Event/CustomerEvent.php  |  1 -
 .../Thelia/Core/Event/CustomerLoginEvent.php  |  7 +-
 core/lib/Thelia/Core/Event/ImageEvent.php     |  2 -
 .../Thelia/Core/Event/MessageCreateEvent.php  |  3 +-
 .../Thelia/Core/Event/MessageDeleteEvent.php  |  4 +-
 core/lib/Thelia/Core/Event/MessageEvent.php   |  3 +-
 .../Thelia/Core/Event/MessageUpdateEvent.php  |  2 -
 core/lib/Thelia/Core/Event/TheliaEvents.php   |  4 -
 .../Core/HttpFoundation/Session/Session.php   |  7 +-
 .../Thelia/Core/Routing/RewritingRouter.php   | 25 +++---
 .../Thelia/Core/Security/SecurityContext.php  | 12 +--
 .../Core/Template/Assets/AsseticHelper.php    |  5 +-
 .../Core/Template/Element/BaseI18nLoop.php    | 13 ++--
 .../Thelia/Core/Template/Element/BaseLoop.php |  1 -
 .../Core/Template/Element/LoopResult.php      |  2 +-
 .../Core/Template/Element/LoopResultRow.php   | 14 ++--
 .../lib/Thelia/Core/Template/Loop/Address.php |  4 +-
 .../Core/Template/Loop/AssociatedContent.php  |  6 +-
 .../Thelia/Core/Template/Loop/Attribute.php   | 15 ++--
 .../Template/Loop/AttributeAvailability.php   |  9 +--
 .../Template/Loop/AttributeCombination.php    |  7 +-
 .../Core/Template/Loop/BaseSpecificModule.php | 10 +--
 core/lib/Thelia/Core/Template/Loop/Cart.php   |  2 -
 .../Thelia/Core/Template/Loop/Category.php    | 36 ++++-----
 core/lib/Thelia/Core/Template/Loop/Config.php |  3 +-
 .../lib/Thelia/Core/Template/Loop/Content.php |  1 -
 .../lib/Thelia/Core/Template/Loop/Country.php |  1 -
 core/lib/Thelia/Core/Template/Loop/Coupon.php |  5 --
 .../Thelia/Core/Template/Loop/Currency.php    |  3 +-
 .../Thelia/Core/Template/Loop/Customer.php    |  3 +-
 .../Thelia/Core/Template/Loop/Delivery.php    |  5 +-
 .../lib/Thelia/Core/Template/Loop/Feature.php |  1 -
 .../Template/Loop/FeatureAvailability.php     |  1 -
 .../Core/Template/Loop/FeatureValue.php       | 12 +--
 core/lib/Thelia/Core/Template/Loop/Folder.php | 24 +++---
 core/lib/Thelia/Core/Template/Loop/Image.php  | 32 ++++----
 .../lib/Thelia/Core/Template/Loop/Message.php |  1 -
 .../lib/Thelia/Core/Template/Loop/Product.php | 60 +++++++-------
 .../Template/Loop/ProductSaleElements.php     | 13 ++--
 core/lib/Thelia/Core/Template/Loop/Title.php  |  1 -
 .../Thelia/Core/Template/ParserContext.php    |  1 -
 .../Smarty/Assets/SmartyAssetsManager.php     |  6 +-
 .../Exception/SmartyPluginException.php       |  3 +-
 .../Smarty/Plugins/AdminUtilities.php         | 17 ++--
 .../Smarty/Plugins/DataAccessFunctions.php    | 16 ++--
 .../Core/Template/Smarty/Plugins/Form.php     |  5 +-
 .../Core/Template/Smarty/Plugins/Format.php   | 15 ++--
 .../Template/Smarty/Plugins/TheliaLoop.php    |  5 +-
 .../Template/Smarty/Plugins/UrlGenerator.php  |  5 +-
 .../Core/Template/Smarty/SmartyParser.php     |  4 +-
 core/lib/Thelia/Core/Thelia.php               |  2 -
 core/lib/Thelia/Core/TheliaHttpKernel.php     |  2 +-
 .../Thelia/Core/Translation/Translator.php    |  6 +-
 core/lib/Thelia/Exception/ImageException.php  |  4 +-
 .../Exception/MissingAdapterException.php     |  4 +-
 .../Exception/NotImplementedException.php     |  1 -
 .../Thelia/Exception/TaxEngineException.php   |  7 +-
 .../Exception/UrlRewritingException.php       |  7 +-
 core/lib/Thelia/Form/AddressCreateForm.php    |  3 +-
 core/lib/Thelia/Form/AddressUpdateForm.php    |  8 +-
 .../Thelia/Form/CategoryModificationForm.php  |  5 +-
 core/lib/Thelia/Form/ConfigCreationForm.php   |  2 +-
 .../Thelia/Form/ConfigModificationForm.php    |  2 -
 core/lib/Thelia/Form/CouponCreationForm.php   |  2 +-
 .../Thelia/Form/CurrencyModificationForm.php  |  5 +-
 core/lib/Thelia/Form/CustomerLogin.php        |  3 -
 .../Thelia/Form/MessageModificationForm.php   |  4 +-
 .../Form/StandardDescriptionFieldsTrait.php   |  2 +-
 core/lib/Thelia/Module/BaseModule.php         |  3 +-
 .../lib/Thelia/Module/BaseModuleInterface.php |  7 +-
 .../Thelia/Module/DeliveryModuleInterface.php |  7 +-
 core/lib/Thelia/Tests/Action/AddressTest.php  |  4 +-
 core/lib/Thelia/Tests/Action/ImageTest.php    | 19 +++--
 .../Thelia/Tests/Command/CacheClearTest.php   |  3 +-
 .../Constraint/ConstraintFactoryTest.php      |  5 +-
 .../Constraint/ConstraintValidatorTest.php    |  3 -
 .../Rule/AvailableForTotalAmountTest.php      |  4 -
 .../Rule/AvailableForXArticlesTest.php        |  6 --
 .../Tests/Constraint/Rule/OperatorsTest.php   |  2 -
 .../Validator/CustomerParamTest.php           |  1 -
 .../Validator/QuantityParamTest.php           |  1 -
 .../Validator/RepeatedDateParamTest.php       |  1 -
 .../Validator/RepeatedIntervalParamTest.php   |  1 -
 .../Controller/DefaultControllerTest.php      |  1 -
 .../Template/Smarty/Plugins/FormatTest.php    |  5 +-
 .../Thelia/Tests/Coupon/CouponManagerTest.php |  2 -
 .../Tests/Coupon/Type/RemoveXAmountTest.php   |  1 -
 .../Tests/Coupon/Type/RemoveXPercentTest.php  |  1 -
 .../Tests/Rewriting/RewritingResolverTest.php |  3 +-
 .../Thelia/Tests/TestCaseWithURLToolSetup.php | 14 ++--
 core/lib/Thelia/Tests/Tools/URLTest.php       | 36 +++++----
 core/lib/Thelia/Tools/DateTimeFormat.php      |  5 +-
 core/lib/Thelia/Tools/I18n.php                |  2 +-
 core/lib/Thelia/Tools/PhpUnitUtils.php        |  3 +-
 core/lib/Thelia/Tools/Rest/ResponseRest.php   |  1 -
 core/lib/Thelia/Tools/URL.php                 | 24 +++---
 155 files changed, 541 insertions(+), 809 deletions(-)

diff --git a/core/lib/Thelia/Action/Address.php b/core/lib/Thelia/Action/Address.php
index 32ec24c05..278f71a5b 100644
--- a/core/lib/Thelia/Action/Address.php
+++ b/core/lib/Thelia/Action/Address.php
@@ -27,7 +27,6 @@ use Thelia\Core\Event\AddressCreateOrUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Address as AddressModel;
 
-
 /**
  * Class Address
  * @package Thelia\Action
@@ -50,7 +49,6 @@ class Address extends BaseAction implements EventSubscriberInterface
         $this->createOrUpdate($addressModel, $event);
     }
 
-
     protected function createOrUpdate(AddressModel $addressModel, AddressCreateOrUpdateEvent $event)
     {
         $addressModel->setDispatcher($this->getDispatcher());
@@ -105,4 +103,4 @@ class Address extends BaseAction implements EventSubscriberInterface
             TheliaEvents::ADDRESS_UPDATE => array("update", 128)
         );
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Action/BaseAction.php b/core/lib/Thelia/Action/BaseAction.php
index 2984ddbd6..56565ddc6 100755
--- a/core/lib/Thelia/Action/BaseAction.php
+++ b/core/lib/Thelia/Action/BaseAction.php
@@ -22,10 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Action;
 
-use Thelia\Form\BaseForm;
-use Thelia\Action\Exception\FormValidationException;
-use Thelia\Core\Event\ActionEvent;
-use Symfony\Component\Form\Form;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class BaseAction
@@ -49,4 +45,4 @@ class BaseAction
     {
         return $this->container->get('event_dispatcher');
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Action/Cart.php b/core/lib/Thelia/Action/Cart.php
index 9203dc00d..5549f3eb3 100755
--- a/core/lib/Thelia/Action/Cart.php
+++ b/core/lib/Thelia/Action/Cart.php
@@ -23,12 +23,9 @@
 
 namespace Thelia\Action;
 
-use Propel\Runtime\Exception\PropelException;
-use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\CartEvent;
-use Thelia\Form\CartAdd;
 use Thelia\Model\ProductPrice;
 use Thelia\Model\ProductPriceQuery;
 use Thelia\Model\CartItem;
diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php
index 7b7608dc9..297cd64da 100755
--- a/core/lib/Thelia/Action/Category.php
+++ b/core/lib/Thelia/Action/Category.php
@@ -31,7 +31,6 @@ use Thelia\Model\CategoryQuery;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Propel;
 use Thelia\Model\Map\CategoryTableMap;
-use Propel\Runtime\Exception\PropelException;
 
 use Thelia\Core\Event\CategoryCreateEvent;
 use Thelia\Core\Event\CategoryDeleteEvent;
diff --git a/core/lib/Thelia/Action/Config.php b/core/lib/Thelia/Action/Config.php
index e0a62f69d..83df28524 100644
--- a/core/lib/Thelia/Action/Config.php
+++ b/core/lib/Thelia/Action/Config.php
@@ -23,7 +23,6 @@
 
 namespace Thelia\Action;
 
-
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 use Thelia\Model\ConfigQuery;
diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php
index fee349585..8676eb16c 100755
--- a/core/lib/Thelia/Action/Coupon.php
+++ b/core/lib/Thelia/Action/Coupon.php
@@ -27,9 +27,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Coupon as CouponModel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\Propel;
-use Thelia\Model\Map\CategoryTableMap;
 
 /**
  * Created by JetBrains PhpStorm.
diff --git a/core/lib/Thelia/Action/Currency.php b/core/lib/Thelia/Action/Currency.php
index 7f9c3281f..619374902 100644
--- a/core/lib/Thelia/Action/Currency.php
+++ b/core/lib/Thelia/Action/Currency.php
@@ -23,7 +23,6 @@
 
 namespace Thelia\Action;
 
-
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 use Thelia\Model\CurrencyQuery;
@@ -60,7 +59,6 @@ class Currency extends BaseAction implements EventSubscriberInterface
             ->save()
         ;
 
-
         $event->setCurrency($currency);
     }
 
@@ -136,16 +134,15 @@ class Currency extends BaseAction implements EventSubscriberInterface
         }
     }
 
-    public function updateRates() {
-
+    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)
-            {
+            foreach ($sxe->Cube[0]->Cube[0]->Cube as $last) {
                 $code = strtoupper($last["currency"]);
                 $rate = floatval($last['rate']);
 
@@ -157,8 +154,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
                     ;
                 }
             }
-        }
-        else {
+        } else {
             throw new \RuntimeException(sprintf("Failed to get currency rates data from URL %s", $rates_url));
         }
     }
diff --git a/core/lib/Thelia/Action/Customer.php b/core/lib/Thelia/Action/Customer.php
index 962e2e2cf..1b3ac6909 100755
--- a/core/lib/Thelia/Action/Customer.php
+++ b/core/lib/Thelia/Action/Customer.php
@@ -27,17 +27,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\ActionEvent;
 use Thelia\Core\Event\CustomerCreateOrUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Form\CustomerCreation;
-use Thelia\Form\CustomerModification;
 use Thelia\Model\Customer as CustomerModel;
-use Thelia\Log\Tlog;
-use Thelia\Model\CustomerQuery;
-use Thelia\Form\CustomerLogin;
-use Thelia\Core\Security\Authentication\CustomerUsernamePasswordFormAuthenticator;
-use Symfony\Component\Validator\Exception\ValidatorException;
-use Thelia\Core\Security\Exception\AuthenticationException;
-use Thelia\Core\Security\Exception\UsernameNotFoundException;
-use Propel\Runtime\Exception\PropelException;
 use Thelia\Core\Event\CustomerLoginEvent;
 
 /**
@@ -96,7 +86,6 @@ class Customer extends BaseAction implements EventSubscriberInterface
         $event->setCustomer($customer);
     }
 
-
     public function login(CustomerLoginEvent $event)
     {
         $this->getSecurityContext()->setCustomerUser($event->getCustomer());
diff --git a/core/lib/Thelia/Action/Image.php b/core/lib/Thelia/Action/Image.php
index 103633165..66baffdbb 100755
--- a/core/lib/Thelia/Action/Image.php
+++ b/core/lib/Thelia/Action/Image.php
@@ -25,7 +25,6 @@ namespace Thelia\Action;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-use Thelia\Core\Event\ActionEvent;
 use Thelia\Core\Event\ImageEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Tools\URL;
@@ -86,8 +85,8 @@ class Image extends BaseAction implements EventSubscriberInterface
      *
      * @param ImageEvent $event
      */
-    public function clearCache(ImageEvent $event) {
-
+    public function clearCache(ImageEvent $event)
+    {
         $path = $this->getCachePath($event->getCacheSubdirectory(), false);
 
         $this->clearDirectory($path);
@@ -98,8 +97,8 @@ class Image extends BaseAction implements EventSubscriberInterface
      *
      * @param string $path the directory path
      */
-    protected function clearDirectory($path) {
-
+    protected function clearDirectory($path)
+    {
         $iterator = new \DirectoryIterator($path);
 
         foreach ($iterator as $fileinfo) {
@@ -108,8 +107,7 @@ class Image extends BaseAction implements EventSubscriberInterface
 
             if ($fileinfo->isFile() || $fileinfo->isLink()) {
                 @unlink($fileinfo->getPathname());
-            }
-            else if ($fileinfo->isDir()) {
+            } elseif ($fileinfo->isDir()) {
                 $this->clearDirectory($fileinfo->getPathname());
             }
         }
@@ -124,7 +122,7 @@ class Image extends BaseAction implements EventSubscriberInterface
      *
      * This method updates the cache_file_path and file_url attributes of the event
      *
-     * @param ImageEvent $event
+     * @param  ImageEvent                 $event
      * @throws \InvalidArgumentException, ImageException
      */
     public function processImage(ImageEvent $event)
@@ -160,8 +158,7 @@ class Image extends BaseAction implements EventSubscriberInterface
                     if (false == symlink($source_file, $originalImagePathInCache)) {
                          throw new ImageException(sprintf("Failed to create symbolic link for %s in %s image cache directory", basename($source_file), $subdir));
                     }
-                }
-                else {// mode = 'copy'
+                } else {// mode = 'copy'
                     if (false == @copy($source_file, $originalImagePathInCache)) {
                         throw new ImageException(sprintf("Failed to copy %s in %s image cache directory", basename($source_file), $subdir));
                     }
@@ -182,8 +179,7 @@ class Image extends BaseAction implements EventSubscriberInterface
 
                     if ($background_color != null) {
                         $bg_color = new Color($background_color);
-                    }
-                    else
+                    } else
                         $bg_color = null;
 
                     // Apply resize
@@ -252,8 +248,7 @@ class Image extends BaseAction implements EventSubscriberInterface
                             $cacheFilePath,
                             array('quality' => $quality)
                      );
-                }
-                else {
+                } else {
                     throw new ImageException(sprintf("Source file %s cannot be opened.", basename($source_file)));
                 }
             }
@@ -277,13 +272,13 @@ class Image extends BaseAction implements EventSubscriberInterface
      * Process image resizing, with borders or cropping. If $dest_width and $dest_height
      * are both null, no resize is performed.
      *
-     * @param ImagineInterface $imagine the Imagine instance
-     * @param ImageInterface $image the image to process
-     * @param int $dest_width the required width
-     * @param int $dest_height the required height
-     * @param int $resize_mode the resize mode (crop / bands / keep image ratio)p
-     * @param string $bg_color the bg_color used for bands
-     * @return ImageInterface the resized image.
+     * @param  ImagineInterface $imagine     the Imagine instance
+     * @param  ImageInterface   $image       the image to process
+     * @param  int              $dest_width  the required width
+     * @param  int              $dest_height the required height
+     * @param  int              $resize_mode the resize mode (crop / bands / keep image ratio)p
+     * @param  string           $bg_color    the bg_color used for bands
+     * @return ImageInterface   the resized image.
      */
     protected function applyResize(ImagineInterface $imagine, ImageInterface $image, $dest_width, $dest_height, $resize_mode, $bg_color)
     {
@@ -313,8 +308,7 @@ class Image extends BaseAction implements EventSubscriberInterface
 
                 $dest_width = ($resize_mode == self::EXACT_RATIO_WITH_BORDERS ? $dest_width : $next_width);
                 $dest_height = ($resize_mode == self::EXACT_RATIO_WITH_BORDERS ? $dest_height : $next_height);
-            }
-            else if ($width_diff > $height_diff) {
+            } elseif ($width_diff > $height_diff) {
                 // Image height > image width
 
                 $next_height = $dest_height;
@@ -324,12 +318,10 @@ class Image extends BaseAction implements EventSubscriberInterface
                     $next_width = $dest_width;
                     $next_height = intval($height_orig * $dest_width / $width_orig);
                     $delta_y = ($next_height - $dest_height) / 2;
-                }
-                else if ($resize_mode != self::EXACT_RATIO_WITH_BORDERS) {
+                } elseif ($resize_mode != self::EXACT_RATIO_WITH_BORDERS) {
                     $dest_width = $next_width;
                 }
-            }
-            else {
+            } else {
                 // Image width > image height
                 $next_width = $dest_width;
                 $next_height = intval($height_orig * $dest_width / $width_orig);
@@ -338,8 +330,7 @@ class Image extends BaseAction implements EventSubscriberInterface
                     $next_height = $dest_height;
                     $next_width  = intval(($width_orig * $next_height) / $height_orig);
                     $delta_x = ($next_width - $dest_width) / 2;
-                }
-                else if ($resize_mode != self::EXACT_RATIO_WITH_BORDERS) {
+                } elseif ($resize_mode != self::EXACT_RATIO_WITH_BORDERS) {
                     $dest_height = $next_height;
                 }
             }
@@ -357,9 +348,7 @@ class Image extends BaseAction implements EventSubscriberInterface
 
                 return $imagine->create($canvas, $bg_color)
                     ->paste($image, new Point($border_width, $border_height));
-            }
-
-            else if ($resize_mode == self::EXACT_RATIO_WITH_CROP) {
+            } elseif ($resize_mode == self::EXACT_RATIO_WITH_CROP) {
                 $image->crop(
                     new Point($delta_x, $delta_y),
                     new Box($dest_width, $dest_height)
@@ -370,12 +359,11 @@ class Image extends BaseAction implements EventSubscriberInterface
         return $image;
     }
 
-
     /**
      * Return the absolute URL to the cached image
      *
-     * @param string $subdir the subdirectory related to cache base
-     * @param string $filename the safe filename, as returned by getCacheFilePath()
+     * @param  string $subdir   the subdirectory related to cache base
+     * @param  string $filename the safe filename, as returned by getCacheFilePath()
      * @return string the absolute URL to the cached image
      */
     protected function getCacheFileURL($subdir, $safe_filename)
@@ -388,10 +376,10 @@ class Image extends BaseAction implements EventSubscriberInterface
     /**
      * Return the full path of the cached file
      *
-     * @param string $subdir the subdirectory related to cache base
-     * @param string $filename the filename
-     * @param boolean $forceOriginalImage if true, the origiunal image path in the cache dir is returned.
-     * @return string the cache directory path relative to Web Root
+     * @param  string  $subdir             the subdirectory related to cache base
+     * @param  string  $filename           the filename
+     * @param  boolean $forceOriginalImage if true, the origiunal image path in the cache dir is returned.
+     * @return string  the cache directory path relative to Web Root
      */
     protected function getCacheFilePath($subdir, $filename, ImageEvent $event, $forceOriginalImage = false)
     {
@@ -409,7 +397,7 @@ class Image extends BaseAction implements EventSubscriberInterface
     /**
      * Return the cache directory path relative to Web Root
      *
-     * @param string $subdir the subdirectory related to cache base, or null to get the cache directory only.
+     * @param  string $subdir the subdirectory related to cache base, or null to get the cache directory only.
      * @return string the cache directory path relative to Web Root
      */
     protected function getCachePathFromWebRoot($subdir = null)
@@ -420,21 +408,19 @@ class Image extends BaseAction implements EventSubscriberInterface
             $safe_subdir = basename($subdir);
 
             $path = sprintf("%s/%s", $cache_dir_from_web_root, $safe_subdir);
-        }
-        else
+        } else
             $path = $cache_dir_from_web_root;
 
         // Check if path is valid, e.g. in the cache dir
-
         return $path;
     }
 
     /**
      * Return the absolute cache directory path
      *
-     * @param string $subdir the subdirectory related to cache base, or null to get the cache base directory.
+     * @param  string            $subdir the subdirectory related to cache base, or null to get the cache base directory.
      * @throws \RuntimeException if cache directory cannot be created
-     * @return string the absolute cache directory path
+     * @return string            the absolute cache directory path
      */
     protected function getCachePath($subdir = null, $create_if_not_exists = true)
     {
@@ -494,4 +480,4 @@ class Image extends BaseAction implements EventSubscriberInterface
             TheliaEvents::IMAGE_CLEAR_CACHE => array("clearCache", 128),
         );
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Action/Message.php b/core/lib/Thelia/Action/Message.php
index 5299efc99..faac35bf2 100644
--- a/core/lib/Thelia/Action/Message.php
+++ b/core/lib/Thelia/Action/Message.php
@@ -23,7 +23,6 @@
 
 namespace Thelia\Action;
 
-
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 use Thelia\Model\MessageQuery;
diff --git a/core/lib/Thelia/Action/PageNotFound.php b/core/lib/Thelia/Action/PageNotFound.php
index a4d715fbb..c6593ff7c 100755
--- a/core/lib/Thelia/Action/PageNotFound.php
+++ b/core/lib/Thelia/Action/PageNotFound.php
@@ -23,7 +23,6 @@
 
 namespace Thelia\Action;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
@@ -41,7 +40,7 @@ class PageNotFound extends BaseAction implements EventSubscriberInterface
 {
     public function display404(GetResponseForExceptionEvent $event)
     {
-        if($event->getException() instanceof NotFoundHttpException) {
+        if ($event->getException() instanceof NotFoundHttpException) {
 
             $parser = $this->container->get("thelia.parser");
 
diff --git a/core/lib/Thelia/Action/PositionManagementTrait.php b/core/lib/Thelia/Action/PositionManagementTrait.php
index 70f91d995..5da085594 100644
--- a/core/lib/Thelia/Action/PositionManagementTrait.php
+++ b/core/lib/Thelia/Action/PositionManagementTrait.php
@@ -25,8 +25,8 @@ namespace Thelia\Action;
 
 use Thelia\Core\Event\BaseChangePositionEvent;
 
-trait PositionManagementTrait {
-
+trait PositionManagementTrait
+{
     const POSITION_UP
     /**
      * Changes object position, selecting absolute ou relative change.
@@ -154,4 +154,4 @@ trait PositionManagementTrait {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Cart/CartTrait.php b/core/lib/Thelia/Cart/CartTrait.php
index 527867d5d..8589f25b5 100755
--- a/core/lib/Thelia/Cart/CartTrait.php
+++ b/core/lib/Thelia/Cart/CartTrait.php
@@ -139,4 +139,4 @@ trait CartTrait
         return $id;
 
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Command/CacheClear.php b/core/lib/Thelia/Command/CacheClear.php
index 37e853f05..72b7571d2 100755
--- a/core/lib/Thelia/Command/CacheClear.php
+++ b/core/lib/Thelia/Command/CacheClear.php
@@ -61,7 +61,7 @@ class CacheClear extends ContainerAwareCommand
         $cacheDir = $this->getContainer()->getParameter("kernel.cache_dir");
 
         $this->clearCache($cacheDir, $output);
-        if(!$input->getOption("without-assets")) {
+        if (!$input->getOption("without-assets")) {
             $this->clearCache(THELIA_WEB_DIR . "/assets", $output);
         }
 
diff --git a/core/lib/Thelia/Command/ClearImageCache.php b/core/lib/Thelia/Command/ClearImageCache.php
index babbdd619..d2010ead1 100755
--- a/core/lib/Thelia/Command/ClearImageCache.php
+++ b/core/lib/Thelia/Command/ClearImageCache.php
@@ -32,7 +32,6 @@ use Thelia\Core\HttpFoundation\Request;
 use Symfony\Component\Console\Input\InputArgument;
 use Thelia\Core\Event\TheliaEvents;
 
-
 class ClearImageCache extends ContainerAwareCommand
 {
     protected function configure()
@@ -60,9 +59,8 @@ class ClearImageCache extends ContainerAwareCommand
             $dispatcher->dispatch(TheliaEvents::IMAGE_CLEAR_CACHE, $event);
 
             $output->writeln(sprintf('%s image cache successfully cleared.', is_null($subdir) ? 'Entire' : ucfirst($subdir)));
-        }
-        catch(\Exception $ex) {
+        } catch (\Exception $ex) {
              $output->writeln(sprintf("Failed to clear image cache: %s", $ex->getMessage()));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Command/CreateAdminUser.php b/core/lib/Thelia/Command/CreateAdminUser.php
index 868ca1496..4fd8b886e 100644
--- a/core/lib/Thelia/Command/CreateAdminUser.php
+++ b/core/lib/Thelia/Command/CreateAdminUser.php
@@ -133,8 +133,7 @@ class CreateAdminUser extends ContainerAwareCommand
             }
 
             $output->writeln("Passwords are different, please try again.");
-        }
-        while (true);
+        } while (true);
 
         return $admin;
     }
@@ -144,4 +143,4 @@ class CreateAdminUser extends ContainerAwareCommand
         return sprintf("<info>%s</info>", $text);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Command/ReloadDatabaseCommand.php b/core/lib/Thelia/Command/ReloadDatabaseCommand.php
index d25add644..70fab56d9 100644
--- a/core/lib/Thelia/Command/ReloadDatabaseCommand.php
+++ b/core/lib/Thelia/Command/ReloadDatabaseCommand.php
@@ -28,7 +28,6 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Thelia\Install\Database;
 
-
 /**
  * Class ReloadDatabasesCommand
  * @package Thelia\Command
@@ -67,4 +66,4 @@ class ReloadDatabaseCommand extends BaseModuleGenerate
             ''
         ));
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Command/Skeleton/Module/Class.php b/core/lib/Thelia/Command/Skeleton/Module/Class.php
index c4c90aa60..c9c7109ac 100755
--- a/core/lib/Thelia/Command/Skeleton/Module/Class.php
+++ b/core/lib/Thelia/Command/Skeleton/Module/Class.php
@@ -25,7 +25,7 @@ namespace %%NAMESPACE%%;
 
 use Thelia\Module\BaseModule;
 
-class %%CLASSNAME%% extends BaseModule
+class Class extends BaseModule
 {
     /**
      * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class
diff --git a/core/lib/Thelia/Controller/Admin/AttributeController.php b/core/lib/Thelia/Controller/Admin/AttributeController.php
index a6dd05c89..50e32955d 100644
--- a/core/lib/Thelia/Controller/Admin/AttributeController.php
+++ b/core/lib/Thelia/Controller/Admin/AttributeController.php
@@ -23,18 +23,6 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\MessageDeleteEvent;
-use Thelia\Core\Event\TheliaEvents;
-use Thelia\Tools\URL;
-use Thelia\Core\Event\MessageUpdateEvent;
-use Thelia\Core\Event\MessageCreateEvent;
-use Thelia\Log\Tlog;
-use Thelia\Form\Exception\FormValidationException;
-use Thelia\Core\Security\Exception\AuthorizationException;
-use Thelia\Model\MessageQuery;
-use Thelia\Form\MessageModificationForm;
-use Thelia\Form\MessageCreationForm;
-
 /**
  * Manages messages sent by mail
  *
@@ -47,17 +35,15 @@ class AttributeController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function defaultAction() {
-
+    public function defaultAction()
+    {
         if (null !== $response = $this->checkAuth("admin.configuration.attributes.view")) return $response;
-
         return $this->render('product-attributes');
     }
 
-    public function updateAction() {
-
+    public function updateAction()
+    {
         if (null !== $response = $this->checkAuth("admin.configuration.attributes.update")) return $response;
-
         return $this->render('product-attributes-edit');
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 5461b8d3f..21fffd3d9 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -33,7 +33,6 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Thelia\Core\Security\Exception\AuthenticationException;
 use Thelia\Tools\URL;
 use Thelia\Tools\Redirect;
-use Thelia\Core\Security\SecurityContext;
 use Thelia\Model\AdminLog;
 use Thelia\Model\Lang;
 use Thelia\Model\LangQuery;
@@ -50,14 +49,15 @@ class BaseAdminController extends BaseController
      *
      * @param unknown $message
      */
-    public function adminLogAppend($message) {
+    public function adminLogAppend($message)
+    {
         AdminLog::append($message, $this->getRequest(), $this->getSecurityContext()->getAdminUser());
     }
 
     /**
      * This method process the rendering of view called from an admin page
      *
-     * @param unknown $template
+     * @param  unknown  $template
      * @return Response the reponse which contains the rendered view
      */
     public function processTemplateAction($template)
@@ -66,12 +66,10 @@ class BaseAdminController extends BaseController
             if (! empty($template)) {
                 // If we have a view in the URL, render this view
                 return $this->render($template);
-            }
-            elseif (null != $view = $this->getRequest()->get('view')) {
+            } elseif (null != $view = $this->getRequest()->get('view')) {
                 return $this->render($view);
             }
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             return $this->errorPage($ex->getMessage());
         }
 
@@ -135,7 +133,8 @@ class BaseAdminController extends BaseController
     /*
      * Create the standard message displayed to the user when the form cannot be validated.
      */
-    protected function createStandardFormValidationErrorMessage(FormValidationException $exception) {
+    protected function createStandardFormValidationErrorMessage(FormValidationException $exception)
+    {
         return $this->getTranslator()->trans(
             "Please check your input: %error",
             array(
@@ -147,13 +146,13 @@ class BaseAdminController extends BaseController
     /**
      * Setup the error context when an error occurs in a action method.
      *
-     * @param string $action the action that caused the error (category modification, variable creation, currency update, etc.)
-     * @param BaseForm $form the form where the error occured, or null if no form was involved
-     * @param string $error_message the error message
-     * @param Exception $exception the exception or null if no exception
+     * @param string    $action        the action that caused the error (category modification, variable creation, currency update, etc.)
+     * @param BaseForm  $form          the form where the error occured, or null if no form was involved
+     * @param string    $error_message the error message
+     * @param Exception $exception     the exception or null if no exception
      */
-    protected function setupFormErrorContext($action,  $error_message, BaseForm $form = null, \Exception $exception = null) {
-
+    protected function setupFormErrorContext($action,  $error_message, BaseForm $form = null, \Exception $exception = null)
+    {
         if ($error_message !== false) {
 
             // Log the error message
@@ -214,7 +213,7 @@ class BaseAdminController extends BaseController
     /**
      * Return the route path defined for the givent route ID
      *
-     * @param string         $routeId a route ID, as defines in Config/Resources/routing/admin.xml
+     * @param string         $routeId       a route ID, as defines in Config/Resources/routing/admin.xml
      * @param mixed          $parameters    An array of parameters
      * @param Boolean|string $referenceType The type of reference to be generated (one of the constants)
      *
@@ -222,12 +221,13 @@ class BaseAdminController extends BaseController
      * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
      * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
      *                                             it does not match the requirement
-     * @throws \InvalidArgumentException            When the router doesn't exist
-     * @return string The generated URL
+     * @throws \InvalidArgumentException When the router doesn't exist
+     * @return string                    The generated URL
      *
      * @see \Thelia\Controller\BaseController::getRouteFromRouter()
      */
-    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
+    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    {
         return $this->getRouteFromRouter(
             'router.admin',
             $routeId,
@@ -239,18 +239,19 @@ class BaseAdminController extends BaseController
     /**
      * Redirect to à route ID related URL
      *
-     * @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
+     * @param unknown $routeId       the route ID, as found in Config/Resources/routing/admin.xml
      * @param unknown $urlParameters the URL parametrs, as a var/value pair array
      */
-    public function redirectToRoute($routeId, $urlParameters = array()) {
+    public function redirectToRoute($routeId, $urlParameters = array())
+    {
         $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId), $urlParameters));
     }
 
     /**
      * Get the current edition lang ID, checking if a change was requested in the current request.
      */
-    protected function getCurrentEditionLang() {
-
+    protected function getCurrentEditionLang()
+    {
         // Return the new language if a change is required.
         if (null !== $edit_language_id = $this->getRequest()->get('edit_language_id', null)) {
 
@@ -266,7 +267,8 @@ class BaseAdminController extends BaseController
     /**
      * A simple helper to get the current edition locale.
      */
-    protected function getCurrentEditionLocale() {
+    protected function getCurrentEditionLocale()
+    {
         return $this->getCurrentEditionLang()->getLocale();
     }
 
@@ -322,13 +324,11 @@ class BaseAdminController extends BaseController
             $data = $this->getParser()->render($templateName, $args);
 
             return $data;
-        }
-        catch (AuthenticationException $ex) {
+        } catch (AuthenticationException $ex) {
             // User is not authenticated, and templates requires authentication -> redirect to login page
             // We user login_tpl as a path, not a template.
             Redirect::exec(URL::getInstance()->absoluteUrl($ex->getLoginTemplate()));
-        }
-        catch (AuthorizationException $ex) {
+        } catch (AuthorizationException $ex) {
             // User is not allowed to perform the required action. Return the error page instead of the requested page.
             return $this->errorPage($this->getTranslator()->trans("Sorry, you are not allowed to perform this action."));
         }
diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php
index 5eca91cf9..fba832ec8 100755
--- a/core/lib/Thelia/Controller/Admin/CategoryController.php
+++ b/core/lib/Thelia/Controller/Admin/CategoryController.php
@@ -23,18 +23,10 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Security\Exception\AuthenticationException;
-use Thelia\Core\Security\Exception\AuthorizationException;
-use Thelia\Log\Tlog;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Event\CategoryCreateEvent;
 use Thelia\Form\CategoryCreationForm;
 use Thelia\Core\Event\CategoryDeleteEvent;
-use Thelia\Core\Event\CategoryToggleVisibilityEvent;
-use Thelia\Core\Event\CategoryChangePositionEvent;
-use Thelia\Form\CategoryDeletionForm;
-use Thelia\Model\Lang;
-use Thelia\Core\Translation\Translator;
 use Thelia\Core\Event\CategoryUpdatePositionEvent;
 use Thelia\Model\CategoryQuery;
 use Thelia\Form\CategoryModificationForm;
@@ -46,12 +38,13 @@ class CategoryController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    protected function renderList() {
+    protected function renderList()
+    {
         return $this->render('categories', $this->getTemplateArgs());
     }
 
-    protected function getTemplateArgs() {
-
+    protected function getTemplateArgs()
+    {
         // Get the category ID
         $category_id = $this->getRequest()->get('category_id', 0);
 
@@ -77,10 +70,9 @@ class CategoryController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function defaultAction() {
-
+    public function defaultAction()
+    {
         if (null !== $response = $this->checkAuth("admin.categories.view")) return $response;
-
         return $this->renderList();
     }
 
@@ -89,8 +81,8 @@ class CategoryController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function createAction() {
-
+    public function createAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.categories.create")) return $response;
 
@@ -126,12 +118,10 @@ class CategoryController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($successUrl);
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $error_msg = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $error_msg = $ex->getMessage();
         }
@@ -147,8 +137,8 @@ class CategoryController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function changeAction() {
-
+    public function changeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
 
@@ -189,8 +179,8 @@ class CategoryController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function saveChangeAction() {
-
+    public function saveChangeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
 
@@ -241,12 +231,10 @@ class CategoryController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($changeForm->getSuccessUrl());
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $error_msg = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $error_msg = $ex->getMessage();
         }
@@ -260,7 +248,8 @@ class CategoryController extends BaseAdminController
     /**
      * Online status toggle category
      */
-    public function setToggleVisibilityAction() {
+    public function setToggleVisibilityAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
 
@@ -271,8 +260,7 @@ class CategoryController extends BaseAdminController
 
         try {
             $this->dispatch(TheliaEvents::CATEGORY_SET_DEFAULT, $changeEvent);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any error
             return $this->errorPage($ex);
         }
@@ -283,7 +271,8 @@ class CategoryController extends BaseAdminController
     /**
      * Update categoryposition
      */
-    public function updatePositionAction() {
+    public function updatePositionAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
 
@@ -306,8 +295,7 @@ class CategoryController extends BaseAdminController
             );
 
             $this->dispatch(TheliaEvents::CATEGORY_UPDATE_POSITION, $event);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any error
             return $this->errorPage($ex);
         }
@@ -320,8 +308,8 @@ class CategoryController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function deleteAction() {
-
+    public function deleteAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.categories.delete")) return $response;
 
@@ -335,4 +323,4 @@ class CategoryController extends BaseAdminController
 
         $this->redirectToRoute('admin.categories.default');
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Admin/ConfigController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php
index 6d1a04b05..397266677 100644
--- a/core/lib/Thelia/Controller/Admin/ConfigController.php
+++ b/core/lib/Thelia/Controller/Admin/ConfigController.php
@@ -28,9 +28,7 @@ use Thelia\Core\Event\TheliaEvents;
 use Thelia\Tools\URL;
 use Thelia\Core\Event\ConfigUpdateEvent;
 use Thelia\Core\Event\ConfigCreateEvent;
-use Thelia\Log\Tlog;
 use Thelia\Form\Exception\FormValidationException;
-use Thelia\Core\Security\Exception\AuthorizationException;
 use Thelia\Model\ConfigQuery;
 use Thelia\Form\ConfigModificationForm;
 use Thelia\Form\ConfigCreationForm;
@@ -47,8 +45,8 @@ class ConfigController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    protected function renderList() {
-
+    protected function renderList()
+    {
         // Find the current order
         $order = $this->getRequest()->get(
                 'order',
@@ -66,10 +64,9 @@ class ConfigController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function defaultAction() {
-
+    public function defaultAction()
+    {
         if (null !== $response = $this->checkAuth("admin.configuration.variables.view")) return $response;
-
         return $this->renderList();
     }
 
@@ -78,8 +75,8 @@ class ConfigController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function createAction() {
-
+    public function createAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.variables.create")) return $response;
 
@@ -120,12 +117,10 @@ class ConfigController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($successUrl);
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $message = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $message = $ex->getMessage();
         }
@@ -141,8 +136,8 @@ class ConfigController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function changeAction() {
-
+    public function changeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.variables.update")) return $response;
 
@@ -183,8 +178,8 @@ class ConfigController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function saveChangeAction() {
-
+    public function saveChangeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.variables.update")) return $response;
 
@@ -240,12 +235,10 @@ class ConfigController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($changeForm->getSuccessUrl());
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $message = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $message = $ex->getMessage();
         }
@@ -261,15 +254,15 @@ class ConfigController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function changeValuesAction() {
-
+    public function changeValuesAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.variables.update")) return $response;
 
         $variables = $this->getRequest()->get('variable', array());
 
         // Process all changed variables
-        foreach($variables as $id => $value) {
+        foreach ($variables as $id => $value) {
             $event = new ConfigUpdateEvent($id);
             $event->setValue($value);
 
@@ -284,8 +277,8 @@ class ConfigController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function deleteAction() {
-
+    public function deleteAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.variables.delete")) return $response;
 
@@ -299,4 +292,4 @@ class ConfigController extends BaseAdminController
 
         $this->redirectToRoute('admin.configuration.variables.default');
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php
index e11fcf09e..a440b9ba6 100755
--- a/core/lib/Thelia/Controller/Admin/CouponController.php
+++ b/core/lib/Thelia/Controller/Admin/CouponController.php
@@ -26,17 +26,12 @@ namespace Thelia\Controller\Admin;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Router;
 use Thelia\Constraint\ConstraintFactory;
-use Thelia\Constraint\ConstraintFactoryTest;
 use Thelia\Constraint\Rule\AvailableForTotalAmount;
 use Thelia\Constraint\Rule\CouponRuleInterface;
 use Thelia\Constraint\Validator\PriceParam;
-use Thelia\Core\Event\Coupon\CouponCreateEvent;
 use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent;
 use Thelia\Core\Event\Coupon\CouponEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\HttpFoundation\Session\Session;
-use Thelia\Core\Security\Exception\AuthenticationException;
-use Thelia\Core\Security\Exception\AuthorizationException;
 use Thelia\Core\Translation\Translator;
 use Thelia\Coupon\CouponAdapterInterface;
 use Thelia\Coupon\CouponManager;
@@ -222,7 +217,6 @@ class CouponController extends BaseAdminController
         );
     }
 
-
     /**
      * Manage Coupons Rule creation display
      *
@@ -311,8 +305,6 @@ class CouponController extends BaseAdminController
         );
     }
 
-
-
     /**
      * Manage Coupons read display
      *
@@ -375,7 +367,6 @@ class CouponController extends BaseAdminController
         );
     }
 
-
     /**
      * Manage Coupons read display
      *
@@ -697,6 +688,4 @@ class CouponController extends BaseAdminController
 //        }
 //    }
 
-
-
 }
diff --git a/core/lib/Thelia/Controller/Admin/CurrencyController.php b/core/lib/Thelia/Controller/Admin/CurrencyController.php
index c6f5afdc3..ff2db0ab2 100644
--- a/core/lib/Thelia/Controller/Admin/CurrencyController.php
+++ b/core/lib/Thelia/Controller/Admin/CurrencyController.php
@@ -28,9 +28,7 @@ use Thelia\Core\Event\TheliaEvents;
 use Thelia\Tools\URL;
 use Thelia\Core\Event\CurrencyUpdateEvent;
 use Thelia\Core\Event\CurrencyCreateEvent;
-use Thelia\Log\Tlog;
 use Thelia\Form\Exception\FormValidationException;
-use Thelia\Core\Security\Exception\AuthorizationException;
 use Thelia\Model\CurrencyQuery;
 use Thelia\Form\CurrencyModificationForm;
 use Thelia\Form\CurrencyCreationForm;
@@ -48,8 +46,8 @@ class CurrencyController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    protected function renderList() {
-
+    protected function renderList()
+    {
         // Find the current order
         $order = $this->getRequest()->get(
                 'order',
@@ -67,10 +65,9 @@ class CurrencyController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function defaultAction() {
-
+    public function defaultAction()
+    {
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.view")) return $response;
-
         return $this->renderList();
     }
 
@@ -79,8 +76,8 @@ class CurrencyController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function createAction() {
-
+    public function createAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.create")) return $response;
 
@@ -120,12 +117,10 @@ class CurrencyController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($successUrl);
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $error_msg = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $error_msg = $ex->getMessage();
         }
@@ -141,8 +136,8 @@ class CurrencyController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function changeAction() {
-
+    public function changeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
 
@@ -179,8 +174,8 @@ class CurrencyController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function saveChangeAction() {
-
+    public function saveChangeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
 
@@ -231,12 +226,10 @@ class CurrencyController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($changeForm->getSuccessUrl());
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $error_msg = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $error_msg = $ex->getMessage();
         }
@@ -250,7 +243,8 @@ class CurrencyController extends BaseAdminController
     /**
      * Sets the default currency
      */
-    public function setDefaultAction() {
+    public function setDefaultAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
 
@@ -261,8 +255,7 @@ class CurrencyController extends BaseAdminController
 
         try {
             $this->dispatch(TheliaEvents::CURRENCY_SET_DEFAULT, $changeEvent);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any error
             return $this->errorPage($ex);
         }
@@ -273,14 +266,14 @@ class CurrencyController extends BaseAdminController
     /**
      * Update currencies rates
      */
-    public function updateRatesAction() {
+    public function updateRatesAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
 
         try {
             $this->dispatch(TheliaEvents::CURRENCY_UPDATE_RATES);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any error
             return $this->errorPage($ex);
         }
@@ -291,7 +284,8 @@ class CurrencyController extends BaseAdminController
     /**
      * Update currencyposition
      */
-    public function updatePositionAction() {
+    public function updatePositionAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
 
@@ -314,8 +308,7 @@ class CurrencyController extends BaseAdminController
             );
 
             $this->dispatch(TheliaEvents::CURRENCY_UPDATE_POSITION, $event);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any error
             return $this->errorPage($ex);
         }
@@ -323,14 +316,13 @@ class CurrencyController extends BaseAdminController
         $this->redirectToRoute('admin.configuration.currencies.default');
     }
 
-
     /**
      * Delete a currency object
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function deleteAction() {
-
+    public function deleteAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.delete")) return $response;
 
@@ -344,4 +336,4 @@ class CurrencyController extends BaseAdminController
 
         $this->redirectToRoute('admin.configuration.currencies.default');
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php
index 04c8842cd..c53c2b3d3 100644
--- a/core/lib/Thelia/Controller/Admin/CustomerController.php
+++ b/core/lib/Thelia/Controller/Admin/CustomerController.php
@@ -23,7 +23,6 @@
 
 namespace Thelia\Controller\Admin;
 
-
 /**
  * Class CustomerController
  * @package Thelia\Controller\Admin
@@ -34,7 +33,6 @@ class CustomerController extends BaseAdminController
     public function indexAction()
     {
         if (null !== $response = $this->checkAuth("admin.customers.view")) return $response;
-
         return $this->render("customers", array("display_customer" => 20));
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Admin/MessageController.php b/core/lib/Thelia/Controller/Admin/MessageController.php
index 00fcb17bd..b5316efdd 100644
--- a/core/lib/Thelia/Controller/Admin/MessageController.php
+++ b/core/lib/Thelia/Controller/Admin/MessageController.php
@@ -28,9 +28,7 @@ use Thelia\Core\Event\TheliaEvents;
 use Thelia\Tools\URL;
 use Thelia\Core\Event\MessageUpdateEvent;
 use Thelia\Core\Event\MessageCreateEvent;
-use Thelia\Log\Tlog;
 use Thelia\Form\Exception\FormValidationException;
-use Thelia\Core\Security\Exception\AuthorizationException;
 use Thelia\Model\MessageQuery;
 use Thelia\Form\MessageModificationForm;
 use Thelia\Form\MessageCreationForm;
@@ -47,7 +45,8 @@ class MessageController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    protected function renderList() {
+    protected function renderList()
+    {
         return $this->render('messages');
     }
 
@@ -56,10 +55,9 @@ class MessageController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function defaultAction() {
-
+    public function defaultAction()
+    {
         if (null !== $response = $this->checkAuth("admin.configuration.messages.view")) return $response;
-
         return $this->renderList();
     }
 
@@ -68,8 +66,8 @@ class MessageController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function createAction() {
-
+    public function createAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.messages.create")) return $response;
 
@@ -107,12 +105,10 @@ class MessageController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($successUrl);
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $message = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $message = $ex->getMessage();
         }
@@ -128,8 +124,8 @@ class MessageController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function changeAction() {
-
+    public function changeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.messages.update")) return $response;
 
@@ -168,8 +164,8 @@ class MessageController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function saveChangeAction() {
-
+    public function saveChangeAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.messages.update")) return $response;
 
@@ -221,12 +217,10 @@ class MessageController extends BaseAdminController
 
             // Redirect to the success URL
             $this->redirect($changeForm->getSuccessUrl());
-        }
-        catch (FormValidationException $ex) {
+        } catch (FormValidationException $ex) {
             // Form cannot be validated
             $message = $this->createStandardFormValidationErrorMessage($ex);
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             // Any other error
             $message = $ex->getMessage();
         }
@@ -242,8 +236,8 @@ class MessageController extends BaseAdminController
      *
      * @return Symfony\Component\HttpFoundation\Response the response
      */
-    public function deleteAction() {
-
+    public function deleteAction()
+    {
         // Check current user authorization
         if (null !== $response = $this->checkAuth("admin.configuration.messages.delete")) return $response;
 
@@ -257,4 +251,4 @@ class MessageController extends BaseAdminController
 
         $this->redirectToRoute('admin.configuration.messages.default');
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Admin/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php
index d7385ad1b..81f366ddf 100755
--- a/core/lib/Thelia/Controller/Admin/SessionController.php
+++ b/core/lib/Thelia/Controller/Admin/SessionController.php
@@ -27,7 +27,6 @@ use Thelia\Form\AdminLogin;
 use Thelia\Core\Security\Authentication\AdminUsernamePasswordFormAuthenticator;
 use Thelia\Model\AdminLog;
 use Thelia\Core\Security\Exception\AuthenticationException;
-use Symfony\Component\Validator\Exception\ValidatorException;
 use Thelia\Tools\URL;
 use Thelia\Tools\Redirect;
 use Thelia\Core\Event\TheliaEvents;
@@ -74,20 +73,17 @@ class SessionController extends BaseAdminController
             // Redirect to the success URL
             return Redirect::exec($adminLoginForm->getSuccessUrl());
 
-         }
-         catch (FormValidationException $ex) {
+         } catch (FormValidationException $ex) {
 
              // Validation problem
              $message = $this->createStandardFormValidationErrorMessage($ex);
-         }
-         catch (AuthenticationException $ex) {
+         } catch (AuthenticationException $ex) {
 
              // Log authentication failure
              AdminLog::append(sprintf("Authentication failure for username '%s'", $authenticator->getUsername()), $request);
 
              $message =  $this->getTranslator()->trans("Login failed. Please check your username and password.");
-         }
-         catch (\Exception $ex) {
+         } catch (\Exception $ex) {
 
              // Log authentication failure
              AdminLog::append(sprintf("Undefined error: %s", $ex->getMessage()), $request);
@@ -103,4 +99,4 @@ class SessionController extends BaseAdminController
           // Display the login form again
         return $this->render("login");
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 95ba9a524..36a03529b 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -39,7 +39,6 @@ use Thelia\Form\BaseForm;
 use Thelia\Form\Exception\FormValidationException;
 use Symfony\Component\EventDispatcher\Event;
 use Thelia\Core\Event\DefaultActionEvent;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
@@ -65,8 +64,8 @@ class BaseController extends ContainerAware
     /**
      * Dispatch a Thelia event
      *
-     * @param string    $eventName a TheliaEvent name, as defined in TheliaEvents class
-     * @param Event     $event the action event, or null (a DefaultActionEvent will be dispatched)
+     * @param string $eventName a TheliaEvent name, as defined in TheliaEvents class
+     * @param Event  $event     the action event, or null (a DefaultActionEvent will be dispatched)
      */
     protected function dispatch($eventName, ActionEvent $event = null)
     {
@@ -139,11 +138,11 @@ class BaseController extends ContainerAware
     /**
      * Get all errors that occured in a form
      *
-     * @param \Symfony\Component\Form\Form $form
-     * @return string the error string
+     * @param  \Symfony\Component\Form\Form $form
+     * @return string                       the error string
      */
-    private function getErrorMessages(\Symfony\Component\Form\Form $form) {
-
+    private function getErrorMessages(\Symfony\Component\Form\Form $form)
+    {
         $errors = '';
 
         foreach ($form->getErrors() as $key => $error) {
@@ -177,8 +176,7 @@ class BaseController extends ContainerAware
 
             if ($form->isValid()) {
                 return $form;
-            }
-            else {
+            } else {
                 $errorMessage = null;
                 if ($form->get("error_message")->getData() != null) {
                     $errorMessage = $form->get("error_message")->getData();
@@ -188,8 +186,7 @@ class BaseController extends ContainerAware
 
                 throw new FormValidationException($errorMessage);
             }
-        }
-        else {
+        } else {
             throw new FormValidationException(sprintf("Wrong form method, %s expected.", $expectedMethod));
         }
     }
@@ -214,8 +211,7 @@ class BaseController extends ContainerAware
     {
         if ($form != null) {
             $url = $form->getSuccessUrl();
-        }
-        else {
+        } else {
             $url = $this->getRequest()->get("success_url");
         }
 
@@ -236,10 +232,11 @@ class BaseController extends ContainerAware
      * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
      * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
      *                                             it does not match the requirement
-     * @throws \InvalidArgumentException            When the router doesn't exist
-     * @return string The generated URL
+     * @throws \InvalidArgumentException When the router doesn't exist
+     * @return string                    The generated URL
      */
-    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
+    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    {
         /** @var Router $router */
         $router =  $this->container->get($routerName);
 
@@ -268,4 +265,4 @@ class BaseController extends ContainerAware
     {
         return $this->container->getParameter('kernel.debug');
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Front/AddressController.php b/core/lib/Thelia/Controller/Front/AddressController.php
index 08e803556..92d54695c 100644
--- a/core/lib/Thelia/Controller/Front/AddressController.php
+++ b/core/lib/Thelia/Controller/Front/AddressController.php
@@ -31,7 +31,6 @@ use Thelia\Model\Base\AddressQuery;
 use Thelia\Model\Customer;
 use Thelia\Tools\URL;
 
-
 /**
  * Class AddressController
  * @package Thelia\Controller\Front
@@ -64,10 +63,9 @@ class AddressController extends BaseFrontController
             $this->dispatch(TheliaEvents::ADDRESS_CREATE, $event);
             $this->redirectSuccess($addressCreate);
 
-        }catch (FormValidationException $e) {
+        } catch (FormValidationException $e) {
             $message = sprintf("Please check your input: %s", $e->getMessage());
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $message = sprintf("Sorry, an error occured: %s", $e->getMessage());
         }
 
@@ -91,7 +89,7 @@ class AddressController extends BaseFrontController
             $this->redirectToRoute("home");
         }
 
-        if(null === $address_id =  $request->get("address_id")) {
+        if (null === $address_id =  $request->get("address_id")) {
             $this->redirectToRoute("home");
         }
 
@@ -108,7 +106,7 @@ class AddressController extends BaseFrontController
                 $this->redirectToRoute("home");
             }
 
-            if($address->getCustomer()->getId() != $customer->getId()) {
+            if ($address->getCustomer()->getId() != $customer->getId()) {
                 $this->redirectToRoute("home");
             }
 
@@ -118,10 +116,9 @@ class AddressController extends BaseFrontController
             $this->dispatch(TheliaEvents::ADDRESS_UPDATE, $event);
 
             $this->redirectSuccess($addressUpdate);
-        }catch (FormValidationException $e) {
+        } catch (FormValidationException $e) {
             $message = sprintf("Please check your input: %s", $e->getMessage());
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $message = sprintf("Sorry, an error occured: %s", $e->getMessage());
         }
 
@@ -155,4 +152,4 @@ class AddressController extends BaseFrontController
             $form->get("company")->getData()
         );
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php
index ed6774c8b..cf83e865d 100755
--- a/core/lib/Thelia/Controller/Front/BaseFrontController.php
+++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php
@@ -35,17 +35,19 @@ class BaseFrontController extends BaseController
      *
      * @see \Thelia\Controller\BaseController::getRouteFromRouter()
      */
-    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
+    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    {
         return $this->getRouteFromRouter('router.front', $routeId, $parameters, $referenceType);
     }
 
     /**
      * Redirect to à route ID related URL
      *
-     * @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
+     * @param unknown $routeId       the route ID, as found in Config/Resources/routing/admin.xml
      * @param unknown $urlParameters the URL parametrs, as a var/value pair array
      */
-    public function redirectToRoute($routeId, $urlParameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
+    public function redirectToRoute($routeId, $urlParameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    {
         $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId, array(), $referenceType), $urlParameters));
     }
 }
diff --git a/core/lib/Thelia/Controller/Front/CartController.php b/core/lib/Thelia/Controller/Front/CartController.php
index c3d928a15..e13ecd61b 100755
--- a/core/lib/Thelia/Controller/Front/CartController.php
+++ b/core/lib/Thelia/Controller/Front/CartController.php
@@ -77,7 +77,7 @@ class CartController extends BaseFrontController
             $this->getDispatcher()->dispatch(TheliaEvents::CART_UPDATEITEM, $cartEvent);
 
             $this->redirectSuccess();
-        } catch(PropelException $e) {
+        } catch (PropelException $e) {
             $this->getParserContext()->setGeneralError($e->getMessage());
         }
 
@@ -97,7 +97,6 @@ class CartController extends BaseFrontController
             $this->getParserContext()->setGeneralError($e->getMessage());
         }
 
-
     }
 
     /**
diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php
index 58d578955..85db69472 100755
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/core/lib/Thelia/Controller/Front/CustomerController.php
@@ -27,19 +27,15 @@ use Thelia\Core\Event\CustomerLoginEvent;
 use Thelia\Core\Security\Authentication\CustomerUsernamePasswordFormAuthenticator;
 use Thelia\Core\Security\Exception\AuthenticationException;
 use Thelia\Core\Security\Exception\UsernameNotFoundException;
-use Thelia\Core\Security\SecurityContext;
 use Thelia\Form\CustomerCreation;
 use Thelia\Form\CustomerLogin;
 use Thelia\Form\CustomerModification;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Model\Customer;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\CustomerEvent;
-use Thelia\Core\Factory\ActionEventFactory;
 use Thelia\Tools\URL;
 use Thelia\Log\Tlog;
 use Thelia\Core\Security\Exception\WrongPasswordException;
-use Symfony\Component\Routing\Router;
 
 /**
  * Class CustomerController
@@ -70,11 +66,9 @@ class CustomerController extends BaseFrontController
                 $this->processLogin($customerCreateEvent->getCustomer());
 
                 $this->redirectSuccess($customerCreation);
-            }
-            catch (FormValidationException $e) {
+            } catch (FormValidationException $e) {
                 $message = sprintf("Please check your input: %s", $e->getMessage());
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 $message = sprintf("Sorry, an error occured: %s", $e->getMessage());
             }
 
@@ -118,11 +112,9 @@ class CustomerController extends BaseFrontController
 
                 $this->redirectSuccess($customerModification);
 
-            }
-            catch (FormValidationException $e) {
+            } catch (FormValidationException $e) {
                 $message = sprintf("Please check your input: %s", $e->getMessage());
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 $message = sprintf("Sorry, an error occured: %s", $e->getMessage());
             }
 
@@ -166,29 +158,24 @@ class CustomerController extends BaseFrontController
 
                 $this->redirectSuccess($customerLoginForm);
 
-            }
-            catch (FormValidationException $e) {
+            } catch (FormValidationException $e) {
 
                 if ($request->request->has("account")) {
                     $account = $request->request->get("account");
                     $form = $customerLoginForm->getForm();
-                    if($account == 0 && $form->get("email")->getData() !== null) {
+                    if ($account == 0 && $form->get("email")->getData() !== null) {
                         $this->redirectToRoute("customer.create.view", array("email" => $form->get("email")->getData()));
                     }
                 }
 
                 $message = sprintf("Please check your input: %s", $e->getMessage());
-            }
-            catch(UsernameNotFoundException $e) {
+            } catch (UsernameNotFoundException $e) {
                 $message = "Wrong email or password. Please try again";
-            }
-            catch (WrongPasswordException $e) {
+            } catch (WrongPasswordException $e) {
                 $message = "Wrong email or password. Please try again";
-            }
-            catch(AuthenticationException $e) {
+            } catch (AuthenticationException $e) {
                 $message = "Wrong email or password. Please try again";
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 $message = sprintf("Sorry, an error occured: %s", $e->getMessage());
             }
 
diff --git a/core/lib/Thelia/Controller/Front/DefaultController.php b/core/lib/Thelia/Controller/Front/DefaultController.php
index fe7e1aede..0466e4dd4 100755
--- a/core/lib/Thelia/Controller/Front/DefaultController.php
+++ b/core/lib/Thelia/Controller/Front/DefaultController.php
@@ -53,7 +53,7 @@ class DefaultController extends BaseFrontController
                 $view = $request->request->get('view');
             }
         }
-        if(null !== $view) {
+        if (null !== $view) {
             $request->attributes->set('_view', $view);
         }
 
@@ -61,11 +61,11 @@ class DefaultController extends BaseFrontController
             $request->attributes->set("_view", "index");
         }
 
-        if(ConfigQuery::isRewritingEnable()) {
-            if($request->attributes->get('_rewritten', false) === false) {
+        if (ConfigQuery::isRewritingEnable()) {
+            if ($request->attributes->get('_rewritten', false) === false) {
                 /* Does the query GET parameters match a rewritten URL ? */
                 $rewrittenUrl = URL::getInstance()->retrieveCurrent($request);
-                if($rewrittenUrl->rewrittenUrl !== null) {
+                if ($rewrittenUrl->rewrittenUrl !== null) {
                     /* 301 redirection to rewritten URL */
                     $this->redirect($rewrittenUrl->rewrittenUrl, 301);
                 }
diff --git a/core/lib/Thelia/Controller/Front/DeliveryController.php b/core/lib/Thelia/Controller/Front/DeliveryController.php
index ef84be6ab..ef5913bc9 100644
--- a/core/lib/Thelia/Controller/Front/DeliveryController.php
+++ b/core/lib/Thelia/Controller/Front/DeliveryController.php
@@ -25,7 +25,6 @@ namespace Thelia\Controller\Front;
 use Thelia\Model\ModuleQuery;
 use Thelia\Tools\URL;
 
-
 /**
  * Class DeliveryController
  * @package Thelia\Controller\Front
@@ -53,4 +52,4 @@ class DeliveryController extends BaseFrontController
             $this->pageNotFound();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Install/BaseInstallController.php b/core/lib/Thelia/Controller/Install/BaseInstallController.php
index a5cbbd506..35293904e 100644
--- a/core/lib/Thelia/Controller/Install/BaseInstallController.php
+++ b/core/lib/Thelia/Controller/Install/BaseInstallController.php
@@ -25,7 +25,6 @@ namespace Thelia\Controller\Install;
 use Symfony\Component\HttpFoundation\Response;
 use Thelia\Controller\BaseController;
 
-
 /**
  * Class BaseInstallController
  * @package Thelia\Controller\Install
@@ -57,4 +56,4 @@ class BaseInstallController extends BaseController
 
         return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Controller/Install/InstallController.php b/core/lib/Thelia/Controller/Install/InstallController.php
index 209eea82b..0514ba0ff 100644
--- a/core/lib/Thelia/Controller/Install/InstallController.php
+++ b/core/lib/Thelia/Controller/Install/InstallController.php
@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Controller\Install;
-use Thelia\Install\BaseInstall;
 use Thelia\Install\CheckPermission;
 
 /**
@@ -30,8 +29,8 @@ use Thelia\Install\CheckPermission;
  * @package Thelia\Controller\Install
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class InstallController extends BaseInstallController {
-
+class InstallController extends BaseInstallController
+{
     public function index()
     {
         $this->verifyStep(1);
@@ -58,7 +57,7 @@ class InstallController extends BaseInstallController {
            return true;
         }
 
-        switch($step) {
+        switch ($step) {
             case "1" :
                 if ($sessionStep > 1) {
                     $this->redirect("/install/step/2");
@@ -66,4 +65,4 @@ class InstallController extends BaseInstallController {
                 break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/ActionEvent.php b/core/lib/Thelia/Core/Event/ActionEvent.php
index 5040be7f5..41886fd82 100755
--- a/core/lib/Thelia/Core/Event/ActionEvent.php
+++ b/core/lib/Thelia/Core/Event/ActionEvent.php
@@ -24,8 +24,6 @@
 namespace Thelia\Core\Event;
 
 use Symfony\Component\EventDispatcher\Event;
-use Thelia\Core\HttpFoundation\Request;
-use Thelia\Form\BaseForm;
 /**
  *
  * Class thrown on Thelia.action event
@@ -50,4 +48,4 @@ abstract class ActionEvent extends Event
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/AddressCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/AddressCreateOrUpdateEvent.php
index d6dd6e3ed..af69ae0b4 100644
--- a/core/lib/Thelia/Core/Event/AddressCreateOrUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/AddressCreateOrUpdateEvent.php
@@ -26,7 +26,6 @@ use Symfony\Component\EventDispatcher\Event;
 use Thelia\Model\Address;
 use Thelia\Model\Customer;
 
-
 /**
  * Class AddressCreateOrUpdateEvent
  * @package Thelia\Core\Event
@@ -109,7 +108,7 @@ class AddressCreateOrUpdateEvent extends ActionEvent
      */
     protected $address;
 
-    function __construct($label, $title, $firstname, $lastname, $address1, $address2, $address3, $zipcode, $city, $country, $cellphone, $phone, $company)
+    public function __construct($label, $title, $firstname, $lastname, $address1, $address2, $address3, $zipcode, $city, $country, $cellphone, $phone, $company)
     {
         $this->address1 = $address1;
         $this->address2 = $address2;
@@ -263,5 +262,4 @@ class AddressCreateOrUpdateEvent extends ActionEvent
         return $this->address;
     }
 
-
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/AddressEvent.php b/core/lib/Thelia/Core/Event/AddressEvent.php
index 5167108fd..366801075 100644
--- a/core/lib/Thelia/Core/Event/AddressEvent.php
+++ b/core/lib/Thelia/Core/Event/AddressEvent.php
@@ -25,7 +25,6 @@ namespace Thelia\Core\Event;
 use Symfony\Component\EventDispatcher\Event;
 use Thelia\Model\Address;
 
-
 /**
  * Class AddressEvent
  * @package Thelia\Core\Event
@@ -38,12 +37,11 @@ class AddressEvent extends ActionEvent
      */
     protected $address;
 
-    function __construct(Address $address)
+    public function __construct(Address $address)
     {
         $this->address = $address;
     }
 
-
     /**
      * @return \Thelia\Model\Address
      */
@@ -51,4 +49,4 @@ class AddressEvent extends ActionEvent
     {
         return $this->address;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php
index 2dbd54374..65be75292 100644
--- a/core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php
+++ b/core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php
@@ -23,7 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-
 class BaseToggleVisibilityEvent  extends ActionEvent
 {
     protected $object_id;
@@ -43,6 +42,7 @@ class BaseToggleVisibilityEvent  extends ActionEvent
     public function setObjectId($object_id)
     {
         $this->object_id = $object_id;
+
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php b/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php
index 41907c29c..9b58ecfeb 100644
--- a/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php
+++ b/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php
@@ -50,6 +50,7 @@ class BaseUpdatePositionEvent extends ActionEvent
     public function setMode($mode)
     {
         $this->mode = $mode;
+
         return $this;
     }
 
@@ -61,6 +62,7 @@ class BaseUpdatePositionEvent extends ActionEvent
     public function setPosition($position)
     {
         $this->position = $position;
+
         return $this;
     }
 
@@ -72,6 +74,7 @@ class BaseUpdatePositionEvent extends ActionEvent
     public function setObjectId($object_id)
     {
         $this->object_id = $object_id;
+
         return $this;
     }
 }
diff --git a/core/lib/Thelia/Core/Event/CartEvent.php b/core/lib/Thelia/Core/Event/CartEvent.php
index 61d58e9d2..b24a5c403 100755
--- a/core/lib/Thelia/Core/Event/CartEvent.php
+++ b/core/lib/Thelia/Core/Event/CartEvent.php
@@ -145,5 +145,4 @@ class CartEvent extends ActionEvent
         return $this->cart;
     }
 
-
 }
diff --git a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php
index 0a6b79269..5a687217c 100644
--- a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-use Thelia\Model\Category;
-
 class CategoryCreateEvent extends CategoryEvent
 {
     protected $title;
@@ -46,6 +44,7 @@ class CategoryCreateEvent extends CategoryEvent
     public function setTitle($title)
     {
         $this->title = $title;
+
         return $this;
     }
 
@@ -57,6 +56,7 @@ class CategoryCreateEvent extends CategoryEvent
     public function setParent($parent)
     {
         $this->parent = $parent;
+
         return $this;
     }
 
@@ -68,6 +68,7 @@ class CategoryCreateEvent extends CategoryEvent
     public function setLocale($locale)
     {
         $this->locale = $locale;
+
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
index ad686563d..9d77a7e87 100644
--- a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-use Thelia\Model\Category;
-
 class CategoryDeleteEvent extends CategoryEvent
 {
     public function __construct($category_id)
@@ -40,6 +38,7 @@ class CategoryDeleteEvent extends CategoryEvent
     public function setCategoryId($category_id)
     {
         $this->category_id = $category_id;
+
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/CategoryEvent.php b/core/lib/Thelia/Core/Event/CategoryEvent.php
index ac04f15c9..ab5b101e5 100644
--- a/core/lib/Thelia/Core/Event/CategoryEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryEvent.php
@@ -35,7 +35,8 @@ class CategoryEvent extends ActionEvent
         $this->category = $category;
     }
 
-    public function hasCategory() {
+    public function hasCategory()
+    {
         return ! is_null($this->category);
     }
 
diff --git a/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
index 103c5207e..506904ec8 100644
--- a/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
@@ -25,4 +25,4 @@ namespace Thelia\Core\Event;
 
 class CategoryToggleVisibilityEvent extends BaseToggleVisibilityEvent
 {
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php b/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php
index 305cf9369..44e760549 100644
--- a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php
@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event;
-use Thelia\Model\Category;
 
 class CategoryUpdateEvent extends CategoryCreateEvent
 {
@@ -49,6 +48,7 @@ class CategoryUpdateEvent extends CategoryCreateEvent
     public function setCategoryId($category_id)
     {
         $this->category_id = $category_id;
+
         return $this;
     }
 
@@ -60,6 +60,7 @@ class CategoryUpdateEvent extends CategoryCreateEvent
     public function setChapo($chapo)
     {
         $this->chapo = $chapo;
+
         return $this;
     }
 
@@ -71,6 +72,7 @@ class CategoryUpdateEvent extends CategoryCreateEvent
     public function setDescription($description)
     {
         $this->description = $description;
+
         return $this;
     }
 
@@ -82,6 +84,7 @@ class CategoryUpdateEvent extends CategoryCreateEvent
     public function setPostscriptum($postscriptum)
     {
         $this->postscriptum = $postscriptum;
+
         return $this;
     }
 
@@ -93,6 +96,7 @@ class CategoryUpdateEvent extends CategoryCreateEvent
     public function setUrl($url)
     {
         $this->url = $url;
+
         return $this;
     }
 
@@ -104,6 +108,7 @@ class CategoryUpdateEvent extends CategoryCreateEvent
     public function setVisibility($visibility)
     {
         $this->visibility = $visibility;
+
         return $this;
     }
 
@@ -115,6 +120,7 @@ class CategoryUpdateEvent extends CategoryCreateEvent
     public function setParent($parent)
     {
         $this->parent = $parent;
+
         return $this;
     }
 }
diff --git a/core/lib/Thelia/Core/Event/CategoryUpdatePositionEvent.php b/core/lib/Thelia/Core/Event/CategoryUpdatePositionEvent.php
index 44af9b946..701fd4c8a 100644
--- a/core/lib/Thelia/Core/Event/CategoryUpdatePositionEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryUpdatePositionEvent.php
@@ -25,4 +25,4 @@ namespace Thelia\Core\Event;
 
 class CategoryUpdatePositionEvent extends BaseUpdatePositionEvent
 {
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/ConfigCreateEvent.php b/core/lib/Thelia/Core/Event/ConfigCreateEvent.php
index 79440c491..986eb31b7 100644
--- a/core/lib/Thelia/Core/Event/ConfigCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/ConfigCreateEvent.php
@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event;
-use Thelia\Model\Config;
 
 class ConfigCreateEvent extends ConfigEvent
 {
diff --git a/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php b/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php
index 6cc39438c..87ae50c38 100644
--- a/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-use Thelia\Model\Config;
-
 class ConfigDeleteEvent extends ConfigEvent
 {
     protected $config_id;
diff --git a/core/lib/Thelia/Core/Event/ConfigEvent.php b/core/lib/Thelia/Core/Event/ConfigEvent.php
index 5e1c673cf..646b43856 100644
--- a/core/lib/Thelia/Core/Event/ConfigEvent.php
+++ b/core/lib/Thelia/Core/Event/ConfigEvent.php
@@ -33,7 +33,8 @@ class ConfigEvent extends ActionEvent
         $this->config = $config;
     }
 
-    public function hasConfig() {
+    public function hasConfig()
+    {
         return ! is_null($this->config);
     }
 
diff --git a/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php b/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php
index a73613699..b3d5955c4 100644
--- a/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-use Thelia\Model\Config;
-
 class ConfigUpdateEvent extends ConfigCreateEvent
 {
     protected $config_id;
@@ -85,4 +83,4 @@ class ConfigUpdateEvent extends ConfigCreateEvent
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php
index 796baed08..2e004b818 100644
--- a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php
@@ -102,7 +102,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent
      * @param CouponRuleCollection $rules                      CouponRuleInterface to add
      * @param string               $locale                     Coupon Language code ISO (ex: fr_FR)
      */
-    function __construct(
+    public function __construct(
         $code,
         $title,
         $amount,
@@ -307,6 +307,4 @@ class CouponCreateOrUpdateEvent extends ActionEvent
         return $this->coupon;
     }
 
-
-
 }
diff --git a/core/lib/Thelia/Core/Event/CurrencyCreateEvent.php b/core/lib/Thelia/Core/Event/CurrencyCreateEvent.php
index d9d345ddd..fe2cf078c 100644
--- a/core/lib/Thelia/Core/Event/CurrencyCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/CurrencyCreateEvent.php
@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event;
-use Thelia\Model\Currency;
 
 class CurrencyCreateEvent extends CurrencyEvent
 {
@@ -92,4 +91,4 @@ class CurrencyCreateEvent extends CurrencyEvent
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/CurrencyDeleteEvent.php b/core/lib/Thelia/Core/Event/CurrencyDeleteEvent.php
index 5b9714b47..706b77f9d 100644
--- a/core/lib/Thelia/Core/Event/CurrencyDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/CurrencyDeleteEvent.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-use Thelia\Model\Currency;
-
 class CurrencyDeleteEvent extends CurrencyEvent
 {
     protected $currency_id;
@@ -45,4 +43,4 @@ class CurrencyDeleteEvent extends CurrencyEvent
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/CurrencyEvent.php b/core/lib/Thelia/Core/Event/CurrencyEvent.php
index 65ac60513..cdc0b854c 100644
--- a/core/lib/Thelia/Core/Event/CurrencyEvent.php
+++ b/core/lib/Thelia/Core/Event/CurrencyEvent.php
@@ -33,7 +33,8 @@ class CurrencyEvent extends ActionEvent
         $this->currency = $currency;
     }
 
-    public function hasCurrency() {
+    public function hasCurrency()
+    {
         return ! is_null($this->currency);
     }
 
diff --git a/core/lib/Thelia/Core/Event/CurrencyUpdateEvent.php b/core/lib/Thelia/Core/Event/CurrencyUpdateEvent.php
index 044a93baa..58f8b0af4 100644
--- a/core/lib/Thelia/Core/Event/CurrencyUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/CurrencyUpdateEvent.php
@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event;
-use Thelia\Model\Currency;
 
 class CurrencyUpdateEvent extends CurrencyCreateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php b/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php
index 3a3dbb18f..fad51f2c7 100644
--- a/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php
+++ b/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php
@@ -25,4 +25,4 @@ namespace Thelia\Core\Event;
 
 class CurrencyUpdatePositionEvent extends BaseUpdatePositionEvent
 {
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/CustomerCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/CustomerCreateOrUpdateEvent.php
index 9bee163ae..3a57d53a4 100755
--- a/core/lib/Thelia/Core/Event/CustomerCreateOrUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/CustomerCreateOrUpdateEvent.php
@@ -9,12 +9,11 @@
 
 namespace Thelia\Core\Event;
 
-
 use Symfony\Component\EventDispatcher\Event;
 use Thelia\Model\Customer;
 
-class CustomerCreateOrUpdateEvent extends ActionEvent {
-
+class CustomerCreateOrUpdateEvent extends ActionEvent
+{
     //base parameters for creating new customer
     protected $title;
     protected $firstname;
@@ -39,9 +38,8 @@ class CustomerCreateOrUpdateEvent extends ActionEvent {
      */
     protected $customer;
 
-
     /**
-     * @param int $title the title customer id
+     * @param int    $title     the title customer id
      * @param string $firstname
      * @param string $lastname
      * @param string $address1
@@ -51,15 +49,15 @@ class CustomerCreateOrUpdateEvent extends ActionEvent {
      * @param string $cellphone
      * @param string $zipcode
      * @param string $city
-     * @param int $country the country id
+     * @param int    $country   the country id
      * @param string $email
-     * @param string $password plain password, don't put hash password, it will hashes again
+     * @param string $password  plain password, don't put hash password, it will hashes again
      * @param $lang
-     * @param int $reseller if customer is a reseller
-     * @param int $sponsor customer's id sponsor
+     * @param int   $reseller if customer is a reseller
+     * @param int   $sponsor  customer's id sponsor
      * @param float $discount
      */
-    function __construct($title, $firstname, $lastname, $address1, $address2, $address3, $phone, $cellphone, $zipcode, $city, $country, $email, $password, $lang, $reseller, $sponsor, $discount)
+    public function __construct($title, $firstname, $lastname, $address1, $address2, $address3, $phone, $cellphone, $zipcode, $city, $country, $email, $password, $lang, $reseller, $sponsor, $discount)
     {
         $this->address1 = $address1;
         $this->address2 = $address2;
@@ -231,7 +229,4 @@ class CustomerCreateOrUpdateEvent extends ActionEvent {
         return $this->customer;
     }
 
-
-
-
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/CustomerEvent.php b/core/lib/Thelia/Core/Event/CustomerEvent.php
index 656f023c9..191b67e78 100755
--- a/core/lib/Thelia/Core/Event/CustomerEvent.php
+++ b/core/lib/Thelia/Core/Event/CustomerEvent.php
@@ -43,5 +43,4 @@ class CustomerEvent extends ActionEvent
         return $this->customer;
     }
 
-
 }
diff --git a/core/lib/Thelia/Core/Event/CustomerLoginEvent.php b/core/lib/Thelia/Core/Event/CustomerLoginEvent.php
index 9a26bba3f..e43968845 100755
--- a/core/lib/Thelia/Core/Event/CustomerLoginEvent.php
+++ b/core/lib/Thelia/Core/Event/CustomerLoginEvent.php
@@ -23,11 +23,10 @@
 
 namespace Thelia\Core\Event;
 
-
 use Thelia\Model\Customer;
 
-class CustomerLoginEvent extends ActionEvent {
-
+class CustomerLoginEvent extends ActionEvent
+{
     protected $customer;
 
     public function __construct(Customer $customer)
@@ -39,4 +38,4 @@ class CustomerLoginEvent extends ActionEvent {
     {
         return $this->customer;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/ImageEvent.php b/core/lib/Thelia/Core/Event/ImageEvent.php
index a105d9f6f..5ea1581cd 100755
--- a/core/lib/Thelia/Core/Event/ImageEvent.php
+++ b/core/lib/Thelia/Core/Event/ImageEvent.php
@@ -22,8 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event;
-use Thelia\Core\HttpFoundation\Request;
-use Thelia\Model\Cart;
 
 class ImageEvent extends ActionEvent
 {
diff --git a/core/lib/Thelia/Core/Event/MessageCreateEvent.php b/core/lib/Thelia/Core/Event/MessageCreateEvent.php
index 0d698168a..172af5f61 100644
--- a/core/lib/Thelia/Core/Event/MessageCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/MessageCreateEvent.php
@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event;
-use Thelia\Model\Message;
 
 class MessageCreateEvent extends MessageEvent
 {
@@ -79,4 +78,4 @@ class MessageCreateEvent extends MessageEvent
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/MessageDeleteEvent.php b/core/lib/Thelia/Core/Event/MessageDeleteEvent.php
index 5513c85a9..241c68463 100644
--- a/core/lib/Thelia/Core/Event/MessageDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/MessageDeleteEvent.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-use Thelia\Model\Message;
-
 class MessageDeleteEvent extends MessageEvent
 {
     protected $message_id;
@@ -45,4 +43,4 @@ class MessageDeleteEvent extends MessageEvent
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Event/MessageEvent.php b/core/lib/Thelia/Core/Event/MessageEvent.php
index 0f46ae590..c0efcf39f 100644
--- a/core/lib/Thelia/Core/Event/MessageEvent.php
+++ b/core/lib/Thelia/Core/Event/MessageEvent.php
@@ -33,7 +33,8 @@ class MessageEvent extends ActionEvent
         $this->message = $message;
     }
 
-    public function hasMessage() {
+    public function hasMessage()
+    {
         return ! is_null($this->message);
     }
 
diff --git a/core/lib/Thelia/Core/Event/MessageUpdateEvent.php b/core/lib/Thelia/Core/Event/MessageUpdateEvent.php
index 1b3712266..8c9e2e740 100644
--- a/core/lib/Thelia/Core/Event/MessageUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/MessageUpdateEvent.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-use Thelia\Model\Message;
-
 class MessageUpdateEvent extends MessageCreateEvent
 {
     protected $message_id;
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 500803f53..c19d3a400 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -204,8 +204,6 @@ final class TheliaEvents
      */
     const IMAGE_CLEAR_CACHE = "action.clearImageCache";
 
-
-
     /**
      * Sent when creating a Coupon
      */
@@ -311,7 +309,6 @@ final class TheliaEvents
      */
     const AFTER_COUPON_RULE_DELETE 	= "action.after_delete_coupon_rule";
 
-
     // -- Configuration management ---------------------------------------------
 
     const CONFIG_CREATE   = "action.createConfig";
@@ -361,5 +358,4 @@ final class TheliaEvents
     const BEFORE_DELETECURRENCY = "action.before_deleteCurrency";
     const AFTER_DELETECURRENCY  = "action.after_deleteCurrency";
 
-
 }
diff --git a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
index fc2726647..dd6af30d2 100755
--- a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
+++ b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
@@ -84,6 +84,7 @@ class Session extends BaseSession
     public function setCustomerUser(UserInterface $user)
     {
         $this->set('thelia.customer_user', $user);
+
         return $this;
     }
 
@@ -102,6 +103,7 @@ class Session extends BaseSession
     public function setAdminUser(UserInterface $user)
     {
         $this->set('thelia.admin_user', $user);
+
         return $this;
     }
 
@@ -120,6 +122,7 @@ class Session extends BaseSession
     public function setReturnToUrl($url)
     {
         $this->set('thelia.return_to_url', $url);
+
         return $this;
     }
 
@@ -180,6 +183,7 @@ class Session extends BaseSession
     public function setCart($cart_id)
     {
         $this->set("thelia.cart_id", $cart_id);
+
         return $this;
     }
 
@@ -192,6 +196,7 @@ class Session extends BaseSession
     public function setDelivery($delivery_id)
     {
         $this->set("thelia.delivery_id", $delivery_id);
+
         return $this;
     }
 
@@ -199,4 +204,4 @@ class Session extends BaseSession
     {
         return $this->get("thelia.delivery_id");
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Routing/RewritingRouter.php b/core/lib/Thelia/Core/Routing/RewritingRouter.php
index 79d5dc80b..2b663a979 100644
--- a/core/lib/Thelia/Core/Routing/RewritingRouter.php
+++ b/core/lib/Thelia/Core/Routing/RewritingRouter.php
@@ -38,7 +38,6 @@ use Thelia\Model\ConfigQuery;
 use Thelia\Tools\Redirect;
 use Thelia\Tools\URL;
 
-
 /**
  * Class RewritingRouter
  * @package Thelia\Core\Routing
@@ -114,8 +113,8 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
      *
      * If there is no route with the given name, the generator must throw the RouteNotFoundException.
      *
-     * @param string $name          The name of the route
-     * @param mixed $parameters    An array of parameters
+     * @param string         $name          The name of the route
+     * @param mixed          $parameters    An array of parameters
      * @param Boolean|string $referenceType The type of reference to be generated (one of the constants)
      *
      * @return string The generated URL
@@ -163,16 +162,16 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
      * @throws \Exception|\Thelia\Exception\UrlRewritingException
      * @throws \Symfony\Component\Routing\Exception\ResourceNotFoundException
      * @throws \Thelia\Exception\RedirectException
-     * @return array An array of parameters
+     * @return array                                                          An array of parameters
      *
      */
     public function matchRequest(Request $request)
     {
-        if(ConfigQuery::isRewritingEnable()) {
+        if (ConfigQuery::isRewritingEnable()) {
             try {
                 $rewrittenUrlData = URL::getInstance()->resolve($request->getPathInfo());
-            } catch(UrlRewritingException $e) {
-                switch($e->getCode()) {
+            } catch (UrlRewritingException $e) {
+                switch ($e->getCode()) {
                     case UrlRewritingException::URL_NOT_FOUND :
                         throw new ResourceNotFoundException();
                         break;
@@ -183,23 +182,23 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
 
             /* is the URL redirected ? */
 
-            if(null !== $rewrittenUrlData->redirectedToUrl) {
+            if (null !== $rewrittenUrlData->redirectedToUrl) {
                 $this->redirect($rewrittenUrlData->redirectedToUrl, 301);
             }
 
             /* define GET arguments in request */
 
-            if(null !== $rewrittenUrlData->view) {
+            if (null !== $rewrittenUrlData->view) {
                 $request->attributes->set('_view', $rewrittenUrlData->view);
-                if(null !== $rewrittenUrlData->viewId) {
+                if (null !== $rewrittenUrlData->viewId) {
                     $request->query->set($rewrittenUrlData->view . '_id', $rewrittenUrlData->viewId);
                 }
             }
-            if(null !== $rewrittenUrlData->locale) {
+            if (null !== $rewrittenUrlData->locale) {
                 $request->query->set('locale', $rewrittenUrlData->locale);
             }
 
-            foreach($rewrittenUrlData->otherParameters as $parameter => $value) {
+            foreach ($rewrittenUrlData->otherParameters as $parameter => $value) {
                 $request->query->set($parameter, $value);
             }
 
@@ -216,4 +215,4 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
     {
         Redirect::exec($url, $status);
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Security/SecurityContext.php b/core/lib/Thelia/Core/Security/SecurityContext.php
index 3f60db08f..742bd648b 100755
--- a/core/lib/Thelia/Core/Security/SecurityContext.php
+++ b/core/lib/Thelia/Core/Security/SecurityContext.php
@@ -93,12 +93,12 @@ class SecurityContext
     /**
      * Check if a user has at least one of the required roles
      *
-     * @param UserInterface $user the user
-     * @param array $roles the roles
-     * @return boolean true if the user has the required role, false otherwise
+     * @param  UserInterface $user  the user
+     * @param  array         $roles the roles
+     * @return boolean       true if the user has the required role, false otherwise
      */
-    final public function hasRequiredRole($user, array $roles) {
-
+    final public function hasRequiredRole($user, array $roles)
+    {
         if ($user != null) {
             // Check if user's roles matches required roles
             $userRoles = $user->getRoles();
@@ -208,4 +208,4 @@ class SecurityContext
     {
        $this->getSession()->clearAdminUser();
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
index cd7f06ac8..a3323ae2a 100755
--- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
+++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
@@ -29,8 +29,6 @@ use Assetic\Filter;
 use Assetic\Factory\AssetFactory;
 use Assetic\Factory\Worker\CacheBustingWorker;
 use Assetic\AssetWriter;
-use Assetic\Asset\AssetCache;
-use Assetic\Cache\FilesystemCache;
 
 /**
  * This class is a simple helper for generating assets using Assetic.
@@ -139,8 +137,7 @@ class AsseticHelper
             foreach ($filter_list as $filter) {
                 if ('?' != $filter[0]) {
                     $asset->ensureFilter($fm->get($filter));
-                }
-                elseif (!$debug) {
+                } elseif (!$debug) {
                     $asset->ensureFilter($fm->get(substr($filter, 1)));
                 }
             }
diff --git a/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php b/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
index 792389b1c..35077f5c4 100644
--- a/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
@@ -24,10 +24,8 @@
 namespace Thelia\Core\Template\Element;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Thelia\Core\Security\SecurityContext;
 use Thelia\Model\Tools\ModelCriteriaTools;
 
 /**
@@ -55,10 +53,10 @@ abstract class BaseI18nLoop extends BaseLoop
     /**
      * Setup ModelCriteria for proper i18n processing
      *
-     * @param ModelCriteria $search the Propel Criteria to configure
-     * @param array $columns the i18n columns
-     * @param string $foreignTable the specified table (default  to criteria table)
-     * @param string $foreignKey the foreign key in this table (default to criteria table)
+     * @param ModelCriteria $search       the Propel Criteria to configure
+     * @param array         $columns      the i18n columns
+     * @param string        $foreignTable the specified table (default  to criteria table)
+     * @param string        $foreignKey   the foreign key in this table (default to criteria table)
      * @param bool          $forceReturn
      *
      * @return mixed the locale
@@ -66,6 +64,7 @@ abstract class BaseI18nLoop extends BaseLoop
     protected function configureI18nProcessing(ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID', $forceReturn = false)
     {
         /* manage translations */
+
         return ModelCriteriaTools::getI18n(
             $this->getBackend_context(),
             $this->getLang(),
@@ -77,4 +76,4 @@ abstract class BaseI18nLoop extends BaseLoop
             $forceReturn
         );
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
index 209973112..254560453 100755
--- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
@@ -29,7 +29,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Thelia\Core\Security\SecurityContext;
-use Thelia\Model\Tools\ModelCriteriaTools;
 
 /**
  *
diff --git a/core/lib/Thelia/Core/Template/Element/LoopResult.php b/core/lib/Thelia/Core/Template/Element/LoopResult.php
index 169fdb4f7..f86ab203d 100755
--- a/core/lib/Thelia/Core/Template/Element/LoopResult.php
+++ b/core/lib/Thelia/Core/Template/Element/LoopResult.php
@@ -37,7 +37,7 @@ class LoopResult implements \Iterator
     public function __construct($modelCollection = null)
     {
         $this->position = 0;
-        if($modelCollection instanceof ObjectCollection || $modelCollection instanceof PropelModelPager) {
+        if ($modelCollection instanceof ObjectCollection || $modelCollection instanceof PropelModelPager) {
             $this->modelCollection = $modelCollection;
         }
     }
diff --git a/core/lib/Thelia/Core/Template/Element/LoopResultRow.php b/core/lib/Thelia/Core/Template/Element/LoopResultRow.php
index cfea52d8f..15bb287b1 100755
--- a/core/lib/Thelia/Core/Template/Element/LoopResultRow.php
+++ b/core/lib/Thelia/Core/Template/Element/LoopResultRow.php
@@ -38,14 +38,14 @@ class LoopResultRow
 
     public function __construct($loopResult = null, $model = null, $versionable = false, $timestampable = false, $countable = true)
     {
-        if($model instanceof ActiveRecordInterface) {
+        if ($model instanceof ActiveRecordInterface) {
             $this->model = $model;
 
             $this->versionable = $versionable;
             $this->timestampable = $timestampable;
         }
 
-        if($loopResult instanceof LoopResult) {
+        if ($loopResult instanceof LoopResult) {
             $this->loopResult = $loopResult;
 
             $this->countable = $countable;
@@ -95,17 +95,17 @@ class LoopResultRow
 
     protected function assignDefaultOutputs()
     {
-        if(true === $this->versionable) {
-            foreach($this->getVersionOutputs() as $output) {
+        if (true === $this->versionable) {
+            foreach ($this->getVersionOutputs() as $output) {
                 $this->set($output[0], $this->model->$output[1]());
             }
         }
-        if(true === $this->timestampable) {
-            foreach($this->getTimestampOutputs() as $output) {
+        if (true === $this->timestampable) {
+            foreach ($this->getTimestampOutputs() as $output) {
                 $this->set($output[0], $this->model->$output[1]());
             }
         }
-        if(true === $this->countable) {
+        if (true === $this->countable) {
             $this->set('LOOP_COUNT', 1 + $this->loopResult->getCount());
             $this->set('LOOP_TOTAL', $this->loopResult->modelCollection->count());
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/Address.php b/core/lib/Thelia/Core/Template/Loop/Address.php
index 3ac9370f8..831a8dca1 100755
--- a/core/lib/Thelia/Core/Template/Loop/Address.php
+++ b/core/lib/Thelia/Core/Template/Loop/Address.php
@@ -24,7 +24,6 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\Collection\ObjectCollection;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
@@ -48,7 +47,7 @@ use Thelia\Type;
 class Address extends BaseLoop
 {
     public $timestampable = true;
-    
+
     /**
      * @return ArgumentCollection
      */
@@ -99,7 +98,6 @@ class Address extends BaseLoop
 
         $default = $this->getDefault();
 
-
         if ($default === true) {
             $search->filterByIsDefault(1, Criteria::EQUAL);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php b/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php
index 5c73d0602..253c48da7 100755
--- a/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php
+++ b/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php
@@ -77,15 +77,15 @@ class AssociatedContent extends Content
         $product = $this->getProduct();
         $category = $this->getCategory();
 
-        if($product === null && $category === null) {
+        if ($product === null && $category === null) {
             throw new \InvalidArgumentException('You have to provide either `product` or `category` argument in associated_content loop');
         }
 
-        if($product !== null) {
+        if ($product !== null) {
             $search = ProductAssociatedContentQuery::create();
 
             $search->filterByProductId($product, Criteria::EQUAL);
-        } elseif($category !== null) {
+        } elseif ($category !== null) {
             $search = CategoryAssociatedContentQuery::create();
 
             $search->filterByCategoryId($category, Criteria::EQUAL);
diff --git a/core/lib/Thelia/Core/Template/Loop/Attribute.php b/core/lib/Thelia/Core/Template/Loop/Attribute.php
index ecdc551d2..5ab4a2b4e 100755
--- a/core/lib/Thelia/Core/Template/Loop/Attribute.php
+++ b/core/lib/Thelia/Core/Template/Loop/Attribute.php
@@ -24,21 +24,16 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
-
-use Thelia\Model\Base\LangQuery;
 
 use Thelia\Model\Base\CategoryQuery;
 use Thelia\Model\Base\ProductCategoryQuery;
 use Thelia\Model\Base\AttributeQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Model\Map\ProductCategoryTableMap;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
@@ -113,17 +108,17 @@ class Attribute extends BaseI18nLoop
         $product = $this->getProduct();
         $category = $this->getCategory();
 
-        if(null !== $product) {
+        if (null !== $product) {
             $productCategories = ProductCategoryQuery::create()->select(array(ProductCategoryTableMap::CATEGORY_ID))->filterByProductId($product, Criteria::IN)->find()->getData();
 
-            if(null === $category) {
+            if (null === $category) {
                 $category = $productCategories;
             } else {
                 $category = array_merge($category, $productCategories);
             }
         }
 
-        if(null !== $category) {
+        if (null !== $category) {
             $search->filterByCategory(
                 CategoryQuery::create()->filterById($category)->find(),
                 Criteria::IN
@@ -132,7 +127,7 @@ class Attribute extends BaseI18nLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn('i18n_TITLE');
@@ -170,4 +165,4 @@ class Attribute extends BaseI18nLoop
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
index ca4618f53..1d94e889e 100755
--- a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
+++ b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
@@ -24,17 +24,14 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\AttributeAvQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
@@ -95,13 +92,13 @@ class AttributeAvailability extends BaseI18nLoop
 
         $attribute = $this->getAttribute();
 
-        if(null !== $attribute) {
+        if (null !== $attribute) {
             $search->filterByAttributeId($attribute, Criteria::IN);
         }
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn('i18n_TITLE');
@@ -139,4 +136,4 @@ class AttributeAvailability extends BaseI18nLoop
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
index 78cf33e21..f2af0887d 100755
--- a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
+++ b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
@@ -24,19 +24,16 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\AttributeCombinationQuery;
 use Thelia\Model\Map\AttributeAvTableMap;
 use Thelia\Model\Map\AttributeTableMap;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
@@ -100,7 +97,7 @@ class AttributeCombination extends BaseI18nLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(AttributeTableMap::TABLE_NAME . '_i18n_TITLE');
@@ -134,4 +131,4 @@ class AttributeCombination extends BaseI18nLoop
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php
index 3b4e54be6..2aaa173dc 100644
--- a/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php
+++ b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php
@@ -28,13 +28,13 @@ use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Model\ModuleQuery;
 
-
 /**
  * Class Delivery
  * @package Thelia\Core\Template\Loop
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class BaseSpecificModule extends BaseI18nLoop {
+class BaseSpecificModule extends BaseI18nLoop
+{
     public $timestampable = true;
 
     /**
@@ -93,12 +93,10 @@ class BaseSpecificModule extends BaseI18nLoop {
     {
         $search = ModuleQuery::create();
 
-        if(null !== $id = $this->getId())
-        {
+        if (null !== $id = $this->getId()) {
             $search->filterById($id);
         }
 
-
         if (null !== $exclude = $this->getExclude()) {
             $search->filterById($exclude, Criteria::NOT_IN);
         }
@@ -106,4 +104,4 @@ class BaseSpecificModule extends BaseI18nLoop {
         return $search;
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Cart.php b/core/lib/Thelia/Core/Template/Loop/Cart.php
index 8e4d78683..f65afdf40 100755
--- a/core/lib/Thelia/Core/Template/Loop/Cart.php
+++ b/core/lib/Thelia/Core/Template/Loop/Cart.php
@@ -72,8 +72,6 @@ class Cart extends BaseLoop
     public function exec(&$pagination)
     {
 
-
-
         $cart = $this->getCart($this->request);
         $cartItems = $cart->getCartItems();
         $result = new LoopResult($cartItems);
diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php
index 68ae33507..91cb90b0a 100755
--- a/core/lib/Thelia/Core/Template/Loop/Category.php
+++ b/core/lib/Thelia/Core/Template/Loop/Category.php
@@ -30,10 +30,8 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CategoryQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 use Thelia\Type\BooleanOrBothType;
@@ -101,7 +99,7 @@ class Category extends BaseI18nLoop
         /* manage translations */
         $locale = $this->configureI18nProcessing($search);
 
-		$id = $this->getId();
+        $id = $this->getId();
 
         if (!is_null($id)) {
             $search->filterById($id, Criteria::IN);
@@ -113,8 +111,7 @@ class Category extends BaseI18nLoop
             $search->filterByParent($parent);
         }
 
-
-		$current = $this->getCurrent();
+        $current = $this->getCurrent();
 
         if ($current === true) {
             $search->filterById($this->request->get("category_id"));
@@ -122,7 +119,6 @@ class Category extends BaseI18nLoop
             $search->filterById($this->request->get("category_id"), Criteria::NOT_IN);
         }
 
-
          $exclude = $this->getExclude();
 
         if (!is_null($exclude)) {
@@ -130,11 +126,11 @@ class Category extends BaseI18nLoop
         }
 
         if ($this->getVisible() != BooleanOrBothType::ANY)
-        	$search->filterByVisible($this->getVisible() ? 1 : 0);
+            $search->filterByVisible($this->getVisible() ? 1 : 0);
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn('i18n_TITLE');
@@ -179,23 +175,23 @@ class Category extends BaseI18nLoop
             $loopResultRow = new LoopResultRow($loopResult, $category, $this->versionable, $this->timestampable, $this->countable);
 
             $loopResultRow
-            	->set("ID", $category->getId())
+                ->set("ID", $category->getId())
                 ->set("IS_TRANSLATED",$category->getVirtualColumn('IS_TRANSLATED'))
                 ->set("LOCALE",$locale)
-            	->set("TITLE", $category->getVirtualColumn('i18n_TITLE'))
-	            ->set("CHAPO", $category->getVirtualColumn('i18n_CHAPO'))
-	            ->set("DESCRIPTION", $category->getVirtualColumn('i18n_DESCRIPTION'))
-	            ->set("POSTSCRIPTUM", $category->getVirtualColumn('i18n_POSTSCRIPTUM'))
-	            ->set("PARENT", $category->getParent())
-	            ->set("URL", $category->getUrl($locale))
-	            ->set("PRODUCT_COUNT", $category->countChild())
-	            ->set("VISIBLE", $category->getVisible() ? "1" : "0")
-	            ->set("POSITION", $category->getPosition())
-			;
+                ->set("TITLE", $category->getVirtualColumn('i18n_TITLE'))
+                ->set("CHAPO", $category->getVirtualColumn('i18n_CHAPO'))
+                ->set("DESCRIPTION", $category->getVirtualColumn('i18n_DESCRIPTION'))
+                ->set("POSTSCRIPTUM", $category->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("PARENT", $category->getParent())
+                ->set("URL", $category->getUrl($locale))
+                ->set("PRODUCT_COUNT", $category->countChild())
+                ->set("VISIBLE", $category->getVisible() ? "1" : "0")
+                ->set("POSITION", $category->getPosition())
+            ;
 
             $loopResult->addRow($loopResultRow);
         }
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Config.php b/core/lib/Thelia/Core/Template/Loop/Config.php
index 8e03de636..78f53489b 100644
--- a/core/lib/Thelia/Core/Template/Loop/Config.php
+++ b/core/lib/Thelia/Core/Template/Loop/Config.php
@@ -30,7 +30,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\LangQuery;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Model\ConfigQuery;
 use Thelia\Type\BooleanOrBothType;
@@ -114,7 +113,7 @@ class Config extends BaseI18nLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case 'id':
                     $search->orderById(Criteria::ASC);
diff --git a/core/lib/Thelia/Core/Template/Loop/Content.php b/core/lib/Thelia/Core/Template/Loop/Content.php
index baec33344..2d849b218 100755
--- a/core/lib/Thelia/Core/Template/Loop/Content.php
+++ b/core/lib/Thelia/Core/Template/Loop/Content.php
@@ -35,7 +35,6 @@ use Thelia\Model\FolderQuery;
 use Thelia\Model\Map\ContentTableMap;
 use Thelia\Model\ContentFolderQuery;
 use Thelia\Model\ContentQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 use Thelia\Type\BooleanOrBothType;
diff --git a/core/lib/Thelia/Core/Template/Loop/Country.php b/core/lib/Thelia/Core/Template/Loop/Country.php
index 0aeb62b15..f14b97efc 100755
--- a/core/lib/Thelia/Core/Template/Loop/Country.php
+++ b/core/lib/Thelia/Core/Template/Loop/Country.php
@@ -32,7 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
 use Thelia\Model\CountryQuery;
-use Thelia\Model\ConfigQuery;
 
 /**
  *
diff --git a/core/lib/Thelia/Core/Template/Loop/Coupon.php b/core/lib/Thelia/Core/Template/Loop/Coupon.php
index 9b3ebb615..2fb49e8b9 100755
--- a/core/lib/Thelia/Core/Template/Loop/Coupon.php
+++ b/core/lib/Thelia/Core/Template/Loop/Coupon.php
@@ -34,13 +34,9 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Base\CategoryQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Model\CouponQuery;
 use Thelia\Model\Coupon as MCoupon;
-use Thelia\Model\Map\ProductCategoryTableMap;
 use Thelia\Type;
-use Thelia\Type\BooleanOrBothType;
 
 /**
  * Created by JetBrains PhpStorm.
@@ -95,7 +91,6 @@ class Coupon extends BaseI18nLoop
         /** @var Lang $lang */
         $lang = $request->getSession()->getLang();
 
-
         /** @var MCoupon $coupon */
         foreach ($coupons as $coupon) {
             $loopResultRow = new LoopResultRow();
diff --git a/core/lib/Thelia/Core/Template/Loop/Currency.php b/core/lib/Thelia/Core/Template/Loop/Currency.php
index b7261ba45..a1f936300 100755
--- a/core/lib/Thelia/Core/Template/Loop/Currency.php
+++ b/core/lib/Thelia/Core/Template/Loop/Currency.php
@@ -32,7 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
 use Thelia\Model\CurrencyQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type\EnumListType;
 
@@ -109,7 +108,7 @@ class Currency extends BaseI18nLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case 'id':
                     $search->orderById(Criteria::ASC);
diff --git a/core/lib/Thelia/Core/Template/Loop/Customer.php b/core/lib/Thelia/Core/Template/Loop/Customer.php
index 9861be29a..e0ce92c76 100755
--- a/core/lib/Thelia/Core/Template/Loop/Customer.php
+++ b/core/lib/Thelia/Core/Template/Loop/Customer.php
@@ -24,7 +24,6 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\Collection\ObjectCollection;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
@@ -48,7 +47,7 @@ use Thelia\Type;
 class Customer extends BaseLoop
 {
     public $timestampable = true;
-    
+
     /**
      * @return ArgumentCollection
      */
diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php
index 7ef46eedc..a0e9ebb7a 100644
--- a/core/lib/Thelia/Core/Template/Loop/Delivery.php
+++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php
@@ -26,7 +26,6 @@ use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-
 /**
  * Class Delivery
  * @package Thelia\Core\Template\Loop
@@ -60,7 +59,7 @@ class Delivery extends BaseSpecificModule
             $loopResultRow = new LoopResultRow($loopResult, $deliveryModule, $this->versionable, $this->timestampable, $this->countable);
 
             $moduleReflection = new \ReflectionClass($deliveryModule->getFullNamespace());
-            if($moduleReflection->isSubclassOf("Thelia\Module\DeliveryModuleInterface") === false) {
+            if ($moduleReflection->isSubclassOf("Thelia\Module\DeliveryModuleInterface") === false) {
                 throw new \RuntimeException(sprintf("delivery module %s is not a Thelia\Module\DeliveryModuleInterface", $deliveryModule->getCode()));
             }
             $moduleInstance = $moduleReflection->newInstance();
@@ -82,4 +81,4 @@ class Delivery extends BaseSpecificModule
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Feature.php b/core/lib/Thelia/Core/Template/Loop/Feature.php
index 14b7afaf5..7f412e4b0 100755
--- a/core/lib/Thelia/Core/Template/Loop/Feature.php
+++ b/core/lib/Thelia/Core/Template/Loop/Feature.php
@@ -34,7 +34,6 @@ use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Model\Base\CategoryQuery;
 use Thelia\Model\Base\ProductCategoryQuery;
 use Thelia\Model\Base\FeatureQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Model\Map\ProductCategoryTableMap;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
index 38bee46f0..093cea24a 100755
--- a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
+++ b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
@@ -32,7 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
 use Thelia\Model\Base\FeatureAvQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
index 998dfe4e0..30a8dcf27 100755
--- a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
+++ b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
@@ -24,19 +24,15 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\FeatureProductQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Model\Map\FeatureAvTableMap;
-use Thelia\Model\Map\FeatureProductTableMap;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
@@ -107,18 +103,18 @@ class FeatureValue extends BaseI18nLoop
         }
 
         $excludeFeatureAvailability = $this->getExclude_feature_availability();
-        if($excludeFeatureAvailability == true) {
+        if ($excludeFeatureAvailability == true) {
             $search->filterByFeatureAvId(null, Criteria::NULL);
         }
 
         $excludeDefaultValues = $this->getExclude_personal_values();
-        if($excludeDefaultValues == true) {
+        if ($excludeDefaultValues == true) {
             $search->filterByByDefault(null, Criteria::NULL);
         }
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(FeatureAvTableMap::TABLE_NAME . '_i18n_TITLE');
@@ -157,4 +153,4 @@ class FeatureValue extends BaseI18nLoop
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Folder.php b/core/lib/Thelia/Core/Template/Loop/Folder.php
index ca07ffa02..cfd54db4f 100755
--- a/core/lib/Thelia/Core/Template/Loop/Folder.php
+++ b/core/lib/Thelia/Core/Template/Loop/Folder.php
@@ -30,10 +30,8 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\FolderQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 use Thelia\Type\BooleanOrBothType;
@@ -83,7 +81,7 @@ class Folder extends BaseI18nLoop
         /* manage translations */
         $locale = $this->configureI18nProcessing($search);
 
-		$id = $this->getId();
+        $id = $this->getId();
 
         if (!is_null($id)) {
             $search->filterById($id, Criteria::IN);
@@ -95,8 +93,7 @@ class Folder extends BaseI18nLoop
             $search->filterByParent($parent);
         }
 
-
-		$current = $this->getCurrent();
+        $current = $this->getCurrent();
 
         if ($current === true) {
             $search->filterById($this->request->get("folder_id"));
@@ -104,7 +101,6 @@ class Folder extends BaseI18nLoop
             $search->filterById($this->request->get("folder_id"), Criteria::NOT_IN);
         }
 
-
          $exclude = $this->getExclude();
 
         if (!is_null($exclude)) {
@@ -117,7 +113,7 @@ class Folder extends BaseI18nLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn('i18n_TITLE');
@@ -157,23 +153,23 @@ class Folder extends BaseI18nLoop
             $loopResultRow = new LoopResultRow($loopResult, $folder, $this->versionable, $this->timestampable, $this->countable);
 
             $loopResultRow
-            	->set("ID", $folder->getId())
+                ->set("ID", $folder->getId())
                 ->set("IS_TRANSLATED",$folder->getVirtualColumn('IS_TRANSLATED'))
                 ->set("LOCALE",$locale)
                 ->set("TITLE",$folder->getVirtualColumn('i18n_TITLE'))
                 ->set("CHAPO", $folder->getVirtualColumn('i18n_CHAPO'))
                 ->set("DESCRIPTION", $folder->getVirtualColumn('i18n_DESCRIPTION'))
                 ->set("POSTSCRIPTUM", $folder->getVirtualColumn('i18n_POSTSCRIPTUM'))
-	            ->set("PARENT", $folder->getParent())
+                ->set("PARENT", $folder->getParent())
                 ->set("URL", $folder->getUrl($locale))
-	            ->set("CONTENT_COUNT", $folder->countChild())
-	            ->set("VISIBLE", $folder->getVisible() ? "1" : "0")
-	            ->set("POSITION", $folder->getPosition())
-			;
+                ->set("CONTENT_COUNT", $folder->countChild())
+                ->set("VISIBLE", $folder->getVisible() ? "1" : "0")
+                ->set("POSITION", $folder->getPosition())
+            ;
 
             $loopResult->addRow($loopResultRow);
         }
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Image.php b/core/lib/Thelia/Core/Template/Loop/Image.php
index 793b5c03e..c7714731b 100755
--- a/core/lib/Thelia/Core/Template/Loop/Image.php
+++ b/core/lib/Thelia/Core/Template/Loop/Image.php
@@ -25,8 +25,6 @@ namespace Thelia\Core\Template\Loop;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Core\Event\ImageEvent;
-use Thelia\Model\CategoryImageQuery;
-use Thelia\Model\ProductImageQuery;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Type\TypeCollection;
@@ -99,7 +97,7 @@ class Image extends BaseI18nLoop
         );
 
         // Add possible image sources
-        foreach($this->possible_sources as $source) {
+        foreach ($this->possible_sources as $source) {
             $collection->addArgument(Argument::createIntTypeArgument($source));
         }
 
@@ -109,12 +107,12 @@ class Image extends BaseI18nLoop
     /**
      * Dynamically create the search query, and set the proper filter and order
      *
-     * @param string $source a valid source identifier (@see $possible_sources)
-     * @param int $object_id the source object ID
+     * @param  string        $source    a valid source identifier (@see $possible_sources)
+     * @param  int           $object_id the source object ID
      * @return ModelCriteria the propel Query object
      */
-    protected function createSearchQuery($source, $object_id) {
-
+    protected function createSearchQuery($source, $object_id)
+    {
         $object = ucfirst($source);
 
         $queryClass   = sprintf("\Thelia\Model\%sImageQuery", $object);
@@ -159,12 +157,12 @@ class Image extends BaseI18nLoop
     /**
      * Dynamically create the search query, and set the proper filter and order
      *
-     * @param string $object_type (returned) the a valid source identifier (@see $possible_sources)
-     * @param string $object_id (returned) the ID of the source object
+     * @param  string        $object_type (returned) the a valid source identifier (@see $possible_sources)
+     * @param  string        $object_id   (returned) the ID of the source object
      * @return ModelCriteria the propel Query object
      */
-    protected function getSearchQuery(&$object_type, &$object_id) {
-
+    protected function getSearchQuery(&$object_type, &$object_id)
+    {
         $search = null;
 
         // Check form source="product" source_id="123" style arguments
@@ -184,10 +182,9 @@ class Image extends BaseI18nLoop
 
             $object_type = $source;
             $object_id   = $source_id;
-        }
-        else {
+        } else {
             // Check for product="id" folder="id", etc. style arguments
-            foreach($this->possible_sources as $source) {
+            foreach ($this->possible_sources as $source) {
 
                 $argValue = intval($this->getArgValue($source));
 
@@ -247,7 +244,7 @@ class Image extends BaseI18nLoop
             $effects = explode(',', $effects);
         }
 
-        switch($this->getResizeMode()) {
+        switch ($this->getResizeMode()) {
             case 'crop' :
                 $resize_mode = \Thelia\Action\Image::EXACT_RATIO_WITH_CROP;
                 break;
@@ -316,8 +313,7 @@ class Image extends BaseI18nLoop
                 ;
 
                 $loopResult->addRow($loopResultRow);
-            }
-            catch (\Exception $ex) {
+            } catch (\Exception $ex) {
                 // Ignore the result and log an error
                 Tlog::getInstance()->addError("Failed to process image in image loop: ", $this->args);
             }
@@ -325,4 +321,4 @@ class Image extends BaseI18nLoop
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Message.php b/core/lib/Thelia/Core/Template/Loop/Message.php
index ad6bd29aa..bea662572 100644
--- a/core/lib/Thelia/Core/Template/Loop/Message.php
+++ b/core/lib/Thelia/Core/Template/Loop/Message.php
@@ -30,7 +30,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\LangQuery;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Model\MessageQuery;
 use Thelia\Type\BooleanOrBothType;
diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index e7d1cf8a3..ed3324f13 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -31,12 +31,10 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CategoryQuery;
 use Thelia\Model\CountryQuery;
 use Thelia\Model\CurrencyQuery;
-use Thelia\Model\Map\FeatureProductTableMap;
 use Thelia\Model\Map\ProductPriceTableMap;
 use Thelia\Model\Map\ProductSaleElementsTableMap;
 use Thelia\Model\Map\ProductTableMap;
@@ -168,8 +166,8 @@ class Product extends BaseI18nLoop
 
             $depth = $this->getDepth();
 
-            if(null !== $depth) {
-                foreach(CategoryQuery::findAllChild($category, $depth) as $subCategory) {
+            if (null !== $depth) {
+                foreach (CategoryQuery::findAllChild($category, $depth) as $subCategory) {
                     $categories->prepend($subCategory);
                 }
             }
@@ -187,7 +185,7 @@ class Product extends BaseI18nLoop
             $search->joinProductSaleElements('is_new', Criteria::LEFT_JOIN)
                 ->where('`is_new`.NEWNESS' . Criteria::EQUAL . '1')
                 ->where('NOT ISNULL(`is_new`.ID)');
-        } else if($new === false) {
+        } elseif ($new === false) {
             $isPSELeftJoinList[] = 'is_new';
             $search->joinProductSaleElements('is_new', Criteria::LEFT_JOIN)
                 ->where('`is_new`.NEWNESS' . Criteria::EQUAL . '0')
@@ -201,7 +199,7 @@ class Product extends BaseI18nLoop
             $search->joinProductSaleElements('is_promo', Criteria::LEFT_JOIN)
                 ->where('`is_promo`.PROMO' . Criteria::EQUAL . '1')
                 ->where('NOT ISNULL(`is_promo`.ID)');
-        } else if($promo === false) {
+        } elseif ($promo === false) {
             $isPSELeftJoinList[] = 'is_promo';
             $search->joinProductSaleElements('is_promo', Criteria::LEFT_JOIN)
                 ->where('`is_promo`.PROMO' . Criteria::EQUAL . '0')
@@ -235,14 +233,14 @@ class Product extends BaseI18nLoop
                 ->where('NOT ISNULL(`is_max_weight`.ID)');
         }
 
-        if( $attributeNonStrictMatch != '*' ) {
-            if($attributeNonStrictMatch == 'none') {
+        if ($attributeNonStrictMatch != '*') {
+            if ($attributeNonStrictMatch == 'none') {
                 $actuallyUsedAttributeNonStrictMatchList = $isPSELeftJoinList;
             } else {
                 $actuallyUsedAttributeNonStrictMatchList = array_values(array_intersect($isPSELeftJoinList, $attributeNonStrictMatch));
             }
 
-            foreach($actuallyUsedAttributeNonStrictMatchList as $key => $actuallyUsedAttributeNonStrictMatch) {
+            foreach ($actuallyUsedAttributeNonStrictMatchList as $key => $actuallyUsedAttributeNonStrictMatch) {
                 if($key == 0)
                     continue;
                 $search->where('`' . $actuallyUsedAttributeNonStrictMatch . '`.ID=' . '`' . $actuallyUsedAttributeNonStrictMatchList[$key-1] . '`.ID');
@@ -251,9 +249,9 @@ class Product extends BaseI18nLoop
 
         $min_price = $this->getMin_price();
 
-        if(null !== $min_price) {
+        if (null !== $min_price) {
 
-            if(false === ConfigQuery::useTaxFreeAmounts()) {
+            if (false === ConfigQuery::useTaxFreeAmounts()) {
                 // @todo
             }
 
@@ -268,7 +266,7 @@ class Product extends BaseI18nLoop
                 ->addJoinObject($minPriceJoin, 'is_min_price_join')
                 ->addJoinCondition('is_min_price_join', '`min_price_data`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
 
-            if($defaultCurrency->getId() != $currency->getId()) {
+            if ($defaultCurrency->getId() != $currency->getId()) {
                 $minPriceJoinDefaultCurrency = new Join();
                 $minPriceJoinDefaultCurrency->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_min_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'min_price_data' . $defaultCurrencySuffix);
                 $minPriceJoinDefaultCurrency->setJoinType(Criteria::LEFT_JOIN);
@@ -294,7 +292,7 @@ class Product extends BaseI18nLoop
 
         $max_price = $this->getMax_price();
 
-        if(null !== $max_price) {
+        if (null !== $max_price) {
             $isPSELeftJoinList[] = 'is_max_price';
             $isProductPriceFirstLeftJoin = array('is_max_price', 'max_price_data');
 
@@ -306,7 +304,7 @@ class Product extends BaseI18nLoop
                 ->addJoinObject($maxPriceJoin, 'is_max_price_join')
                 ->addJoinCondition('is_max_price_join', '`max_price_data`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
 
-            if($defaultCurrency->getId() != $currency->getId()) {
+            if ($defaultCurrency->getId() != $currency->getId()) {
                 $maxPriceJoinDefaultCurrency = new Join();
                 $maxPriceJoinDefaultCurrency->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', 'is_max_price', ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'max_price_data' . $defaultCurrencySuffix);
                 $maxPriceJoinDefaultCurrency->setJoinType(Criteria::LEFT_JOIN);
@@ -338,8 +336,8 @@ class Product extends BaseI18nLoop
          */
 
         /* if we don't have any join yet, let's make a global one */
-        if(empty($isProductPriceFirstLeftJoin)) {
-            if(count($isPSELeftJoinList) == 0) {
+        if (empty($isProductPriceFirstLeftJoin)) {
+            if (count($isPSELeftJoinList) == 0) {
                 $joiningTable = "global";
                 $isPSELeftJoinList[] = $joiningTable;
                 $search->joinProductSaleElements('global', Criteria::LEFT_JOIN);
@@ -356,7 +354,7 @@ class Product extends BaseI18nLoop
             $search->addJoinObject($globalPriceJoin, 'global_price_join')
                 ->addJoinCondition('global_price_join', '`global_price_data`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
 
-            if($defaultCurrency->getId() != $currency->getId()) {
+            if ($defaultCurrency->getId() != $currency->getId()) {
                 $globalPriceJoinDefaultCurrency = new Join();
                 $globalPriceJoinDefaultCurrency->addExplicitCondition(ProductSaleElementsTableMap::TABLE_NAME, 'ID', $joiningTable, ProductPriceTableMap::TABLE_NAME, 'PRODUCT_SALE_ELEMENTS_ID', 'global_price_data' . $defaultCurrencySuffix);
                 $globalPriceJoinDefaultCurrency->setJoinType(Criteria::LEFT_JOIN);
@@ -381,7 +379,7 @@ class Product extends BaseI18nLoop
          */
         $booleanMatchedPromoList = array();
         $booleanMatchedNewnessList = array();
-        foreach($isPSELeftJoinList as $isPSELeftJoin) {
+        foreach ($isPSELeftJoinList as $isPSELeftJoin) {
             $booleanMatchedPromoList[] = '`' . $isPSELeftJoin . '`.PROMO';
             $booleanMatchedNewnessList[] = '`' . $isPSELeftJoin . '`.NEWNESS';
         }
@@ -391,7 +389,7 @@ class Product extends BaseI18nLoop
         $booleanMatchedPrice = 'CASE WHEN `' . $isProductPriceFirstLeftJoin[0] . '`.PROMO=1 THEN `' . $isProductPriceFirstLeftJoin[1] . '`.PROMO_PRICE ELSE `' . $isProductPriceFirstLeftJoin[1] . '`.PRICE END';
         $booleanMatchedPriceDefaultCurrency = 'CASE WHEN `' . $isProductPriceFirstLeftJoin[0] . '`.PROMO=1 THEN `' . $isProductPriceFirstLeftJoin[1] . $defaultCurrencySuffix . '`.PROMO_PRICE ELSE `' . $isProductPriceFirstLeftJoin[1] . $defaultCurrencySuffix . '`.PRICE END';
 
-        if($defaultCurrency->getId() != $currency->getId()) {
+        if ($defaultCurrency->getId() != $currency->getId()) {
             /**
              * In propel we trust : $currency->getRate() always returns a float.
              * Or maybe not : rate value is checked as a float in overloaded getRate method.
@@ -408,7 +406,7 @@ class Product extends BaseI18nLoop
 
         if ($current === true) {
             $search->filterById($this->request->get("product_id"));
-        } elseif($current === false) {
+        } elseif ($current === false) {
             $search->filterById($this->request->get("product_id"), Criteria::NOT_IN);
         }
 
@@ -425,7 +423,7 @@ class Product extends BaseI18nLoop
                 )->find(),
                 Criteria::IN
             );
-        } elseif($current_category === false) {
+        } elseif ($current_category === false) {
             $search->filterByCategory(
                 CategoryQuery::create()->filterByProduct(
                     ProductCategoryQuery::create()->filterByProductId(
@@ -459,9 +457,9 @@ class Product extends BaseI18nLoop
 
         $feature_availability = $this->getFeature_availability();
 
-        if(null !== $feature_availability) {
-            foreach($feature_availability as $feature => $feature_choice) {
-                foreach($feature_choice['values'] as $feature_av) {
+        if (null !== $feature_availability) {
+            foreach ($feature_availability as $feature => $feature_choice) {
+                foreach ($feature_choice['values'] as $feature_av) {
                     $featureAlias = 'fa_' . $feature;
                     if($feature_av != '*')
                         $featureAlias .= '_' . $feature_av;
@@ -473,7 +471,7 @@ class Product extends BaseI18nLoop
 
                 /* format for mysql */
                 $sqlWhereString = $feature_choice['expression'];
-                if($sqlWhereString == '*') {
+                if ($sqlWhereString == '*') {
                     $sqlWhereString = 'NOT ISNULL(`fa_' . $feature . '`.ID)';
                 } else {
                     $sqlWhereString = preg_replace('#([0-9]+)#', 'NOT ISNULL(`fa_' . $feature . '_' . '\1`.ID)', $sqlWhereString);
@@ -487,9 +485,9 @@ class Product extends BaseI18nLoop
 
         $feature_values = $this->getFeature_values();
 
-        if(null !== $feature_values) {
-            foreach($feature_values as $feature => $feature_choice) {
-                foreach($feature_choice['values'] as $feature_value) {
+        if (null !== $feature_values) {
+            foreach ($feature_values as $feature => $feature_choice) {
+                foreach ($feature_choice['values'] as $feature_value) {
                     $featureAlias = 'fv_' . $feature;
                     if($feature_value != '*')
                         $featureAlias .= '_' . $feature_value;
@@ -501,7 +499,7 @@ class Product extends BaseI18nLoop
 
                 /* format for mysql */
                 $sqlWhereString = $feature_choice['expression'];
-                if($sqlWhereString == '*') {
+                if ($sqlWhereString == '*') {
                     $sqlWhereString = 'NOT ISNULL(`fv_' . $feature . '`.ID)';
                 } else {
                     $sqlWhereString = preg_replace('#([a-zA-Z0-9_\-]+)#', 'NOT ISNULL(`fv_' . $feature . '_' . '\1`.ID)', $sqlWhereString);
@@ -517,7 +515,7 @@ class Product extends BaseI18nLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn('i18n_TITLE');
@@ -553,7 +551,7 @@ class Product extends BaseI18nLoop
                 case "given_id":
                     if(null === $id)
                         throw new \InvalidArgumentException('Given_id order cannot be set without `id` argument');
-                    foreach($id as $singleId) {
+                    foreach ($id as $singleId) {
                         $givenIdMatched = 'given_id_matched_' . $singleId;
                         $search->withColumn(ProductTableMap::ID . "='$singleId'", $givenIdMatched);
                         $search->orderBy($givenIdMatched, Criteria::DESC);
diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index 38d4d2e94..414cc9b65 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -24,17 +24,14 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\ProductSaleElementsQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Model\CountryQuery;
 use Thelia\Model\CurrencyQuery;
 use Thelia\Type\TypeCollection;
@@ -53,7 +50,7 @@ use Thelia\Type;
 class ProductSaleElements extends BaseLoop
 {
     public $timestampable = true;
-    
+
     /**
      * @return ArgumentCollection
      */
@@ -93,7 +90,7 @@ class ProductSaleElements extends BaseLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "min_price":
                     $search->addAscendingOrderByColumn('real_lowest_price', Criteria::ASC);
@@ -115,9 +112,9 @@ class ProductSaleElements extends BaseLoop
         }
 
         $currencyId = $this->getCurrency();
-        if(null !== $currency) {
+        if (null !== $currency) {
             $currency = CurrencyQuery::create()->findOneById($currencyId);
-            if(null === $currency) {
+            if (null === $currency) {
                 throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop');
             }
         } else {
@@ -169,4 +166,4 @@ class ProductSaleElements extends BaseLoop
 
         return $loopResult;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Title.php b/core/lib/Thelia/Core/Template/Loop/Title.php
index 4243f83f1..3cd59d665 100755
--- a/core/lib/Thelia/Core/Template/Loop/Title.php
+++ b/core/lib/Thelia/Core/Template/Loop/Title.php
@@ -32,7 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
 use Thelia\Model\CustomerTitleQuery;
-use Thelia\Model\ConfigQuery;
 
 /**
  *
diff --git a/core/lib/Thelia/Core/Template/ParserContext.php b/core/lib/Thelia/Core/Template/ParserContext.php
index 90079abf5..9e3fde416 100755
--- a/core/lib/Thelia/Core/Template/ParserContext.php
+++ b/core/lib/Thelia/Core/Template/ParserContext.php
@@ -25,7 +25,6 @@ namespace Thelia\Core\Template;
 
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\HttpFoundation\Request;
-use Thelia\Tools\URL;
 use Thelia\Form\BaseForm;
 /**
  * The parser context is an application-wide context, which stores var-value pairs.
diff --git a/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php b/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
index f19eded95..7ad557256 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
@@ -39,9 +39,9 @@ class SmartyAssetsManager
     /**
      * Creates a new SmartyAssetsManager instance
      *
-     * @param string    $web_root                    the disk path to the web root
-     * @param string    $path_relative_to_web_root   the path (relative to web root) where the assets will be generated
-     * @param  boolean  $developmentMode             true / false. If true, assets are not cached, and always generated.
+     * @param string  $web_root                  the disk path to the web root
+     * @param string  $path_relative_to_web_root the path (relative to web root) where the assets will be generated
+     * @param boolean $developmentMode           true / false. If true, assets are not cached, and always generated.
      */
     public function __construct($web_root, $path_relative_to_web_root, $developmentMode)
     {
diff --git a/core/lib/Thelia/Core/Template/Smarty/Exception/SmartyPluginException.php b/core/lib/Thelia/Core/Template/Smarty/Exception/SmartyPluginException.php
index fdaf93608..77efa2d17 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Exception/SmartyPluginException.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Exception/SmartyPluginException.php
@@ -23,11 +23,10 @@
 
 namespace Thelia\Core\Template\Smarty\Exception;
 
-
 /**
  * Class SmartyPluginException
  * @package Thelia\Core\Template\Smarty\Exception
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
 class SmartyPluginException extends \SmartyException
-{}
\ No newline at end of file
+{}
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
index bb9770520..5608fc168 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
@@ -26,7 +26,6 @@ namespace Thelia\Core\Template\Smarty\Plugins;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
 use Thelia\Tools\URL;
-use Thelia\Core\HttpFoundation\Request;
 use Thelia\Core\Security\SecurityContext;
 
 /**
@@ -43,7 +42,8 @@ class AdminUtilities extends AbstractSmartyPlugin
         $this->securityContext = $securityContext;
     }
 
-    public function generatePositionChangeBlock($params, &$smarty) {
+    public function generatePositionChangeBlock($params, &$smarty)
+    {
         // The required permissions
         $permission = $this->getParam($params, 'permission');
 
@@ -77,13 +77,11 @@ class AdminUtilities extends AbstractSmartyPlugin
                 $position,
                 URL::getInstance()->absoluteUrl($path, array('mode' => 'down', $url_parameter => $id))
             );
-        }
-        else {
+        } else {
             return $position;
         }
     }
 
-
     /**
      * Generates the link of a sortable column header
      *
@@ -111,12 +109,10 @@ class AdminUtilities extends AbstractSmartyPlugin
         if ($current_order == $order) {
             $icon = 'up';
             $order_change = $reverse_order;
-        }
-        else if ($current_order == $reverse_order) {
+        } elseif ($current_order == $reverse_order) {
             $icon = 'down';
             $order_change = $order;
-        }
-        else {
+        } else {
             $order_change = $order;
         }
 
@@ -128,7 +124,6 @@ class AdminUtilities extends AbstractSmartyPlugin
         return sprintf('%s<a href="%s">%s</a>', $output, URL::getInstance()->absoluteUrl($path, array('order' => $order_change)), $label);
     }
 
-
     /**
      * Define the various smarty plugins handled by this class
      *
@@ -141,4 +136,4 @@ class AdminUtilities extends AbstractSmartyPlugin
                 new SmartyPluginDescriptor('function', 'admin_position_block' , $this, 'generatePositionChangeBlock'),
         );
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
index fded12c0e..6f83bdcfd 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
@@ -85,7 +85,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     {
         $productId = $this->request->get('product_id');
 
-        if($productId !== null) {
+        if ($productId !== null) {
 
             $search = ProductQuery::create()
                 ->filterById($productId);
@@ -98,7 +98,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     {
         $categoryId = $this->request->get('category_id');
 
-        if($categoryId !== null) {
+        if ($categoryId !== null) {
 
             $search = CategoryQuery::create()
                 ->filterById($categoryId);
@@ -111,7 +111,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     {
         $contentId = $this->request->get('content_id');
 
-        if($contentId !== null) {
+        if ($contentId !== null) {
 
             $search = ContentQuery::create()
                 ->filterById($contentId);
@@ -124,7 +124,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     {
         $folderId = $this->request->get('folder_id');
 
-        if($folderId !== null) {
+        if ($folderId !== null) {
 
             $search = FolderQuery::create()
                 ->filterById($folderId);
@@ -175,7 +175,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     protected function dataAccessWithI18n($objectLabel, $params, ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID')
     {
         $lang = $this->getNormalizedParam($params, array('lang'));
-        if($lang === null) {
+        if ($lang === null) {
             $lang = $this->request->getSession()->getLang()->getId();
         }
 
@@ -193,7 +193,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
         $data = $search->findOne();
 
         $noGetterData = array();
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             $noGetterData[$column] = $data->getVirtualColumn('i18n_' . $column);
         }
 
@@ -218,7 +218,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
             if (null != $data) {
 
                 $keyAttribute = strtoupper($attribute);
-                if(array_key_exists($keyAttribute, $noGetterData)) {
+                if (array_key_exists($keyAttribute, $noGetterData)) {
                     return $noGetterData[$keyAttribute];
                 }
 
@@ -226,7 +226,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
                 if (method_exists($data, $getter)) {
                     $return =  $data->$getter();
 
-                    if($return instanceof \DateTime) {
+                    if ($return instanceof \DateTime) {
                         if (array_key_exists("format", $params)) {
                             $format = $params["format"];
                         } else {
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
index 625c89e1f..9ae840019 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
@@ -107,8 +107,7 @@ class Form extends AbstractSmartyPlugin
 
             $template->assign("form_error", $instance->hasError() ? true : false);
             $template->assign("form_error_message", $instance->getErrorMessage());
-        }
-        else {
+        } else {
             return $content;
         }
     }
@@ -201,7 +200,6 @@ class Form extends AbstractSmartyPlugin
         }
     }
 
-
     protected function assignFieldErrorVars(\Smarty_Internal_Template $template, array $errors)
     {
         $template->assign("message", $errors[0]->getMessage());
@@ -223,7 +221,6 @@ class Form extends AbstractSmartyPlugin
         if (null == $fieldName)
             throw new \InvalidArgumentException("'field' parameter is missing");
 
-
         if (empty($instance->getView()[$fieldName]))
             throw new \InvalidArgumentException(sprintf("Field name '%s' not found in form %s", $fieldName, $instance->getName()));
 
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
index 3deffc1aa..536eb2a4e 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
@@ -62,8 +62,8 @@ class Format extends AbstractSmartyPlugin
      *  {format_date date=$dateTimeObject output="date"} will output the date using the default date system format
      *  {format_date date=$dateTimeObject} will output with the default datetime system format
      *
-     * @param array $params
-     * @param null $template
+     * @param  array                                                        $params
+     * @param  null                                                         $template
      * @throws \Thelia\Core\Template\Smarty\Exception\SmartyPluginException
      * @return string
      */
@@ -76,7 +76,7 @@ class Format extends AbstractSmartyPlugin
 
         $date = $params["date"];
 
-        if(!$date instanceof \DateTime) {
+        if (!$date instanceof \DateTime) {
             return "";
         }
 
@@ -103,9 +103,9 @@ class Format extends AbstractSmartyPlugin
      *  ex : {format_number number="1246.12" decimals="1" dec_point="," thousands_sep=" "} will output "1 246,1"
      *
      * @param $params
-     * @param null $template
+     * @param  null                                                         $template
      * @throws \Thelia\Core\Template\Smarty\Exception\SmartyPluginException
-     * @return string the expected number formatted
+     * @return string                                                       the expected number formatted
      */
     public function formatNumber($params, $template = null)
     {
@@ -115,13 +115,12 @@ class Format extends AbstractSmartyPlugin
 
         $number = $params["number"];
 
-        if(empty($number)) {
+        if (empty($number)) {
             return "";
         }
 
         $lang = $this->request->getSession()->getLang();
 
-
         $decimals = array_key_exists("decimals", $params) ? $params["decimals"] : $lang->getDecimals();
         $decPoint = array_key_exists("dec_point", $params) ? $params["dec_point"] : $lang->getDecimalSeparator();
         $thousandsSep = array_key_exists("thousands_sep", $params) ? $params["thousands_sep"] : $lang->getThousandsSeparator();
@@ -139,4 +138,4 @@ class Format extends AbstractSmartyPlugin
             new SmartyPluginDescriptor("function", "format_number", $this, "formatNumber")
         );
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
index 2c7601dc4..6ed09fe2b 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
@@ -32,7 +32,6 @@ use Thelia\Core\Template\Element\Exception\ElementNotFoundException;
 use Thelia\Core\Template\Element\Exception\InvalidElementException;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Thelia\Core\Security\SecurityContext;
 
 class TheliaLoop extends AbstractSmartyPlugin
@@ -70,7 +69,7 @@ class TheliaLoop extends AbstractSmartyPlugin
      */
     public static function getPagination($loopId)
     {
-        if(!empty(self::$pagination[$loopId])) {
+        if (!empty(self::$pagination[$loopId])) {
             return self::$pagination[$loopId];
         } else {
             return null;
@@ -84,7 +83,7 @@ class TheliaLoop extends AbstractSmartyPlugin
     {
         $type = $this->getParam($params, 'type');
 
-    	if (null == $type) {
+        if (null == $type) {
             throw new \InvalidArgumentException("Missing 'type' parameter in count arguments");
         }
 
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
index f6c20ecfb..905c5bb5b 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
@@ -54,7 +54,6 @@ class UrlGenerator extends AbstractSmartyPlugin
         $url = URL::getInstance()->absoluteUrl($path, $this->getArgsFromParam($params, array('path', 'target')));
 
         if ($target != null) $url .= '#'.$target;
-
         return $url;
      }
 
@@ -154,13 +153,13 @@ class UrlGenerator extends AbstractSmartyPlugin
 
     protected function getNavigateToMethod($to)
     {
-        if($to === null) {
+        if ($to === null) {
             throw new \InvalidArgumentException("Missing 'to' parameter in `navigate` substitution.");
         }
 
         $navigateToValues = $this->getNavigateToValues();
 
-        if(!array_key_exists($to, $navigateToValues)) {
+        if (!array_key_exists($to, $navigateToValues)) {
             throw new \InvalidArgumentException("Incorrect value for parameter `to` in `navigate` substitution.");
         }
 
diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index f0b207425..d76dd8dfa 100755
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -65,7 +65,7 @@ class SmartyParser extends Smarty implements ParserInterface
         $this->setTemplate($template ?: ConfigQuery::read('active-template', 'default'));
 
         $this->debugging = $debug;
-        
+
         // Prevent smarty ErrorException: Notice: Undefined index bla bla bla...
         $this->error_reporting = E_ALL ^ E_NOTICE;
 
@@ -93,7 +93,7 @@ class SmartyParser extends Smarty implements ParserInterface
 
     public static function theliaEscape($content, $smarty)
     {
-        if(is_scalar($content)) {
+        if (is_scalar($content)) {
             return htmlspecialchars($content ,ENT_QUOTES, Smarty::$_CHARSET);
         } else {
             return $content;
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 29290dd7e..9aedaaa29 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -37,13 +37,11 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Validator\Tests\Fixtures\Reference;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 use Thelia\Core\Bundle;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Log\Tlog;
 use Thelia\Config\DatabaseConfiguration;
 use Thelia\Config\DefinePropel;
 use Thelia\Core\TheliaContainerBuilder;
diff --git a/core/lib/Thelia/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php
index 319173f5f..cf1d35195 100755
--- a/core/lib/Thelia/Core/TheliaHttpKernel.php
+++ b/core/lib/Thelia/Core/TheliaHttpKernel.php
@@ -150,7 +150,7 @@ class TheliaHttpKernel extends HttpKernel
             $currency = $request->getSession()->getCurrency(false);
         }
 
-        if(null === $currency) {
+        if (null === $currency) {
             $currency = Model\Currency::getDefaultCurrency();
         }
 
diff --git a/core/lib/Thelia/Core/Translation/Translator.php b/core/lib/Thelia/Core/Translation/Translator.php
index 770091403..22dc47afd 100755
--- a/core/lib/Thelia/Core/Translation/Translator.php
+++ b/core/lib/Thelia/Core/Translation/Translator.php
@@ -19,12 +19,12 @@ class Translator extends BaseTranslator
     /**
      * Return this class instance, only once instanciated.
      *
-     * @throws \RuntimeException if the class has not been instanciated.
+     * @throws \RuntimeException                   if the class has not been instanciated.
      * @return \Thelia\Core\Translation\Translator the instance.
      */
-    public static function getInstance() {
+    public static function getInstance()
+    {
         if (self::$instance == null) throw new \RuntimeException("Translator instance is not initialized.");
-
         return self::$instance;
     }
 
diff --git a/core/lib/Thelia/Exception/ImageException.php b/core/lib/Thelia/Exception/ImageException.php
index 60774dabf..948ee07f0 100755
--- a/core/lib/Thelia/Exception/ImageException.php
+++ b/core/lib/Thelia/Exception/ImageException.php
@@ -27,8 +27,8 @@ use Thelia\Log\Tlog;
 
 class ImageException extends \RuntimeException
 {
-    public function __construct($message, $code = null, $previous = null) {
-
+    public function __construct($message, $code = null, $previous = null)
+    {
         Tlog::getInstance()->addError($message);
 
         parent::__construct($message, $code, $previous);
diff --git a/core/lib/Thelia/Exception/MissingAdapterException.php b/core/lib/Thelia/Exception/MissingAdapterException.php
index 645020cab..3659dcc68 100644
--- a/core/lib/Thelia/Exception/MissingAdapterException.php
+++ b/core/lib/Thelia/Exception/MissingAdapterException.php
@@ -41,8 +41,8 @@ class MissingAdapterException extends \RuntimeException
     /**
      * {@inheritdoc}
      */
-    public function __construct($message, $code = null, $previous = null) {
-
+    public function __construct($message, $code = null, $previous = null)
+    {
         Tlog::getInstance()->addError($message);
 
         parent::__construct($message, $code, $previous);
diff --git a/core/lib/Thelia/Exception/NotImplementedException.php b/core/lib/Thelia/Exception/NotImplementedException.php
index 991f4d325..1240ea82b 100644
--- a/core/lib/Thelia/Exception/NotImplementedException.php
+++ b/core/lib/Thelia/Exception/NotImplementedException.php
@@ -24,7 +24,6 @@
 namespace Thelia\Exception;
 
 use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
-use Thelia\Log\Tlog;
 
 /**
  * Created by JetBrains PhpStorm.
diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php
index 2a2718d4b..d56862ab6 100755
--- a/core/lib/Thelia/Exception/TaxEngineException.php
+++ b/core/lib/Thelia/Exception/TaxEngineException.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Exception;
 
-use Thelia\Log\Tlog;
-
 class TaxEngineException extends \RuntimeException
 {
     const UNKNOWN_EXCEPTION = 0;
@@ -35,8 +33,9 @@ class TaxEngineException extends \RuntimeException
 
     const BAD_AMOUNT_FORMAT = 601;
 
-    public function __construct($message, $code = null, $previous = null) {
-        if($code === null) {
+    public function __construct($message, $code = null, $previous = null)
+    {
+        if ($code === null) {
             $code = self::UNKNOWN_EXCEPTION;
         }
         parent::__construct($message, $code, $previous);
diff --git a/core/lib/Thelia/Exception/UrlRewritingException.php b/core/lib/Thelia/Exception/UrlRewritingException.php
index 0df566a6b..6f789230b 100755
--- a/core/lib/Thelia/Exception/UrlRewritingException.php
+++ b/core/lib/Thelia/Exception/UrlRewritingException.php
@@ -23,8 +23,6 @@
 
 namespace Thelia\Exception;
 
-use Thelia\Log\Tlog;
-
 class UrlRewritingException extends \Exception
 {
     const UNKNOWN_EXCEPTION = 0;
@@ -33,8 +31,9 @@ class UrlRewritingException extends \Exception
 
     const RESOLVER_NULL_SEARCH = 800;
 
-    public function __construct($message, $code = null, $previous = null) {
-        if($code === null) {
+    public function __construct($message, $code = null, $previous = null)
+    {
+        if ($code === null) {
             $code = self::UNKNOWN_EXCEPTION;
         }
         parent::__construct($message, $code, $previous);
diff --git a/core/lib/Thelia/Form/AddressCreateForm.php b/core/lib/Thelia/Form/AddressCreateForm.php
index 3f953fe38..472a7429c 100644
--- a/core/lib/Thelia/Form/AddressCreateForm.php
+++ b/core/lib/Thelia/Form/AddressCreateForm.php
@@ -24,7 +24,6 @@
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
-
 /**
  * Class AddressCreateForm
  * @package Thelia\Form
@@ -130,4 +129,4 @@ class AddressCreateForm extends BaseForm
     {
         return "thelia_address_creation";
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Form/AddressUpdateForm.php b/core/lib/Thelia/Form/AddressUpdateForm.php
index aa969831b..556841261 100644
--- a/core/lib/Thelia/Form/AddressUpdateForm.php
+++ b/core/lib/Thelia/Form/AddressUpdateForm.php
@@ -24,14 +24,13 @@
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
-
 /**
  * Class AddressUpdateForm
  * @package Thelia\Form
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class AddressUpdateForm extends AddressCreateForm {
-
+class AddressUpdateForm extends AddressCreateForm
+{
     /**
      *
      * in this function you add all the fields you need for your Form.
@@ -56,7 +55,6 @@ class AddressUpdateForm extends AddressCreateForm {
     {
         parent::buildForm();
 
-
     }
 
     /**
@@ -66,4 +64,4 @@ class AddressUpdateForm extends AddressCreateForm {
     {
         return "thelia_address_update";
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Form/CategoryModificationForm.php b/core/lib/Thelia/Form/CategoryModificationForm.php
index a27389324..d9de36d16 100644
--- a/core/lib/Thelia/Form/CategoryModificationForm.php
+++ b/core/lib/Thelia/Form/CategoryModificationForm.php
@@ -22,9 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 use Thelia\Core\Translation\Translator;
 
@@ -52,4 +49,4 @@ class CategoryModificationForm extends CategoryCreationForm
     {
         return "thelia_category_modification";
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Form/ConfigCreationForm.php b/core/lib/Thelia/Form/ConfigCreationForm.php
index b2a0c11bb..e52f44c29 100644
--- a/core/lib/Thelia/Form/ConfigCreationForm.php
+++ b/core/lib/Thelia/Form/ConfigCreationForm.php
@@ -60,7 +60,7 @@ class ConfigCreationForm extends BaseForm
                     new Constraints\NotBlank()
                 )
             ))
-            ->add("value", "text", array(                
+            ->add("value", "text", array(
                 "label" => "Value *",
                 "label_attr" => array(
                     "for" => "value"
diff --git a/core/lib/Thelia/Form/ConfigModificationForm.php b/core/lib/Thelia/Form/ConfigModificationForm.php
index ce508137f..257af38c5 100644
--- a/core/lib/Thelia/Form/ConfigModificationForm.php
+++ b/core/lib/Thelia/Form/ConfigModificationForm.php
@@ -23,8 +23,6 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
 class ConfigModificationForm extends BaseForm
diff --git a/core/lib/Thelia/Form/CouponCreationForm.php b/core/lib/Thelia/Form/CouponCreationForm.php
index 4761bb28f..d63a4284d 100755
--- a/core/lib/Thelia/Form/CouponCreationForm.php
+++ b/core/lib/Thelia/Form/CouponCreationForm.php
@@ -139,7 +139,7 @@ class CouponCreationForm extends BaseForm
             )
             ->add(
                 'locale',
-                'hidden', 
+                'hidden',
                 array(
                     'constraints' => array(
                         new NotBlank()
diff --git a/core/lib/Thelia/Form/CurrencyModificationForm.php b/core/lib/Thelia/Form/CurrencyModificationForm.php
index 3f0b1f152..c56791e3d 100644
--- a/core/lib/Thelia/Form/CurrencyModificationForm.php
+++ b/core/lib/Thelia/Form/CurrencyModificationForm.php
@@ -22,9 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
 class CurrencyModificationForm extends CurrencyCreationForm
@@ -42,4 +39,4 @@ class CurrencyModificationForm extends CurrencyCreationForm
     {
         return "thelia_currency_modification";
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Form/CustomerLogin.php b/core/lib/Thelia/Form/CustomerLogin.php
index 3081ceed7..63dc186aa 100755
--- a/core/lib/Thelia/Form/CustomerLogin.php
+++ b/core/lib/Thelia/Form/CustomerLogin.php
@@ -22,12 +22,9 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Email;
-use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Core\Translation\Translator;
-use Thelia\Model\CustomerQuery;
 
 class CustomerLogin extends BaseForm
 {
diff --git a/core/lib/Thelia/Form/MessageModificationForm.php b/core/lib/Thelia/Form/MessageModificationForm.php
index a23f66e28..c8f20448d 100644
--- a/core/lib/Thelia/Form/MessageModificationForm.php
+++ b/core/lib/Thelia/Form/MessageModificationForm.php
@@ -23,8 +23,6 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Thelia\Model\LangQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
 class MessageModificationForm extends BaseForm
@@ -41,7 +39,7 @@ class MessageModificationForm extends BaseForm
                 )
             ))
             ->add("secured"      , "text"  , array(
-                "label" => "Prevent mailing template modification or deletion, except for super-admin"                
+                "label" => "Prevent mailing template modification or deletion, except for super-admin"
             ))
             ->add("locale"       , "text"  , array())
             ->add("title"        , "text"  , array(
diff --git a/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php b/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php
index 7c0a51a31..9d1851252 100644
--- a/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php
+++ b/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php
@@ -89,4 +89,4 @@ trait StandardDescriptionFieldsTrait
                     )
                 ));
      }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php
index 145da3c02..9d76e08f3 100755
--- a/core/lib/Thelia/Module/BaseModule.php
+++ b/core/lib/Thelia/Module/BaseModule.php
@@ -46,9 +46,10 @@ abstract class BaseModule extends ContainerAware
 
     public function getContainer()
     {
-        if($this->hasContainer() === false) {
+        if ($this->hasContainer() === false) {
             throw new \RuntimeException("Sorry, container his not available in this context");
         }
+
         return $this->container;
     }
 
diff --git a/core/lib/Thelia/Module/BaseModuleInterface.php b/core/lib/Thelia/Module/BaseModuleInterface.php
index 2db450830..5cfd98409 100644
--- a/core/lib/Thelia/Module/BaseModuleInterface.php
+++ b/core/lib/Thelia/Module/BaseModuleInterface.php
@@ -23,15 +23,14 @@
 
 namespace Thelia\Module;
 
-
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-interface BaseModuleInterface {
-
+interface BaseModuleInterface
+{
     public function setRequest(Request $request);
     public function getRequest();
 
     public function setDispatcher(EventDispatcherInterface $dispatcher);
     public function getDispatcher();
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Module/DeliveryModuleInterface.php b/core/lib/Thelia/Module/DeliveryModuleInterface.php
index b8ffcfc01..ba218ac4d 100644
--- a/core/lib/Thelia/Module/DeliveryModuleInterface.php
+++ b/core/lib/Thelia/Module/DeliveryModuleInterface.php
@@ -23,9 +23,8 @@
 
 namespace Thelia\Module;
 
-
-interface DeliveryModuleInterface extends BaseModuleInterface {
-
+interface DeliveryModuleInterface extends BaseModuleInterface
+{
     /**
      *
      * calculate and return delivery price
@@ -33,4 +32,4 @@ interface DeliveryModuleInterface extends BaseModuleInterface {
      * @return mixed
      */
     public function calculate($country = null);
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tests/Action/AddressTest.php b/core/lib/Thelia/Tests/Action/AddressTest.php
index 68fc97923..69f5b5329 100644
--- a/core/lib/Thelia/Tests/Action/AddressTest.php
+++ b/core/lib/Thelia/Tests/Action/AddressTest.php
@@ -26,7 +26,6 @@ use Thelia\Action\Address;
 use Thelia\Core\Event\AddressCreateOrUpdateEvent;
 use Thelia\Model\Base\CustomerQuery;
 
-
 /**
  *
  * test address eventListener
@@ -120,7 +119,6 @@ class AddressTest extends \PHPUnit_Framework_TestCase
         $actionAddress = new Address($this->getContainer());
         $actionAddress->update($addressEvent);
 
-
         $updatedAddress = $addressEvent->getAddress();
         $this->assertInstanceOf("Thelia\Model\Address", $updatedAddress);
         $this->assertFalse($updatedAddress->isNew());
@@ -142,4 +140,4 @@ class AddressTest extends \PHPUnit_Framework_TestCase
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tests/Action/ImageTest.php b/core/lib/Thelia/Tests/Action/ImageTest.php
index 8cc6e5644..f08da25b9 100755
--- a/core/lib/Thelia/Tests/Action/ImageTest.php
+++ b/core/lib/Thelia/Tests/Action/ImageTest.php
@@ -30,7 +30,6 @@ use Thelia\Core\HttpFoundation\Session\Session;
 use Thelia\Action\Image;
 use Thelia\Core\Event\ImageEvent;
 use Thelia\Model\ConfigQuery;
-use Thelia\Tools\URL;
 
 /**
  * Class ImageTest
@@ -78,7 +77,8 @@ class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
         }
     }
 
-    public static function setUpBeforeClass() {
+    public static function setUpBeforeClass()
+    {
         $dir = THELIA_WEB_DIR."/cache/tests";
         if ($dh = @opendir($dir)) {
             while ($file = readdir($dh)) {
@@ -91,7 +91,8 @@ class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
         }
     }
 
-    public function tearDown() {
+    public function tearDown()
+    {
         // restore cache configuration.
         $config = ConfigQuery::create()->filterByName('image_cache_dir_from_web_root')->findOne();
 
@@ -249,7 +250,6 @@ class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
          $image->processImage($event);
      }
 
-
      /**
       * Apply all transformations
       */
@@ -343,7 +343,8 @@ class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
          $image->processImage($event);
      }
 
-     public function testClearTestsCache() {
+     public function testClearTestsCache()
+     {
          $event = new ImageEvent($this->request);
 
          $event->setCacheSubdirectory('tests');
@@ -353,7 +354,8 @@ class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
          $image->clearCache($event);
      }
 
-     public function testClearWholeCache() {
+     public function testClearWholeCache()
+     {
          $event = new ImageEvent($this->request);
 
          $image = new Image($this->getContainer());
@@ -366,7 +368,8 @@ class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
       *
       * @expectedException \InvalidArgumentException
       */
-     public function testClearUnallowedPathCache() {
+     public function testClearUnallowedPathCache()
+     {
          $event = new ImageEvent($this->request);
 
          $event->setCacheSubdirectory('../../../..');
@@ -375,4 +378,4 @@ class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
 
          $image->clearCache($event);
      }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tests/Command/CacheClearTest.php b/core/lib/Thelia/Tests/Command/CacheClearTest.php
index 741fad299..00d54cb3b 100755
--- a/core/lib/Thelia/Tests/Command/CacheClearTest.php
+++ b/core/lib/Thelia/Tests/Command/CacheClearTest.php
@@ -97,8 +97,7 @@ class CacheClearTest extends \PHPUnit_Framework_TestCase
                 "command" => $command->getName(),
                 "--env" => "test"
             ));
-        }
-        else {
+        } else {
             throw new \RuntimeException("");
         }
     }
diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php
index 70d6e498c..ccc04fbfc 100644
--- a/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php
+++ b/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php
@@ -130,7 +130,6 @@ class ConstraintFactoryTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
-
     /**
      * Check the Rules serialization module
      */
@@ -180,8 +179,8 @@ class ConstraintFactoryTest extends \PHPUnit_Framework_TestCase
         $serializedRules = $constraintFactory->serializeCouponRuleCollection($rules);
         $unserializedRules = $constraintFactory->unserializeCouponRuleCollection($serializedRules);
 
-        $expected = (string)$rules;
-        $actual = (string)$unserializedRules;
+        $expected = (string) $rules;
+        $actual = (string) $unserializedRules;
 
         $this->assertEquals($expected, $actual);
     }
diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php
index 28ac4b952..01e9dde69 100644
--- a/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php
+++ b/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php
@@ -76,7 +76,6 @@ class ConstraintValidatorTest extends \PHPUnit_Framework_TestCase
             AvailableForTotalAmountManager::INPUT2 => 'EUR');
         $rule1->setValidatorsFromForm($operators, $values);
 
-
         $rules = new CouponRuleCollection();
         $rules->add($rule1);
 
@@ -111,7 +110,6 @@ class ConstraintValidatorTest extends \PHPUnit_Framework_TestCase
             AvailableForTotalAmountManager::INPUT2 => 'EUR');
         $rule1->setValidatorsFromForm($operators, $values);
 
-
         $rules = new CouponRuleCollection();
         $rules->add($rule1);
 
@@ -216,7 +214,6 @@ class ConstraintValidatorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual, 'Constraints validator always think Customer is matching rules');
     }
 
-
     public function testVariableOpComparisonSuccess()
     {
         $ConstraintValidator = new ConstraintValidator();
diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php
index bfcde8a21..4c6da4ad2 100644
--- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php
+++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php
@@ -151,7 +151,6 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase
 //        $this->assertEquals($expected, $actual);
 //    }
 
-
     /**
      * Check if test inferior operator is working
      *
@@ -512,7 +511,6 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
-
     /**
      * Check if test superior operator is working
      *
@@ -585,7 +583,6 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
-
     /**
      * Check currency is checked
      *
@@ -658,7 +655,6 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
-
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php
index cc5caee2a..76a744848 100644
--- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php
+++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php
@@ -177,10 +177,6 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase
 //        $this->assertEquals($expected, $actual);
 //    }
 
-
-
-
-
     /**
      * Check if test inferior operator is working
      *
@@ -501,7 +497,6 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
-
     /**
      * Check if test superior operator is working
      *
@@ -661,7 +656,6 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase
 //
 //    }
 
-
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
diff --git a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php
index c86e827b6..0b29baa62 100644
--- a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php
+++ b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php
@@ -416,8 +416,6 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase
 //        $this->assertFalse($actual);
 //    }
 
-
-
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
diff --git a/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php
index afb7b8c80..db281bcc5 100644
--- a/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php
+++ b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php
@@ -25,7 +25,6 @@ namespace Thelia\Coupon;
 
 use InvalidArgumentException;
 use Thelia\Constraint\Validator\CustomerParam;
-use Thelia\Constraint\Validator\PriceParam;
 use Thelia\Constraint\Validator\QuantityParam;
 use Thelia\Model\Customer;
 
diff --git a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php
index afcc62f6e..806cedf8d 100644
--- a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php
+++ b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php
@@ -24,7 +24,6 @@
 namespace Thelia\Coupon;
 
 use InvalidArgumentException;
-use Thelia\Constraint\Validator\PriceParam;
 use Thelia\Constraint\Validator\QuantityParam;
 
 /**
diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php
index 677117348..be03743d3 100644
--- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php
+++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php
@@ -24,7 +24,6 @@
 namespace Thelia\Coupon;
 
 use InvalidArgumentException;
-use Symfony\Component\Intl\Exception\NotImplementedException;
 use Thelia\Constraint\Validator\RepeatedDateParam;
 
 /**
diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php
index 513e85836..c5565a322 100644
--- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php
+++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php
@@ -23,7 +23,6 @@
 
 namespace Thelia\Coupon;
 
-use Symfony\Component\Intl\Exception\NotImplementedException;
 use Thelia\Constraint\Validator\RepeatedIntervalParam;
 
 /**
diff --git a/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php b/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php
index 177802078..3ecae7c01 100755
--- a/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php
+++ b/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php
@@ -68,7 +68,6 @@ class DefaultControllerTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($request->attributes->get('_view'), 'foo');
     }
 
-
     public function testNoActionWithAttribute()
     {
         $defaultController = new DefaultController();
diff --git a/core/lib/Thelia/Tests/Core/Template/Smarty/Plugins/FormatTest.php b/core/lib/Thelia/Tests/Core/Template/Smarty/Plugins/FormatTest.php
index 38c00b55f..e8d5ff0fc 100644
--- a/core/lib/Thelia/Tests/Core/Template/Smarty/Plugins/FormatTest.php
+++ b/core/lib/Thelia/Tests/Core/Template/Smarty/Plugins/FormatTest.php
@@ -168,7 +168,6 @@ class FormatTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($dateTime->format("Y-m-d H:i:s"), $render);
     }
 
-
     /**
      * test formatNumber without mandatory parameters
      *
@@ -269,6 +268,4 @@ class FormatTest extends \PHPUnit_Framework_TestCase
         return $mock;
     }
 
-
-
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php
index 5a3d7881f..d0662442a 100644
--- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php
+++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php
@@ -25,10 +25,8 @@ namespace Thelia\Coupon;
 
 use Thelia\Constraint\Validator\PriceParam;
 use Thelia\Constraint\Validator\RuleValidator;
-use Thelia\Constraint\Rule\AvailableForTotalAmountManager;
 use Thelia\Constraint\Rule\Operators;
 use Thelia\Coupon\Type\CouponInterface;
-use Thelia\Coupon\Type\RemoveXAmountManager;
 use Thelia\Tools\PhpUnitUtils;
 
 /**
diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php
index 8467852ac..990309f28 100644
--- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php
+++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php
@@ -25,7 +25,6 @@ namespace Thelia\Coupon;
 
 use Thelia\Constraint\Validator\PriceParam;
 use Thelia\Constraint\Validator\RuleValidator;
-use Thelia\Constraint\Rule\AvailableForTotalAmountManager;
 use Thelia\Constraint\Rule\Operators;
 use Thelia\Coupon\Type\RemoveXAmountManager;
 
diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php
index 7fc327df6..b5d6529b1 100644
--- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php
+++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php
@@ -24,7 +24,6 @@
 namespace Thelia\Coupon;
 
 use PHPUnit_Framework_TestCase;
-use Thelia\Constraint\Rule\AvailableForTotalAmountManager;
 use Thelia\Constraint\Rule\Operators;
 use Thelia\Constraint\Validator\PriceParam;
 use Thelia\Constraint\Validator\RuleValidator;
diff --git a/core/lib/Thelia/Tests/Rewriting/RewritingResolverTest.php b/core/lib/Thelia/Tests/Rewriting/RewritingResolverTest.php
index 6cd4bdf42..97a6eebc0 100755
--- a/core/lib/Thelia/Tests/Rewriting/RewritingResolverTest.php
+++ b/core/lib/Thelia/Tests/Rewriting/RewritingResolverTest.php
@@ -120,7 +120,7 @@ class RewritingResolverTest extends \PHPUnit_Framework_TestCase
         $collection = new ObjectCollection();
         $collection->setModel('\Thelia\Model\RewritingArgument');
 
-        for($i=0; $i<3; $i++) {
+        for ($i=0; $i<3; $i++) {
             $ra = new RewritingArgument();
             $ra->setParameter('foo' . $i);
             $ra->setValue('bar' . $i);
@@ -132,7 +132,6 @@ class RewritingResolverTest extends \PHPUnit_Framework_TestCase
             $collection->append($ra);
         }
 
-
         $resolverQuery = $this->getMock('\Thelia\Model\RewritingUrlQuery', array('getResolverSearch'));
         $resolverQuery->expects($this->any())
             ->method('getResolverSearch')
diff --git a/core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php b/core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php
index 927f7cf62..e0fd3f678 100644
--- a/core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php
+++ b/core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php
@@ -28,15 +28,15 @@ namespace Thelia\Tests;
  *
  * @package Thelia\Tests\TestCaseWithURLSetup
  */
-class TestCaseWithURLToolSetup extends \PHPUnit_Framework_TestCase {
-
-
-    public function __construct() {
+class TestCaseWithURLToolSetup extends \PHPUnit_Framework_TestCase
+{
+    public function __construct()
+    {
         $this->setupURLTool();
     }
 
-    protected function setupURLTool() {
-
+    protected function setupURLTool()
+    {
         $container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
 
         $context = new \Symfony\Component\Routing\RequestContext(
@@ -61,4 +61,4 @@ class TestCaseWithURLToolSetup extends \PHPUnit_Framework_TestCase {
 
         new \Thelia\Tools\URL($container);
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tests/Tools/URLTest.php b/core/lib/Thelia/Tests/Tools/URLTest.php
index 86804f5c0..bf70e91c6 100755
--- a/core/lib/Thelia/Tests/Tools/URLTest.php
+++ b/core/lib/Thelia/Tests/Tools/URLTest.php
@@ -62,8 +62,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
         new \Thelia\Tools\URL($container);
     }
 
-    public function testGetIndexPage() {
-
+    public function testGetIndexPage()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->getIndexPage();
         $this->assertEquals('http://localhost/thelia/index.php', $url);
@@ -81,7 +81,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('http://localhost/', $url);
     }
 
-    public function testGetBaseUrl() {
+    public function testGetBaseUrl()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->getBaseUrl();
         $this->assertEquals('http://localhost/thelia/index.php', $url);
@@ -95,7 +96,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('http://localhost/', $url);
     }
 
-    public function testAbsoluteUrl() {
+    public function testAbsoluteUrl()
+    {
         $this->context->setBaseUrl('/');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action');
         $this->assertEquals('http://localhost/path/to/action', $url);
@@ -113,8 +115,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('http://localhost/thelia/index.php/path/to/action', $url);
     }
 
-    public function testAbsoluteUrlOnAbsolutePath() {
-
+    public function testAbsoluteUrlOnAbsolutePath()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action');
         $this->assertEquals('http://myhost/path/to/action', $url);
@@ -128,8 +130,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('http://myhost/path/to/action', $url);
     }
 
-    public function testAbsoluteUrlOnAbsolutePathWithParameters() {
-
+    public function testAbsoluteUrlOnAbsolutePathWithParameters()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action', array("p1" => "v1", "p2" => "v2"));
         $this->assertEquals('http://myhost/path/to/action?p1=v1&p2=v2', $url);
@@ -143,7 +145,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('http://myhost/path/to/action?p1=v1&p2=v2', $url);
     }
 
-    public function testAbsoluteUrlOnAbsolutePathWithParametersAddParameters() {
+    public function testAbsoluteUrlOnAbsolutePathWithParametersAddParameters()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action?p0=v0', array("p1" => "v1", "p2" => "v2"));
         $this->assertEquals('http://myhost/path/to/action?p0=v0&p1=v1&p2=v2', $url);
@@ -157,7 +160,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('http://myhost/path/to/action?p0=v0&p1=v1&p2=v2', $url);
     }
 
-    public function testAbsoluteUrlWithParameters() {
+    public function testAbsoluteUrlWithParameters()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"));
         $this->assertEquals('http://localhost/thelia/index.php/path/to/action?p1=v1&p2=v2', $url);
@@ -179,13 +183,15 @@ class URLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('http://localhost/path/to/action?p1=v1&p2=v2', $url);
     }
 
-    public function testAbsoluteUrlPathOnly() {
+    public function testAbsoluteUrlPathOnly()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array(), URL::PATH_TO_FILE);
         $this->assertEquals('http://localhost/thelia/path/to/action', $url);
     }
 
-    public function testAbsoluteUrlPathOnlyWithParameters() {
+    public function testAbsoluteUrlPathOnlyWithParameters()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
         $this->assertEquals('http://localhost/thelia/path/to/action?p1=v1&p2=v2', $url);
@@ -200,7 +206,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
 
     }
 
-    public function testAbsoluteUrlFromIndexWithParameters() {
+    public function testAbsoluteUrlFromIndexWithParameters()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"));
         $this->assertEquals('http://localhost/thelia/index.php/?p1=v1&p2=v2', $url);
@@ -215,7 +222,8 @@ class URLTest extends \PHPUnit_Framework_TestCase
 
     }
 
-    public function testAbsoluteUrlPathOnlyFromIndexWithParameters() {
+    public function testAbsoluteUrlPathOnlyFromIndexWithParameters()
+    {
         $this->context->setBaseUrl('/thelia/index.php');
         $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
         $this->assertEquals('http://localhost/thelia/?p1=v1&p2=v2', $url);
diff --git a/core/lib/Thelia/Tools/DateTimeFormat.php b/core/lib/Thelia/Tools/DateTimeFormat.php
index bd6161389..50c757536 100755
--- a/core/lib/Thelia/Tools/DateTimeFormat.php
+++ b/core/lib/Thelia/Tools/DateTimeFormat.php
@@ -24,7 +24,6 @@
 namespace Thelia\Tools;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class DateTimeFormat
 {
@@ -46,7 +45,7 @@ class DateTimeFormat
 
         $format = null;
 
-        if($lang) {
+        if ($lang) {
             switch ($output) {
                 case "date" :
                     $format = $lang->getDateFormat();
@@ -63,4 +62,4 @@ class DateTimeFormat
 
         return $format;
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tools/I18n.php b/core/lib/Thelia/Tools/I18n.php
index 4467bebcd..1f3ff57dd 100644
--- a/core/lib/Thelia/Tools/I18n.php
+++ b/core/lib/Thelia/Tools/I18n.php
@@ -54,4 +54,4 @@ class I18n
 
         return \DateTime::createFromFormat($currentDateFormat, $date);
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tools/PhpUnitUtils.php b/core/lib/Thelia/Tools/PhpUnitUtils.php
index 89bd3b148..e60c22fe1 100644
--- a/core/lib/Thelia/Tools/PhpUnitUtils.php
+++ b/core/lib/Thelia/Tools/PhpUnitUtils.php
@@ -50,6 +50,7 @@ class PhpUnitUtils
         $class = new \ReflectionClass(get_class($obj));
         $method = $class->getMethod($name);
         $method->setAccessible(true);
+
         return $method->invokeArgs($obj, $args);
     }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tools/Rest/ResponseRest.php b/core/lib/Thelia/Tools/Rest/ResponseRest.php
index 8618d460f..75d511d78 100644
--- a/core/lib/Thelia/Tools/Rest/ResponseRest.php
+++ b/core/lib/Thelia/Tools/Rest/ResponseRest.php
@@ -9,7 +9,6 @@ use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
 
-
 /**
  * Class ResponseRest Create a serialized Response
  *
diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php
index ffb81992d..d0dcd127d 100755
--- a/core/lib/Thelia/Tools/URL.php
+++ b/core/lib/Thelia/Tools/URL.php
@@ -62,9 +62,9 @@ class URL
      * @throws \RuntimeException if the class has not been instanciated.
      * @return \Thelia\Tools\URL the instance.
      */
-    public static function getInstance() {
+    public static function getInstance()
+    {
         if (self::$instance == null) throw new \RuntimeException("URL instance is not initialized.");
-
         return self::$instance;
     }
 
@@ -122,7 +122,7 @@ class URL
             $base_url = $this->getBaseUrl();
 
             // TODO fix this ugly patch
-            if(strpos($path, "index_dev.php")) {
+            if (strpos($path, "index_dev.php")) {
                 $path = str_replace('index_dev.php', '', $path);
             }
 
@@ -148,7 +148,6 @@ class URL
         $sepChar = strstr($base, '?') === false ? '?' : '&';
 
         if ('' !== $queryString = rtrim($queryString, "&")) $queryString = $sepChar . $queryString;
-
         return $base . $queryString;
     }
 
@@ -192,12 +191,12 @@ class URL
       */
      public function retrieve($view, $viewId, $viewLocale)
      {
-         if(ConfigQuery::isRewritingEnable()) {
+         if (ConfigQuery::isRewritingEnable()) {
              $this->retriever->loadViewUrl($view, $viewLocale, $viewId);
          } else {
              $allParametersWithoutView = array();
              $allParametersWithoutView['locale'] = $viewLocale;
-             if(null !== $viewId) {
+             if (null !== $viewId) {
                  $allParametersWithoutView[$view . '_id'] = $viewId;
              }
              $this->retriever->rewrittenUrl = null;
@@ -216,19 +215,19 @@ class URL
       */
      public function retrieveCurrent(Request $request)
      {
-         if(ConfigQuery::isRewritingEnable()) {
+         if (ConfigQuery::isRewritingEnable()) {
              $view = $request->attributes->get('_view', null);
              $viewLocale = $request->query->get('locale', null);
              $viewId = $view === null ? null : $request->query->get($view . '_id', null);
 
              $allOtherParameters = $request->query->all();
-             if($view !== null) {
+             if ($view !== null) {
                  unset($allOtherParameters['view']);
-                 if($viewId !== null) {
+                 if ($viewId !== null) {
                      unset($allOtherParameters[$view . '_id']);
                  }
              }
-             if($viewLocale !== null) {
+             if ($viewLocale !== null) {
                  unset($allOtherParameters['locale']);
              }
 
@@ -236,7 +235,7 @@ class URL
          } else {
              $allParametersWithoutView = $viewOtherParameters;
              $allParametersWithoutView['locale'] = $viewLocale;
-             if(null !== $viewId) {
+             if (null !== $viewId) {
                  $allParametersWithoutView[$view . '_id'] = $viewId;
              }
              $this->retriever->rewrittenUrl = null;
@@ -256,6 +255,7 @@ class URL
      public function resolve($url)
      {
          $this->resolver->load($url);
+
          return $this->resolver;
      }
-}
\ No newline at end of file
+}

From a3bb1244244cf5d140f2b42c61103e6838380f17 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 08:33:25 +0200
Subject: [PATCH 24/55] fix tests

---
 core/lib/Thelia/Core/Template/Loop/Product.php       | 12 +++++++++++-
 .../Core/Template/Loop/ProductSaleElements.php       |  3 ++-
 templates/default_save/product.html                  |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index e7d1cf8a3..76ffda24b 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -86,6 +86,7 @@ class Product extends BaseI18nLoop
             Argument::createBooleanTypeArgument('current_category'),
             Argument::createIntTypeArgument('depth', 1),
             Argument::createBooleanOrBothTypeArgument('visible', 1),
+            Argument::createIntTypeArgument('currency'),
             new Argument(
                 'order',
                 new TypeCollection(
@@ -136,7 +137,16 @@ class Product extends BaseI18nLoop
      */
     public function exec(&$pagination)
     {
-        $currency = $this->request->getSession()->getCurrency();
+        $currencyId = $this->getCurrency();
+        if(null !== $currencyId) {
+            $currency = CurrencyQuery::create()->findOneById($currencyId);
+            if(null === $currency) {
+                throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop');
+            }
+        } else {
+            $currency = $this->request->getSession()->getCurrency();
+        }
+
         $defaultCurrency = CurrencyQuery::create()->findOneByByDefault(1);
         $defaultCurrencySuffix = '_default_currency';
 
diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index 38d4d2e94..3b89eedca 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -82,6 +82,7 @@ class ProductSaleElements extends BaseLoop
      * @param $pagination
      *
      * @return \Thelia\Core\Template\Element\LoopResult
+     * @throws \InvalidArgumentException
      */
     public function exec(&$pagination)
     {
@@ -115,7 +116,7 @@ class ProductSaleElements extends BaseLoop
         }
 
         $currencyId = $this->getCurrency();
-        if(null !== $currency) {
+        if(null !== $currencyId) {
             $currency = CurrencyQuery::create()->findOneById($currencyId);
             if(null === $currency) {
                 throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop');
diff --git a/templates/default_save/product.html b/templates/default_save/product.html
index 55de8362d..f78b7e296 100755
--- a/templates/default_save/product.html
+++ b/templates/default_save/product.html
@@ -6,7 +6,7 @@ Index : {navigate to="index"}<br />
 
 {ifloop rel="product"}
 
-{loop type="product" name="product" current="true"}
+{loop type="product" name="product" current="true" min_price="50" max_price="100"}
 
 <div style="border: dashed 2px red; padding: 20px; margin: 10px;">
     <h2>PRODUCT ({$ID}) : {$REF}</h2>
@@ -66,7 +66,7 @@ Index : {navigate to="index"}<br />
         {$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}<br />
         {/loop}
         <br />{$WEIGHT} g
-        <br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} {currency attr="symbol"} HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} {currency attr="symbol"} TTC (instead of {$PRICE HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC){else} {$PRICE} {currency attr="symbol"} HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC{/if}</strong>
+        <br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} {currency attr="symbol"} HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} {currency attr="symbol"} TTC (instead of {$PRICE_HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC){else} {$PRICE} {currency attr="symbol"} HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC{/if}</strong>
         <br /><br />
         Add
         <select>

From 2f07e01b06e737d0837bf274150624b03b340047 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 08:37:18 +0200
Subject: [PATCH 25/55] fix test

---
 core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index 414cc9b65..f1bbb198d 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -79,6 +79,7 @@ class ProductSaleElements extends BaseLoop
      * @param $pagination
      *
      * @return \Thelia\Core\Template\Element\LoopResult
+     * @throws \InvalidArgumentException
      */
     public function exec(&$pagination)
     {
@@ -112,7 +113,7 @@ class ProductSaleElements extends BaseLoop
         }
 
         $currencyId = $this->getCurrency();
-        if (null !== $currency) {
+        if (null !== $currencyId) {
             $currency = CurrencyQuery::create()->findOneById($currencyId);
             if (null === $currency) {
                 throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop');

From 3582ae4cf9805df29ff50143fd9328733a0844b1 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 11 Sep 2013 08:51:34 +0200
Subject: [PATCH 26/55] save register template

---
 templates/default/register.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/default/register.html b/templates/default/register.html
index 04d8ca595..3a14ce675 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -68,7 +68,7 @@
                         {/form_field}
                         {form_field form=$form field="phone"}
                             <div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
-                                <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                                <label class="control-label" for="{$label_attr.for}">{$label}</label>
                                 <div class="control-input">
                                     <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
                                     {if $error }
@@ -81,7 +81,7 @@
                         {/form_field}
                         {form_field form=$form field="cellphone"}
                             <div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
-                                <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                                <label class="control-label" for="{$label_attr.for}">{$label}</label>
                                 <div class="control-input">
                                     <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
                                     {if $error }

From 06bb1d0a3980b509f8de5b12e6f97f02f04e16f8 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 11 Sep 2013 08:57:59 +0200
Subject: [PATCH 27/55] change some getters

---
 .../Core/HttpFoundation/Session/Session.php   | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
index dd6af30d2..f2eaadc4d 100755
--- a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
+++ b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
@@ -47,7 +47,12 @@ class Session extends BaseSession
      */
     public function getLang($forceDefault = true)
     {
-        return $this->get("thelia.current.lang", $forceDefault ? Lang::getDefaultLanguage():null);
+        $lang = $this->get("thelia.current.lang");
+        if(null === $lang && $forceDefault)
+        {
+            $lang = Lang::getDefaultLanguage();
+        }
+        return $lang;
     }
 
     public function setLang(Lang $lang)
@@ -59,7 +64,12 @@ class Session extends BaseSession
 
     public function getAdminEditionLang()
     {
-        return $this->get('thelia.admin.edition.lang', Lang::getDefaultLanguage());
+        $lang = $this->get('thelia.admin.edition.lang');
+
+        if (null === $lang) {
+            $lang =  Lang::getDefaultLanguage();
+        }
+        return $lang;
     }
 
     public function setAdminEditionLang($langId)
@@ -76,7 +86,13 @@ class Session extends BaseSession
 
     public function getCurrency($forceDefault = true)
     {
-        return $this->get("thelia.current.currency", $forceDefault ? Currency::getDefaultCurrency():null);
+        $currency = $this->get("thelia.current.currency");
+
+        if(null === $currency && $forceDefault)
+        {
+            $currency = Currency::getDefaultCurrency();
+        }
+        return $currency;
     }
 
     // -- Customer user --------------------------------------------------------

From 90024848149dec081f06e3a7a02238592ff58383 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 11 Sep 2013 09:13:42 +0200
Subject: [PATCH 28/55] change find method on some request

---
 core/lib/Thelia/Model/Tools/ModelCriteriaTools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
index 5e5dae010..c7426ef71 100755
--- a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
+++ b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
@@ -110,7 +110,7 @@ class ModelCriteriaTools
     {
         // If a lang has been requested, find the related Lang object, and get the locale
         if ($requestedLangId !== null) {
-            $localeSearch = LangQuery::create()->findOneById($requestedLangId);
+            $localeSearch = LangQuery::create()->findPk($requestedLangId);
 
             if ($localeSearch === null) {
                 throw new \InvalidArgumentException(sprintf('Incorrect lang argument given : lang ID %d not found', $requestedLangId));

From d6136c56d4e5d698a61c9c5515622d2aa3503403 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 09:20:58 +0200
Subject: [PATCH 29/55] pse loop currency

---
 .../Thelia/Core/Template/Loop/ProductSaleElements.php | 11 +++++++----
 templates/default_save/product.html                   |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index f1bbb198d..9330a7e90 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -68,9 +68,9 @@ class ProductSaleElements extends BaseLoop
             new Argument(
                 'order',
                 new TypeCollection(
-                    new Type\EnumListType(array('alpha', 'alpha_reverse', 'attribute', 'attribute_reverse'))
+                    new Type\EnumListType(array('min_price', 'max_price', 'promo', 'new', 'random'))
                 ),
-                'attribute'
+                'random'
             )
         );
     }
@@ -125,8 +125,11 @@ class ProductSaleElements extends BaseLoop
         $defaultCurrency = CurrencyQuery::create()->findOneByByDefault(1);
         $defaultCurrencySuffix = '_default_currency';
 
-        $search->joinProductPrice('price', Criteria::INNER_JOIN);
-            //->addJoinCondition('price', '');
+        $search->joinProductPrice('price', Criteria::INNER_JOIN)
+            ->addJoinCondition('price', '`price`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
+
+        $search->joinProductPrice('price' . $defaultCurrencySuffix, Criteria::INNER_JOIN)
+            ->addJoinCondition('price_default_currency', '`price' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT);
 
         $search->withColumn('`price`.CURRENCY_ID', 'price_CURRENCY_ID')
             ->withColumn('`price`.PRICE', 'price_PRICE')
diff --git a/templates/default_save/product.html b/templates/default_save/product.html
index f78b7e296..9d8dda432 100755
--- a/templates/default_save/product.html
+++ b/templates/default_save/product.html
@@ -1,3 +1,5 @@
+{include file="includes/header.html"}
+
 Here you are : {navigate to="current"}<br />
 From : {navigate to="return_to"}<br />
 Index : {navigate to="index"}<br />
@@ -87,4 +89,6 @@ Index : {navigate to="index"}<br />
 
 {elseloop rel="product"}
     <h2>Produit introuvable !</h2>
-{/elseloop}
\ No newline at end of file
+{/elseloop}
+
+{include file="includes/footer.html"}
\ No newline at end of file

From 7e2f57e6187589f724bf7055507be24e533a1c7f Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 11 Sep 2013 09:48:33 +0200
Subject: [PATCH 30/55] Working - Coupon Add/Edit/Delete rule AJAX

---
 templates/admin/default/coupon-update.html    | 24 ++++++-----
 .../admin/default/coupon/rule-input-ajax.html | 40 +++++++++----------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/templates/admin/default/coupon-update.html b/templates/admin/default/coupon-update.html
index 1971fafff..3895475b4 100755
--- a/templates/admin/default/coupon-update.html
+++ b/templates/admin/default/coupon-update.html
@@ -41,8 +41,6 @@
         $(function($){
             miniBrowser(0, '/test_to_remove/datas_coupon_edit.json');
 
-
-
             Array.prototype.clean = function(deleteValue) {
                 for (var i = 0; i < this.length; i++) {
                     if (this[i] == deleteValue) {
@@ -53,7 +51,6 @@
                 return this;
             };
 
-
             // Init Rules
             var initRules = function() {
                 var rules = [];
@@ -75,8 +72,6 @@
 
             // Save Rules AJAX
             var saveRuleAjax = function() {
-                console.log('rulesToSave');
-                console.log(rulesToSave);
                 var $url = '{$urlAjaxUpdateRules}';
                 $.ajax({
                     type: "POST",
@@ -107,12 +102,14 @@
 
             // Add 1 Rule / or update the temporary Rules array then Save Rules via AJAX
             var addRuleAjax = function(id) {
+                // If update
                 if(typeof id === 'number' && id % 1 == 0) {
                     rulesToSave[id] = ruleToSave;
-                } else {
+                } else { // If create
                     rulesToSave.push(ruleToSave);
                 }
 
+                // Save
                 saveRuleAjax();
             }
 
@@ -193,12 +190,15 @@
             }
             onClickDeleteRule();
 
-            // Remove rule on click
+            // Update rule on click
             var onClickUpdateRule = function() {
                 $('.constraint-update-btn').on('click', function (e) {
                     e.preventDefault();
                     var $this = $(this);
                     updateRuleAjax($this.attr('data-int'));
+
+                    // Hide row being updated
+                    $this.parent().parent().remove();
                 });
             }
             onClickUpdateRule();
@@ -215,21 +215,23 @@
             // Reload rule inputs when changing effect
             var onRuleChange = function() {
                 $('#category-rule').on('change', function (e) {
-                    loadRuleInputs($(this).val(), null, function(ruleToSave) {});
+                    loadRuleInputs($(this).val(), null, function(ruleToSave) {literal}{}{/literal});
                 });
             }
             onRuleChange();
 
+            // Fill in ready to be saved rule array
+            // var onInputsChange = function()
+            // In AJAX response
 
 
 
-            // Rule to save
-            var ruleToSave = {literal}{}{/literal};
             // Rules which will be saved
             var rulesToSave = initRules();
         });
 
-
+        // Rule to save
+        var ruleToSave = {literal}{}{/literal};
 
     </script>
 {/block}
diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html
index d0959a3ad..4933c6745 100644
--- a/templates/admin/default/coupon/rule-input-ajax.html
+++ b/templates/admin/default/coupon/rule-input-ajax.html
@@ -72,33 +72,29 @@
 <script>
 
     // Init Rules to set
-    var ruleToSave = {};
     ruleToSave['serviceId'] = '{$ruleId}';
-    ruleToSave['operators'] = {};
-    ruleToSave['values'] = {};
-    {foreach from=$inputs.inputs key=name item=input}
-        ruleToSave['operators']['{$name nofilter}'] = '{foreach from=$inputs.inputs[$name].availableOperators key=keyOperator item=valueOperator name=operators}{if $smarty.foreach.operators.first}{$keyOperator nofilter}{/if}{/foreach}';
-        ruleToSave['values']['{$name nofilter}'] = '{if count($inputs.inputs[$name].availableValues) != 0}{foreach from=$inputs.inputs[$name].availableValues key=keyValue item=valueValue name=values}{if $smarty.foreach.values.first}{$keyValue nofilter}{/if}{/foreach}{else}to set{/if}';
-    {/foreach}
+    ruleToSave['operators'] = {literal}{}{/literal};
+    ruleToSave['values'] = {literal}{}{/literal};
+{foreach from=$inputs.inputs key=name item=input}
+    ruleToSave['operators']['{$name nofilter}'] = '{foreach from=$inputs.inputs[$name].availableOperators key=keyOperator item=valueOperator name=operators}{if $smarty.foreach.operators.first}{$keyOperator nofilter}{/if}{/foreach}';
+    ruleToSave['values']['{$name nofilter}'] = '{if count($inputs.inputs[$name].availableValues) != 0}{foreach from=$inputs.inputs[$name].availableValues key=keyValue item=valueValue name=values}{if $smarty.foreach.values.first}{$keyValue nofilter}{/if}{/foreach}{else}to set{/if}';
+{/foreach}
 
 
     // Fill in ready to be saved rule array
     var onInputsChange = function() {literal}{{/literal}
-        {foreach from=$inputs.inputs key=name item=input}
-            $('#{$name}-operator').change(function (e) {
-
-                var $this = $(this);
-                console.log('{$name}-operator changed by ' + $this.val());
-                ruleToSave['operators']['{$name nofilter}'] = $this.val();
-            });
-            $('#{$name}-value').change(function (e) {
-                var $this = $(this);
-                console.log('{$name}-value changed by ' + $this);
-                ruleToSave['values']['{$name nofilter}'] = $this.val();
-            });
-        {/foreach}
-        console.log('will save ');
-        console.log(ruleToSave);
+{foreach from=$inputs.inputs key=name item=input}
+        // Operator selector
+        $('#{$name}-operator').change(function (e) {
+            var $this = $(this);
+            ruleToSave['operators']['{$name nofilter}'] = $this.val();
+        });
+        // Value input
+        $('#{$name}-value').change(function (e) {
+            var $this = $(this);
+            ruleToSave['values']['{$name nofilter}'] = $this.val();
+        });
+{/foreach}
     {literal}}{/literal}
     onInputsChange();
 </script>
\ No newline at end of file

From 557940c5cf84a17d051ef3a1d1000f21a7b1505e Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 11 Sep 2013 09:48:41 +0200
Subject: [PATCH 31/55] searching route return relative path

---
 core/lib/Thelia/Controller/Admin/BaseAdminController.php | 3 ++-
 core/lib/Thelia/Controller/BaseController.php            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 21fffd3d9..30d6dd9df 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -25,6 +25,7 @@ namespace Thelia\Controller\Admin;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Routing\Router;
 use Thelia\Controller\BaseController;
 use Symfony\Component\HttpFoundation\Response;
 use Thelia\Core\Security\Exception\AuthorizationException;
@@ -226,7 +227,7 @@ class BaseAdminController extends BaseController
      *
      * @see \Thelia\Controller\BaseController::getRouteFromRouter()
      */
-    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
     {
         return $this->getRouteFromRouter(
             'router.admin',
diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 36a03529b..c55dd1258 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -235,7 +235,7 @@ class BaseController extends ContainerAware
      * @throws \InvalidArgumentException When the router doesn't exist
      * @return string                    The generated URL
      */
-    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
     {
         /** @var Router $router */
         $router =  $this->container->get($routerName);

From f1e24553157bc93e3159eaf36c17b0a186158244 Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Wed, 11 Sep 2013 09:50:47 +0200
Subject: [PATCH 32/55] fixed typo

---
 core/lib/Thelia/Controller/Admin/BaseAdminController.php | 1 +
 core/lib/Thelia/Core/Template/Assets/AsseticHelper.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 21fffd3d9..84f2e39ae 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -39,6 +39,7 @@ use Thelia\Model\LangQuery;
 use Thelia\Form\BaseForm;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Log\Tlog;
+use Symfony\Component\Routing\Router;
 
 class BaseAdminController extends BaseController
 {
diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
index a3323ae2a..294fa9e92 100755
--- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
+++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
@@ -124,7 +124,7 @@ class AsseticHelper
         //
         //     before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files.
         //
-        if ($dev_mode == true || ! file_exists($target_file)) {
+        if (/*$dev_mode == true || */! file_exists($target_file)) {
 
             // Delete previous version of the file
             list($commonPart, $dummy) = explode('-', $asset_target_path);

From a6ada57b34c444ce8d886564a55cfe687ad14ad4 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 10:20:31 +0200
Subject: [PATCH 33/55] Update body background

---
 templates/admin/default/assets/img/bg.jpg     | Bin 26406 -> 50205 bytes
 .../assets/less/thelia/scaffolding.less       |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/admin/default/assets/img/bg.jpg b/templates/admin/default/assets/img/bg.jpg
index 76304b5cfb707d476a49a74af176d719dc296189..e29da1fc5dfc343073acfcb9d26beb4200e5c94c 100644
GIT binary patch
literal 50205
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%0AD_axoRa4;rqb1m0ZP(Fpx*N=jvMKI!0C>WE(;
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
I%Rl%2FUVfy82|tP

literal 26406
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%0DXnl;ye7lO{)E)OR^Ig5M!b!IX5
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
VyAaH2blVoktMT}5>&lO_{{`CiQgi?S

diff --git a/templates/admin/default/assets/less/thelia/scaffolding.less b/templates/admin/default/assets/less/thelia/scaffolding.less
index 1bc1a373c..1309638e4 100755
--- a/templates/admin/default/assets/less/thelia/scaffolding.less
+++ b/templates/admin/default/assets/less/thelia/scaffolding.less
@@ -7,7 +7,8 @@
 // -------------------------
 
 body {
-  background: url("@{imgDir}/bg.jpg") repeat;
+  background: #FFF url("@{imgDir}/bg.jpg") top left no-repeat;
+  background-size: cover;
 }
 
 

From 40a87d50ce434b5a6e31b01fbb00b404bd42bfbf Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 10:21:07 +0200
Subject: [PATCH 34/55] Add modal for create/delete customer

---
 templates/admin/default/customers.html | 67 +++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index 3fe8d5804..df2b9d684 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -90,7 +90,7 @@
                                                     <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
                                                 {/loop}
                                                 {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
-                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
                                                 {/loop}
                                             </div>
                                         </td>
@@ -133,7 +133,7 @@
             </div>
         </div>
     </div>
-    
+
     {* Adding a new Category *}
 
 
@@ -149,40 +149,74 @@
                <input type="hidden" name="{$name}" value="{url path='/admin/customer/update/_ID_'}" />
             {/form_field}
             
+
+            {form_field form=$form field='title'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Title'}">
+                </div>
+            {/form_field}
+
             {form_field form=$form field='firstname'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Firstname'}" placeholder="{intl l='Firstname'}">
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='lastname'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Lastname'}" placeholder="{intl l='Lastname'}">
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='address1'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Address'}" placeholder="{intl l='Address'}">                    
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
                 </div>
 
                 <div class="form-group">
                     {form_field form=$form field='address2'}
-                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Additional address'}" placeholder="{intl l='Additional address'}">
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
                     {/form_field}                    
                 </div>
 
                 <div class="form-group">
                     {form_field form=$form field='address3'}
-                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Additional address'}" placeholder="{intl l='Additional address'}">
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
                     {/form_field}
                 </div>
             {/form_field}
 
-            
+            {form_field form=$form field='zipcode'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='city'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='country'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Country'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='email'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Email address'}">
+                </div>
+            {/form_field} 
             
         {/capture}
 
@@ -202,4 +236,21 @@
         }
     {/form}
 
+    {* Delete confirmation dialog *}
+
+    {capture "delete_customer_dialog"}
+        <input type="hidden" name="customer_id" id="customer_delete_id" value="" />
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_customer_dialog"
+        dialog_title    = {intl l="Delete customer"}
+        dialog_message  = {intl l="Do you really want to delete this customer ?"}
+
+        form_action         = {url path='/admin/customer/delete'}
+        form_content        = {$smarty.capture.delete_dialog nofilter}
+    }
+
 {/block}
\ No newline at end of file

From e4362ba4146cbd5ae537eb8007fe4f9d7fb39f08 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 10:47:31 +0200
Subject: [PATCH 35/55] Add customer view finish

---
 templates/admin/default/customers.html | 31 +++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index f7dcfaa12..570c38bdc 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -151,42 +151,47 @@
             {/form_field}
             
 
-            {form_field form=$form field='title'}
+            {form_field form=$form field='title'}                
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Title'}">
+                    
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="title" name="title1"}
+                            <option value="{$ID}">{$LONG}</option>
+                        {/loop}
+                    </select>                    
                 </div>
             {/form_field}
 
             {form_field form=$form field='firstname'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='lastname'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='address1'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
                 </div>
 
                 <div class="form-group">
                     {form_field form=$form field='address2'}
-                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
                     {/form_field}                    
                 </div>
 
                 <div class="form-group">
                     {form_field form=$form field='address3'}
-                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
                     {/form_field}
                 </div>
             {/form_field}
@@ -194,28 +199,32 @@
             {form_field form=$form field='zipcode'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='city'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='country'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Country'}">
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="country" name="country1"}
+                            <option value="{$ID}">{$TITLE}</option>
+                        {/loop}
+                    </select>
                 </div>
             {/form_field}
 
             {form_field form=$form field='email'}
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Email address'}">
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Email address'}">
                 </div>
             {/form_field} 
             

From 3d31090344737a8dffafcb7077782400a68b9fb0 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 10:51:44 +0200
Subject: [PATCH 36/55] currency management in PSE loop

---
 .../Template/Loop/ProductSaleElements.php     | 30 +++++++++++--------
 core/lib/Thelia/Core/Thelia.php               |  2 +-
 templates/default_save/product.html           |  6 ++--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index 9330a7e90..1e379c76c 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -34,6 +34,7 @@ use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Model\Base\ProductSaleElementsQuery;
 use Thelia\Model\CountryQuery;
 use Thelia\Model\CurrencyQuery;
+use Thelia\Model\Map\ProductSaleElementsTableMap;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
@@ -41,7 +42,7 @@ use Thelia\Type;
  *
  * Product Sale Elements loop
  *
- * @todo : manage currency and attribute_availability
+ * @todo : manage attribute_availability
  *
  * Class ProductSaleElements
  * @package Thelia\Core\Template\Loop
@@ -94,16 +95,16 @@ class ProductSaleElements extends BaseLoop
         foreach ($orders as $order) {
             switch ($order) {
                 case "min_price":
-                    $search->addAscendingOrderByColumn('real_lowest_price', Criteria::ASC);
+                    $search->addAscendingOrderByColumn('price_FINAL_PRICE', Criteria::ASC);
                     break;
                 case "max_price":
-                    $search->addDescendingOrderByColumn('real_lowest_price');
+                    $search->addDescendingOrderByColumn('price_FINAL_PRICE');
                     break;
                 case "promo":
-                    $search->addDescendingOrderByColumn('main_product_is_promo');
+                    $search->orderByPromo(Criteria::DESC);
                     break;
                 case "new":
-                    $search->addDescendingOrderByColumn('main_product_is_new');
+                    $search->orderByNewness(Criteria::DESC);
                     break;
                 case "random":
                     $search->clearOrderByColumns();
@@ -125,15 +126,22 @@ class ProductSaleElements extends BaseLoop
         $defaultCurrency = CurrencyQuery::create()->findOneByByDefault(1);
         $defaultCurrencySuffix = '_default_currency';
 
-        $search->joinProductPrice('price', Criteria::INNER_JOIN)
+        $search->joinProductPrice('price', Criteria::LEFT_JOIN)
             ->addJoinCondition('price', '`price`.`currency_id` = ?', $currency->getId(), null, \PDO::PARAM_INT);
 
-        $search->joinProductPrice('price' . $defaultCurrencySuffix, Criteria::INNER_JOIN)
+        $search->joinProductPrice('price' . $defaultCurrencySuffix, Criteria::LEFT_JOIN)
             ->addJoinCondition('price_default_currency', '`price' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT);
 
-        $search->withColumn('`price`.CURRENCY_ID', 'price_CURRENCY_ID')
-            ->withColumn('`price`.PRICE', 'price_PRICE')
-            ->withColumn('`price`.PROMO_PRICE', 'price_PROMO_PRICE');
+        /**
+         * rate value is checked as a float in overloaded getRate method.
+         */
+        $priceSelectorAsSQL = 'ROUND(CASE WHEN ISNULL(`price`.PRICE) THEN `price_default_currency`.PRICE * ' . $currency->getRate() . ' ELSE `price`.PRICE END, 2)';
+        $promoPriceSelectorAsSQL = 'ROUND(CASE WHEN ISNULL(`price`.PRICE) THEN `price_default_currency`.PROMO_PRICE  * ' . $currency->getRate() . ' ELSE `price`.PROMO_PRICE END, 2)';
+        $search->withColumn($priceSelectorAsSQL, 'price_PRICE')
+            ->withColumn($promoPriceSelectorAsSQL, 'price_PROMO_PRICE')
+            ->withColumn('CASE WHEN ' . ProductSaleElementsTableMap::PROMO . ' = 1 THEN ' . $promoPriceSelectorAsSQL . ' ELSE ' . $priceSelectorAsSQL . ' END', 'price_FINAL_PRICE');
+
+        $search->groupById();
 
         $PSEValues = $this->search($search, $pagination);
 
@@ -156,8 +164,6 @@ class ProductSaleElements extends BaseLoop
                 ->set("IS_PROMO", $PSEValue->getPromo() === 1 ? 1 : 0)
                 ->set("IS_NEW", $PSEValue->getNewness() === 1 ? 1 : 0)
                 ->set("WEIGHT", $PSEValue->getWeight())
-
-                ->set("CURRENCY", $PSEValue->getVirtualColumn('price_CURRENCY_ID'))
                 ->set("PRICE", $price)
                 ->set("PRICE_TAX", $taxedPrice - $price)
                 ->set("TAXED_PRICE", $taxedPrice)
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 9aedaaa29..eb560a484 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -83,7 +83,7 @@ class Thelia extends Kernel
         $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME);
         $con->setAttribute(ConnectionWrapper::PROPEL_ATTR_CACHE_PREPARES, true);
         if ($this->isDebug()) {
-
+            $serviceContainer->setLogger('defaultLogger', \Thelia\Log\Tlog::getInstance());
             $con->useDebug(true);
         }
     }
diff --git a/templates/default_save/product.html b/templates/default_save/product.html
index 9d8dda432..441585aba 100755
--- a/templates/default_save/product.html
+++ b/templates/default_save/product.html
@@ -1,4 +1,4 @@
-{include file="includes/header.html"}
+{*include file="includes/header.html"*}
 
 Here you are : {navigate to="current"}<br />
 From : {navigate to="return_to"}<br />
@@ -62,7 +62,7 @@ Index : {navigate to="index"}<br />
     <h4>Product sale elements</h4>
 
     {assign var=current_product value=$ID}
-    {loop name="pse" type="product_sale_elements" product="$ID"}
+    {loop name="pse" type="product_sale_elements" product="$ID" order="promo,min_price"}
     <div style="border: solid 2px darkorange; padding: 5px; margin: 5px;">
         {loop name="combi" type="attribute_combination" product_sale_elements="$ID"}
         {$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}<br />
@@ -91,4 +91,4 @@ Index : {navigate to="index"}<br />
     <h2>Produit introuvable !</h2>
 {/elseloop}
 
-{include file="includes/footer.html"}
\ No newline at end of file
+{*include file="includes/footer.html"*}
\ No newline at end of file

From c11821153c95f0c064765bf2c6994b0cc82ee491 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 11:00:55 +0200
Subject: [PATCH 37/55] PSE loop todo

---
 core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php | 2 +-
 core/lib/Thelia/Core/Thelia.php                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index 1e379c76c..980ade454 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -42,7 +42,7 @@ use Thelia\Type;
  *
  * Product Sale Elements loop
  *
- * @todo : manage attribute_availability
+ * @todo : manage attribute_availability ?
  *
  * Class ProductSaleElements
  * @package Thelia\Core\Template\Loop
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index eb560a484..402059ddd 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -83,7 +83,7 @@ class Thelia extends Kernel
         $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME);
         $con->setAttribute(ConnectionWrapper::PROPEL_ATTR_CACHE_PREPARES, true);
         if ($this->isDebug()) {
-            $serviceContainer->setLogger('defaultLogger', \Thelia\Log\Tlog::getInstance());
+            //$serviceContainer->setLogger('defaultLogger', \Thelia\Log\Tlog::getInstance());
             $con->useDebug(true);
         }
     }

From e2a5ee90ff25e910f8fd54ac8650b98384c5cd55 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 11 Sep 2013 11:03:35 +0200
Subject: [PATCH 38/55] use ROUTER::ABSOLUTE_URL by default

---
 core/lib/Thelia/Controller/Admin/BaseAdminController.php | 2 +-
 core/lib/Thelia/Controller/BaseController.php            | 2 +-
 core/lib/Thelia/Tools/URL.php                            | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 30d6dd9df..dbb08a103 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -227,7 +227,7 @@ class BaseAdminController extends BaseController
      *
      * @see \Thelia\Controller\BaseController::getRouteFromRouter()
      */
-    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
+    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_URL)
     {
         return $this->getRouteFromRouter(
             'router.admin',
diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index c55dd1258..bd2556072 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -235,7 +235,7 @@ class BaseController extends ContainerAware
      * @throws \InvalidArgumentException When the router doesn't exist
      * @return string                    The generated URL
      */
-    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
+    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_URL)
     {
         /** @var Router $router */
         $router =  $this->container->get($routerName);
diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php
index d0dcd127d..05084c0c1 100755
--- a/core/lib/Thelia/Tools/URL.php
+++ b/core/lib/Thelia/Tools/URL.php
@@ -90,7 +90,6 @@ class URL
 
             $schemeAuthority = "$scheme://$host"."$port";
         }
-
         return $schemeAuthority.$this->requestContext->getBaseUrl();
     }
 

From 551c132b76bf99860432ffc82faf13d73b169770 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 11:14:54 +0200
Subject: [PATCH 39/55] syntax

---
 core/lib/Thelia/Core/Thelia.php          |  2 +-
 core/lib/Thelia/TaxEngine/Calculator.php | 12 ++++++------
 templates/default_save/category.html     | 12 +-----------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 402059ddd..eb560a484 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -83,7 +83,7 @@ class Thelia extends Kernel
         $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME);
         $con->setAttribute(ConnectionWrapper::PROPEL_ATTR_CACHE_PREPARES, true);
         if ($this->isDebug()) {
-            //$serviceContainer->setLogger('defaultLogger', \Thelia\Log\Tlog::getInstance());
+            $serviceContainer->setLogger('defaultLogger', \Thelia\Log\Tlog::getInstance());
             $con->useDebug(true);
         }
     }
diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php
index 66c4fcbbf..e077a24b8 100755
--- a/core/lib/Thelia/TaxEngine/Calculator.php
+++ b/core/lib/Thelia/TaxEngine/Calculator.php
@@ -67,29 +67,29 @@ class Calculator
         return $this;
     }
 
-    public function getTaxAmount($amount)
+    public function getTaxAmount($untaxedPrice)
     {
         if(null === $this->taxRulesGroupedCollection) {
             throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION);
         }
 
-        if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) {
+        if(false === filter_var($untaxedPrice, FILTER_VALIDATE_FLOAT)) {
             throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT);
         }
 
         $totalTaxAmount = 0;
         foreach($this->taxRulesGroupedCollection as $taxRule) {
             $rateSum = $taxRule->getTaxRuleRateSum();
-            $taxAmount = $amount * $rateSum * 0.01;
+            $taxAmount = $untaxedPrice * $rateSum * 0.01;
             $totalTaxAmount += $taxAmount;
-            $amount += $taxAmount;
+            $untaxedPrice += $taxAmount;
         }
 
         return $totalTaxAmount;
     }
 
-    public function getTaxedPrice($amount)
+    public function getTaxedPrice($untaxedPrice)
     {
-        return $amount + $this->getTaxAmount($amount);
+        return $untaxedPrice + $this->getTaxAmount($untaxedPrice);
     }
 }
diff --git a/templates/default_save/category.html b/templates/default_save/category.html
index 2e216d0c0..0a8e04460 100755
--- a/templates/default_save/category.html
+++ b/templates/default_save/category.html
@@ -1,9 +1,3 @@
-<html>
-<head>
-    {debugbar_renderHead}
-</head>
-<body>
-
 <h1>Category page</h1>
 
 <div style="border: solid 8px; margin: 0px; padding: 0px; width: 45%; float: left">
@@ -148,8 +142,4 @@
     {/loop}
 </ul>
 
-</div>
-
-    {debugbar_render}
-</body>
-</html>
\ No newline at end of file
+</div>
\ No newline at end of file

From 953bf005a177a33a4f7df7afaff4917397ff7edb Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 11:39:33 +0200
Subject: [PATCH 40/55] - Change boolean type to integer type for
 update_logged_in_user field - Create view for customer modification

---
 core/lib/Thelia/Form/CustomerModification.php |  58 +++++--
 templates/admin/default/customer-edit.html    | 152 ++++++++++++++++++
 templates/admin/default/customers.html        |  10 +-
 3 files changed, 206 insertions(+), 14 deletions(-)
 create mode 100644 templates/admin/default/customer-edit.html

diff --git a/core/lib/Thelia/Form/CustomerModification.php b/core/lib/Thelia/Form/CustomerModification.php
index 61f1e0834..358154a18 100755
--- a/core/lib/Thelia/Form/CustomerModification.php
+++ b/core/lib/Thelia/Form/CustomerModification.php
@@ -24,6 +24,7 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class CustomerModification
@@ -56,60 +57,93 @@ class CustomerModification extends BaseForm
     {
 
         $this->formBuilder
-            ->add('update_logged_in_user', 'boolean') // In a front office context, update the in-memory logged-in user data
+            ->add('update_logged_in_user', 'integer') // In a front office context, update the in-memory logged-in user data
             ->add("firstname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "firstname"
+                "label" => Translator::getInstance()->trans("First Name"),
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "lastname"
+                "label" => Translator::getInstance()->trans("Last Name"),
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "address"
+                "label_attr" => array(
+                    "for" => "address"
+                ),
+                "label" => Translator::getInstance()->trans("Street Address")
             ))
             ->add("address2", "text", array(
-                "label" => "Address Line 2"
+                "label" => Translator::getInstance()->trans("Address Line 2"),
+                "label_attr" => array(
+                    "for" => "address2"
+                )
             ))
             ->add("address3", "text", array(
-                "label" => "Address Line 3"
+                "label" => Translator::getInstance()->trans("Address Line 3"),
+                "label_attr" => array(
+                    "for" => "address3"
+                )
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "city"
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "country"
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "title"
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title"
+                )
             ))
         ;
     }
diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
new file mode 100644
index 000000000..d3f9b6bc5
--- /dev/null
+++ b/templates/admin/default/customer-edit.html
@@ -0,0 +1,152 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit a customer'}{/block}
+
+{block name="check-permissions"}admin.customer.edit{/block}
+
+{block name="main-content"}
+    <div class="customers edit-customer">
+
+        <div id="wrapper" class="container">
+
+            {loop name="customer_edit" type="customer" current="false" id="$customer_id" backend_context="1" lang="$edit_language_id"}
+                
+                <ul class="breadcrumb">
+        			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>                    
+                    <li><a href="{url path='/admin/customers'}">{intl l="Customers"}</a></li>
+                    <li>{intl l='Editing customer "%name"' name="{$FIRSTNAME} {$LASTNAME}"}</li>
+                </ul>
+
+        		<div class="row">
+        			<div class="col-md-12 general-block-decorator">
+        				<div class="row">
+
+        					<div class="col-md-12 title title-without-tabs">
+        					   {intl l="Edit customer $FIRSTNAME $LASTNAME"}
+        					</div>
+
+                            <div class="form-container">
+                                <div class="col-md-12">
+
+        						    {form name="thelia.customer.modification"}
+        						    	<form method="POST" action="{url path='/admin/customers/save'}" {form_enctype form=$form} class="clearfix">
+
+        	                                {* Be sure to get the customer ID, even if the form could not be validated *}
+        	                                <input type="hidden" name="customer_id" value="{$customer_id}" />
+
+                                        	{include file="includes/inner-form-toolbar.html"}
+
+        						        	{form_hidden_fields form=$form}
+
+        						        	{form_field form=$form field='success_url'}
+        						        		<input type="hidden" name="{$name}" value="{url path='/admin/customers'}" />
+        						        	{/form_field}
+
+        					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+                                            <div class="col-md-6">                                                
+
+                                                {form_field form=$form field='title'}                
+                                                    <div class="form-group {if $error}has-error{/if}">
+                                                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                        
+                                                        <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                                                            {loop type="title" name="title1"}
+                                                                <option value="{$ID}">{$LONG}</option>
+                                                            {/loop}
+                                                        </select>                    
+                                                    </div>
+                                                {/form_field}
+
+                                                {form_field form=$form field='firstname'}
+                                                    <div class="form-group {if $error}has-error{/if}">
+                                                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$FIRSTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                                                    </div>
+                                                {/form_field}
+
+                                                {form_field form=$form field='lastname'}
+                                                    <div class="form-group {if $error}has-error{/if}">
+                                                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                                                    </div>
+                                                {/form_field}                                                                                            
+
+                                            </div>
+
+                                            <div class="col-md-6">
+                                                {loop name="address" type="address" customer="$customer_id" backend_context="1"}
+
+                                                    {form_field form=$form field='address1'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ADDRESS1}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">
+                                                        </div>
+                                                    {/form_field}
+
+                                                    {form_field form=$form field='address2'}
+                                                        <div class="form-group">                                                        
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ADDRESS2}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">                                                                        
+                                                        </div>
+                                                    {/form_field}   
+
+                                                    {form_field form=$form field='address3'}
+                                                        <div class="form-group">                                                            
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ADDRESS3}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">                                                        
+                                                        </div>
+                                                    {/form_field}                                            
+
+                                                    {form_field form=$form field='zipcode'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ZIPCODE}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                                                        </div>
+                                                    {/form_field}
+
+                                                    {form_field form=$form field='city'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$CITY}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                                                        </div>
+                                                    {/form_field}
+
+                                                    {form_field form=$form field='country'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                                                                {loop type="country" name="country1"}
+                                                                    <option value="{$ID}">{$TITLE}</option>
+                                                                {/loop}
+                                                            </select>
+                                                        </div>
+                                                    {/form_field} 
+
+                                                {/loop}
+                                            </div>
+
+                                        </form>
+        							{/form}
+
+        						</div>
+        					</div>
+
+        				</div>
+        			</div>
+
+        		</div>
+
+    		{/loop}
+
+            {elseloop rel="customer_edit"}
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="alert alert-error">
+                            {intl l="Sorry, customer ID=$customer_id was not found."}
+                        </div>
+                    </div>
+                </div>
+            {/elseloop}
+
+        </div>
+    </div>
+{/block}
\ No newline at end of file
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index 570c38bdc..faec8fb34 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -9,7 +9,7 @@
     {assign var=customer_page value={$smarty.get.page|default:1}}
 
 
-    <div class="catalog">
+    <div class="customer">
         <div id="wrapper" class="container">
 
 
@@ -150,7 +150,13 @@
                <input type="hidden" name="{$name}" value="{url path='/admin/customer/update/_ID_'}" />
             {/form_field}
             
-
+            {form_field form=$form field='company'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Company'}">
+                </div>
+            {/form_field}
+            
             {form_field form=$form field='title'}                
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>

From abb501af29e1ba6daaa576bf060517580820df16 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 11:43:49 +0200
Subject: [PATCH 41/55] Add breadcrumb to customers view

---
 templates/admin/default/customers.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index faec8fb34..a43c59131 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -11,7 +11,11 @@
 
     <div class="customer">
         <div id="wrapper" class="container">
-
+            
+            <ul class="breadcrumb">
+                <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>                    
+                <li><a href="{url path='/admin/customers'}">{intl l="Customers"}</a></li>
+            </ul>
 
             {module_include location='customer_top'}
 

From f50d41b32ce49183a9b9bdcb5a4ad02d2eea1da5 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 11:46:50 +0200
Subject: [PATCH 42/55] Change breadcrumb separator color

---
 templates/admin/default/assets/less/thelia/variables.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/admin/default/assets/less/thelia/variables.less b/templates/admin/default/assets/less/thelia/variables.less
index 35bc931b5..77ef1dfd3 100755
--- a/templates/admin/default/assets/less/thelia/variables.less
+++ b/templates/admin/default/assets/less/thelia/variables.less
@@ -49,5 +49,8 @@
 // Forms
 // -------------------------
 
+@input-border-focus:             @link-color;
 
-@input-border-focus:             @link-color;
\ No newline at end of file
+// Breadcrumbs
+// -------------------------
+@breadcrumb-color:            #333;
\ No newline at end of file

From ae786f2139f80a657bb6fc8e7cb19992ce65e04f Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Wed, 11 Sep 2013 12:14:39 +0200
Subject: [PATCH 43/55] Added process_assets config variable

---
 .../Core/Template/Assets/AsseticHelper.php    | 36 ++++++++++---------
 install/insert.sql                            |  4 +--
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
index 294fa9e92..349fa178a 100755
--- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
+++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
@@ -29,6 +29,7 @@ use Assetic\Filter;
 use Assetic\Factory\AssetFactory;
 use Assetic\Factory\Worker\CacheBustingWorker;
 use Assetic\AssetWriter;
+use Thelia\Model\ConfigQuery;
 
 /**
  * This class is a simple helper for generating assets using Assetic.
@@ -124,27 +125,30 @@ class AsseticHelper
         //
         //     before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files.
         //
-        if (/*$dev_mode == true || */! file_exists($target_file)) {
+        if ($dev_mode == true || ! file_exists($target_file)) {
 
-            // Delete previous version of the file
-            list($commonPart, $dummy) = explode('-', $asset_target_path);
+            if (ConfigQuery::read('process_assets', true)) {
 
-            foreach (glob("$output_path/$commonPart-*") as $filename) {
-                @unlink($filename);
-            }
+                // Delete previous version of the file
+                list($commonPart, $dummy) = explode('-', $asset_target_path);
 
-            // Apply filters now
-            foreach ($filter_list as $filter) {
-                if ('?' != $filter[0]) {
-                    $asset->ensureFilter($fm->get($filter));
-                } elseif (!$debug) {
-                    $asset->ensureFilter($fm->get(substr($filter, 1)));
+                foreach (glob("$output_path/$commonPart-*") as $filename) {
+                    @unlink($filename);
                 }
+
+                // Apply filters now
+                foreach ($filter_list as $filter) {
+                    if ('?' != $filter[0]) {
+                        $asset->ensureFilter($fm->get($filter));
+                    } elseif (!$debug) {
+                        $asset->ensureFilter($fm->get(substr($filter, 1)));
+                    }
+                }
+
+                $writer = new AssetWriter($output_path);
+
+                $writer->writeAsset($asset);
             }
-
-            $writer = new AssetWriter($output_path);
-
-            $writer->writeAsset($asset);
         }
 
         return rtrim($output_url, '/').'/'.$asset_target_path;
diff --git a/install/insert.sql b/install/insert.sql
index da1414ce3..4ef9de276 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -17,8 +17,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('image_cache_dir_from_web_root', 'cache/images', 0, 0, NOW(), NOW()),
 ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()),
 ('page_not_found_view', '404.html', 0, 0, NOW(), NOW()),
-('use_tax_free_amounts', 1, 1, 0, NOW(), NOW());
-
+('use_tax_free_amounts', '1', 0, 0, NOW(), NOW());
+('process_assets', '1', 0, 0, NOW(), NOW());
 
 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES
 (1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW());

From d21e4532c9697b1428147083b5acf144da48316c Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 13:32:21 +0200
Subject: [PATCH 44/55] - Add creation address form - Add addresses list - Add
 update address form

---
 core/lib/Thelia/Form/AddressCreateForm.php |  68 +++-
 core/lib/Thelia/Form/AddressUpdateForm.php | 107 ++++++
 templates/admin/default/assets/js/main.js  |   5 +
 templates/admin/default/customer-edit.html | 382 ++++++++++++++++++++-
 4 files changed, 542 insertions(+), 20 deletions(-)

diff --git a/core/lib/Thelia/Form/AddressCreateForm.php b/core/lib/Thelia/Form/AddressCreateForm.php
index 472a7429c..ed1750047 100644
--- a/core/lib/Thelia/Form/AddressCreateForm.php
+++ b/core/lib/Thelia/Form/AddressCreateForm.php
@@ -23,6 +23,7 @@
 
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class AddressCreateForm
@@ -59,65 +60,104 @@ class AddressCreateForm extends BaseForm
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "address name",
+                "label" => Translator::getInstance()->trans("Address label *"),
+                "label_attr" => array(
+                    "for" => "label_create"
+                ),
                 "required" => true
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "title"
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title_create"
+                )
             ))
             ->add("firstname", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "first name"
+                "label" => Translator::getInstance()->trans("Firstname"),
+                "label_attr" => array(
+                    "for" => "firstname_create"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "last name"
+                "label" => Translator::getInstance()->trans("Lastname"),
+                "label_attr" => array(
+                    "for" => "lastname_create"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "address"
+                "label" => Translator::getInstance()->trans("Street Address"),
+                "label_attr" => array(
+                    "for" => "address1_create"
+                )
             ))
-            ->add("address2", "text", array(
-                "label" => "address (line 2)"
+            ->add("address2", "text", array(                
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address2_create"
+                )
             ))
             ->add("address3", "text", array(
-                "label" => "address (line 3)"
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address3_create"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode_create"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "city"
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city_create"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "country"
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country_create"
+                )
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone_create"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone_create"
+                )
             ))
             ->add("company", "text", array(
-                "label" => "company"
+                "label" => Translator::getInstance()->trans("Compagny"),
+                "label_attr" => array(
+                    "for" => "company_create"
+                )
             ))
             ;
     }
diff --git a/core/lib/Thelia/Form/AddressUpdateForm.php b/core/lib/Thelia/Form/AddressUpdateForm.php
index 556841261..4fcf6e29c 100644
--- a/core/lib/Thelia/Form/AddressUpdateForm.php
+++ b/core/lib/Thelia/Form/AddressUpdateForm.php
@@ -23,6 +23,7 @@
 
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class AddressUpdateForm
@@ -55,6 +56,112 @@ class AddressUpdateForm extends AddressCreateForm
     {
         parent::buildForm();
 
+        $this->formBuilder
+            ->add("label", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Address label *"),
+                "label_attr" => array(
+                    "for" => "label_update"
+                ),
+                "required" => true
+            ))
+            ->add("title", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title_update"
+                )
+            ))
+            ->add("firstname", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Firstname"),
+                "label_attr" => array(
+                    "for" => "firstname_update"
+                )
+            ))
+            ->add("lastname", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Lastname"),
+                "label_attr" => array(
+                    "for" => "lastname_update"
+                )
+            ))
+            ->add("address1", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Street Address"),
+                "label_attr" => array(
+                    "for" => "address1_update"
+                )
+            ))
+            ->add("address2", "text", array(                
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address2_update"
+                )
+            ))
+            ->add("address3", "text", array(
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address3_update"
+                )
+            ))
+            ->add("zipcode", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode_update"
+                )
+            ))
+            ->add("city", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city_update"
+                )
+            ))
+            ->add("country", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country_update"
+                )
+            ))
+            ->add("phone", "text", array(
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone_update"
+                )
+            ))
+            ->add("cellphone", "text", array(
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone_update"
+                )
+            ))
+            ->add("company", "text", array(
+                "label" => Translator::getInstance()->trans("Compagny"),
+                "label_attr" => array(
+                    "for" => "company_update"
+                )
+            ))
+            ;
+
     }
 
     /**
diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js
index c8fc1a7b7..d472a22a9 100644
--- a/templates/admin/default/assets/js/main.js
+++ b/templates/admin/default/assets/js/main.js
@@ -69,6 +69,11 @@
             
         }
 
+        // -- Bootstrap tooltip --
+        if($('[rel="tooltip"]').length){            
+            $('[rel="tooltip"]').tooltip();
+        }
+
         // -- Confirm Box --
         if($('[data-toggle="confirm"]').length){
             $('[data-toggle="confirm"]').click(function(e){		
diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
index d3f9b6bc5..b4acac7ae 100644
--- a/templates/admin/default/customer-edit.html
+++ b/templates/admin/default/customer-edit.html
@@ -45,6 +45,7 @@
         					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 
                                             <div class="col-md-6">                                                
+                                                <p class="title title-without-tabs">{intl l="Customer informations"}</p>
 
                                                 {form_field form=$form field='title'}                
                                                     <div class="form-group {if $error}has-error{/if}">
@@ -70,12 +71,11 @@
                                                         <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
                                                         <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
                                                     </div>
-                                                {/form_field}                                                                                            
+                                                {/form_field}
 
-                                            </div>
-
-                                            <div class="col-md-6">
-                                                {loop name="address" type="address" customer="$customer_id" backend_context="1"}
+                                                {loop name="address" type="address" customer="$customer_id" backend_context="1" default="true"}
+                                                    
+                                                    <p class="title title-without-tabs">{intl l="Default address"}</p>
 
                                                     {form_field form=$form field='address1'}
                                                         <div class="form-group {if $error}has-error{/if}">
@@ -121,7 +121,111 @@
                                                         </div>
                                                     {/form_field} 
 
-                                                {/loop}
+                                                {/loop}                                                                                        
+
+                                            </div>
+
+                                            <div class="col-md-6">
+                                                <p class="title title-without-tabs clearfix">
+                                                    {intl l="Other addresses"}
+                                                    <span class="pull-right">                                                        
+                                                        <a class="btn btn-default btn-primary" title="{intl l='Add a new address'}" href="#address_creation_dialog" data-toggle="modal">
+                                                            <span class="glyphicon glyphicon-plus-sign"></span>
+                                                        </a>
+                                                    </span>
+                                                </p>
+
+                                                <table class="table table-bordered table-striped">
+                                                    <thead>
+                                                        <tr>
+                                                            <th>{intl l="Address"}</th>
+                                                            <th>{intl l="Actions"}</th>
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody>
+                                                        <tr>
+                                                            <td>
+                                                                <address>
+                                                                    <strong>Twitter, Inc.</strong><br>
+                                                                    795 Folsom Ave, Suite 600<br>
+                                                                    San Francisco, CA 94107<br>
+                                                                    <abbr title="Phone">P:</abbr> (123) 456-7890
+                                                                </address>
+                                                            </td>
+                                                            <td>
+                                                                <div class="btn-group">
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-edit"></span>
+                                                                    </a>
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
+                                                                        <span class="glyphicon glyphicon-pushpin"></span>
+                                                                    </a>
+
+                                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-trash"></span>
+                                                                    </a>
+                                                                    
+                                                                </div>
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>
+                                                                <address>
+                                                                    <strong>Twitter, Inc.</strong><br>
+                                                                    795 Folsom Ave, Suite 600<br>
+                                                                    San Francisco, CA 94107<br>
+                                                                    <abbr title="Phone">P:</abbr> (123) 456-7890
+                                                                </address>
+                                                            </td>
+                                                            <td>
+                                                                <div class="btn-group">
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-edit"></span>
+                                                                    </a>
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-pushpin"></span>
+                                                                    </a>
+
+                                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-trash"></span>
+                                                                    </a>
+                                                                    
+                                                                </div>
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>
+                                                                <address>
+                                                                    <strong>Twitter, Inc.</strong><br>
+                                                                    795 Folsom Ave, Suite 600<br>
+                                                                    San Francisco, CA 94107<br>
+                                                                    <abbr title="Phone">P:</abbr> (123) 456-7890
+                                                                </address>
+                                                            </td>
+                                                            <td>
+                                                                <div class="btn-group">
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-edit"></span>
+                                                                    </a>
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-pushpin"></span>
+                                                                    </a>
+
+                                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-trash"></span>
+                                                                    </a>
+                                                                    
+                                                                </div>
+                                                            </td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
                                             </div>
 
                                         </form>
@@ -149,4 +253,270 @@
 
         </div>
     </div>
+
+
+    {* Add an Address *}
+
+    {form name="thelia.address.create"}
+        
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "address_creation_dialog"}
+            
+            {form_hidden_fields form=$form}
+                    
+            {form_field form=$form field='label'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Label'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='company'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Company'}">
+                </div>
+            {/form_field}
+            
+            {form_field form=$form field='title'}                
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="title" name="title1"}
+                            <option value="{$ID}">{$LONG}</option>
+                        {/loop}
+                    </select>                    
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='firstname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='lastname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='address1'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address2'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address3'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='zipcode'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='city'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='country'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="country" name="country1"}
+                            <option value="{$ID}">{$TITLE}</option>
+                        {/loop}
+                    </select>
+                </div>
+            {/form_field}         
+
+        {/capture}
+    
+        {include
+            file = "includes/generic-create-dialog.html"
+
+            dialog_id    = "address_creation_dialog"
+            dialog_title = {intl l="Create an address"}
+            dialog_body  = {$smarty.capture.address_creation_dialog nofilter}
+
+            dialog_ok_label     = {intl l="Create this address"}
+            dialog_cancel_label = {intl l="Cancel"}
+
+            form_action        = {url path='/admin/address/create'}
+            form_enctype       = {form_enctype form=$form}
+            form_error_message = $form_error_message
+        }
+
+    {/form}
+
+    {* Update an Address *}
+
+    {form name="thelia.address.update"}
+        
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "edit_address_dialog"}
+            
+            {form_hidden_fields form=$form}
+                    
+            {form_field form=$form field='label'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Label'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='company'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Company'}">
+                </div>
+            {/form_field}
+            
+            {form_field form=$form field='title'}                
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="title" name="title1"}
+                            <option value="{$ID}">{$LONG}</option>
+                        {/loop}
+                    </select>                    
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='firstname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='lastname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='address1'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address2'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address3'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='zipcode'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='city'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='country'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="country" name="country1"}
+                            <option value="{$ID}">{$TITLE}</option>
+                        {/loop}
+                    </select>
+                </div>
+            {/form_field}         
+
+        {/capture}
+    
+        {include
+            file = "includes/generic-create-dialog.html"
+
+            dialog_id    = "edit_address_dialog"
+            dialog_title = {intl l="Edit an address"}
+            dialog_body  = {$smarty.capture.edit_address_dialog nofilter}
+
+            dialog_ok_label     = {intl l="Edit this address"}
+            dialog_cancel_label = {intl l="Cancel"}
+
+            form_action        = {url path='/admin/address/update'}
+            form_enctype       = {form_enctype form=$form}
+            form_error_message = $form_error_message
+        }
+
+    {/form}
+    
+    
+    {* Default confirmation dialog *}
+
+    {capture "use_address_dialog"}
+        <input type="hidden" name="address_id" id="address_use_id" value="" />
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "use_address_dialog"
+        dialog_title    = {intl l="Use address by default"}
+        dialog_message  = {intl l="Do you really want to use this address by default ?"}
+
+        form_action         = {url path='/admin/address/use'}
+        form_content        = {$smarty.capture.use_address_dialog nofilter}
+    }
+
+    {* Delete confirmation dialog *}
+
+    {capture "delete_address_dialog"}
+        <input type="hidden" name="address_id" id="address_delete_id" value="" />
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_address_dialog"
+        dialog_title    = {intl l="Delete address"}
+        dialog_message  = {intl l="Do you really want to delete this address ?"}
+
+        form_action         = {url path='/admin/address/delete'}
+        form_content        = {$smarty.capture.delete_dialog nofilter}
+    }
+{/block}
+
+{block name="javascript-initialization"}
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 {/block}
\ No newline at end of file

From e02ed4d6549ac72e0d42a03c4206be634c1cb8ef Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 14:36:32 +0200
Subject: [PATCH 45/55] Add tooltip

---
 templates/admin/default/customer-edit.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
index b4acac7ae..c512bb056 100644
--- a/templates/admin/default/customer-edit.html
+++ b/templates/admin/default/customer-edit.html
@@ -186,7 +186,7 @@
                                                                         <span class="glyphicon glyphicon-edit"></span>
                                                                     </a>
                                                                     
-                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal">
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
                                                                         <span class="glyphicon glyphicon-pushpin"></span>
                                                                     </a>
 
@@ -213,7 +213,7 @@
                                                                         <span class="glyphicon glyphicon-edit"></span>
                                                                     </a>
                                                                     
-                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal">
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
                                                                         <span class="glyphicon glyphicon-pushpin"></span>
                                                                     </a>
 

From a9dae509c766a0ef0b2838c8cb5a81bcb68ca5c9 Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 11 Sep 2013 14:40:55 +0200
Subject: [PATCH 46/55] WIP - Coupon Add/Edit/Delete rule AJAX - add tests
 casper JS

---
 .../Tests/Functionnal/casperjs/conf/dit.js    |   3 +
 .../Tests/Functionnal/casperjs/conf/local.js  |   3 +
 .../Tests/Functionnal/casperjs/conf/uat.js    |   3 +
 .../Functionnal/casperjs/exe/00_parameters.js |  12 ++
 .../Functionnal/casperjs/exe/10_login.js      |  25 +++
 .../Thelia/Tests/Functionnal/casperjs/run.sh  |  26 +++
 .../Tests/Functionnal/casperjs/run_ci.sh      |   4 +
 templates/admin/default/assets/js/coupon.js   | 148 ++++++++++++++++
 templates/admin/default/coupon-update.html    | 161 +++---------------
 .../admin/default/coupon/rule-input-ajax.html |  20 ++-
 10 files changed, 257 insertions(+), 148 deletions(-)
 create mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js
 create mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/conf/local.js
 create mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js
 create mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/exe/00_parameters.js
 create mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js
 create mode 100755 core/lib/Thelia/Tests/Functionnal/casperjs/run.sh
 create mode 100755 core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh
 create mode 100644 templates/admin/default/assets/js/coupon.js

diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js
new file mode 100644
index 000000000..b89267246
--- /dev/null
+++ b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js
@@ -0,0 +1,3 @@
+//DIT = Environnement d'intégration
+var copark_base_url = 'http://ws.copark.dit.linux.thelia.fr/';
+casper.test.done(0);
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/local.js b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/local.js
new file mode 100644
index 000000000..366d297f2
--- /dev/null
+++ b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/local.js
@@ -0,0 +1,3 @@
+//LOCAL = ton pc
+var thelia2_base_url = 'http://www.thelia2.dev/index.php/';
+casper.test.done(0);
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js
new file mode 100644
index 000000000..02b753869
--- /dev/null
+++ b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js
@@ -0,0 +1,3 @@
+//UAT = Recette client
+var copark_base_url = 'http://ws.copark.uat.openstudio.fr/';
+casper.test.done(0);
\ No newline at end of file
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/exe/00_parameters.js b/core/lib/Thelia/Tests/Functionnal/casperjs/exe/00_parameters.js
new file mode 100644
index 000000000..81b980d41
--- /dev/null
+++ b/core/lib/Thelia/Tests/Functionnal/casperjs/exe/00_parameters.js
@@ -0,0 +1,12 @@
+
+casper.test.comment('Please edit 00_parameters.js to add your configuration');
+
+var thelia2_login_admin_url = thelia2_base_url + 'admin/login';
+
+
+//var findMyId = /([0-9]+)$/;
+//var currentId;
+
+casper.test.comment('Variables are set');
+
+casper.test.done(0);
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js b/core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js
new file mode 100644
index 000000000..c9c4095db
--- /dev/null
+++ b/core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js
@@ -0,0 +1,25 @@
+casper.test.comment('Testing login');
+
+casper.start(thelia2_login_admin_url, function() {
+    this.echo('\nLOGIN');
+    this.test.assertTitle('Welcome - Thelia Back Office', 'Web page title OK');
+    this.sendKeys('form[action*="checklogin"] input[name="thelia_admin_login[username]"]', 'thelia2');
+    this.sendKeys('form[action*="checklogin"] input[name="thelia_admin_login[password]"]', 'thelia2');
+    this.click('form[action*="checklogin"] input[type="submit"]');
+});
+
+casper.wait(1000, function() {
+    this.echo("\nWaiting....");
+});
+
+casper.then(function(){
+    this.echo('\nDASHBOARD');
+    console.log('Now on : ' + this.getCurrentUrl());
+    this.test.assertTitle('Back-office home - Thelia Back Office', 'Web page title OK');
+    this.test.assertSelectorHasText('#wrapper > div', ' 			This is the administration home page. Put some interesting statistics here, and display useful information :) 			', 'Web page main content OK');
+});
+
+//RUN
+casper.run(function() {
+    this.test.done();
+});
\ No newline at end of file
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/run.sh b/core/lib/Thelia/Tests/Functionnal/casperjs/run.sh
new file mode 100755
index 000000000..6e054b152
--- /dev/null
+++ b/core/lib/Thelia/Tests/Functionnal/casperjs/run.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# @author Guillaume MOREL
+
+echo "Force dropping database. All data will be lost."
+
+cd local/config/
+
+echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n"
+../../bin/propel build -v --output-dir=../../core/lib/
+
+echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n"
+../../bin/propel sql:build -v --output-dir=../../install/
+
+echo -e "\n\e[01;34m[INFO] Reloaded Thelia2 database\e[00m\n"
+cd ../..
+rm install/sqldb.map
+php Thelia thelia:dev:reloadDB
+
+echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n"
+php install/faker.php
+
+echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n"
+php Thelia thelia:create-admin --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2
+
+# casperjs test ./exe --pre=./conf/local.js --direct
+
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh b/core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh
new file mode 100755
index 000000000..785d8ee49
--- /dev/null
+++ b/core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# @author Quentin Dufour
+
+/usrcasperjs test ./exe --pre=./conf/dit.js --xunit=reports/report.xml
diff --git a/templates/admin/default/assets/js/coupon.js b/templates/admin/default/assets/js/coupon.js
new file mode 100644
index 000000000..5c52aa097
--- /dev/null
+++ b/templates/admin/default/assets/js/coupon.js
@@ -0,0 +1,148 @@
+$(function($){
+
+    // Clean array from deleteValue (undefined) keys
+    Array.prototype.clean = function(deleteValue) {
+        for (var i = 0; i < this.length; i++) {
+            if (this[i] == deleteValue) {
+                this.splice(i, 1);
+                i--;
+            }
+        }
+        return this;
+    };
+
+    // Remove 1 Rule then Save Rules AJAX
+    couponManager.removeRuleAjax = function(id) {
+        // Delete rule in temporary array
+        delete couponManager.rulesToSave[id];
+        couponManager.rulesToSave.clean(undefined);
+
+        // Save
+        couponManager.saveRuleAjax();
+    };
+
+    // Add 1 Rule / or update the temporary Rules array then Save Rules via AJAX
+    couponManager.addRuleAjax = function(id) {
+        console.log('addRuleAjax  '+ id);
+        // If create
+        if(!id) {
+            console.log('pushing');
+            couponManager.rulesToSave.push(couponManager.ruleToSave);
+        } else { // else update
+            console.log('editing ' + id);
+            couponManager.rulesToSave[id] = couponManager.ruleToSave;
+            // reset edit mode to off
+            couponManager.ruleIdToUpdate = false;
+        }
+
+        // Save
+        couponManager.saveRuleAjax();
+    };
+
+    // Set rule inputs to allow editing
+    couponManager.updateRuleAjax = function(id) {
+        couponManager.ruleToUpdate = couponManager.rulesToSave[id];
+        console.log('Set id to edit to ' + id);
+        couponManager.ruleIdToUpdate = id;
+
+        // Deleting this rule, we will reset it
+        delete couponManager.rulesToSave[id];
+
+        // Set the rule selector
+        $("#category-rule option").filter(function() {
+            return $(this).val() == couponManager.ruleToUpdate.serviceId;
+        }).prop('selected', true);
+
+        // Force rule input refresh
+        couponManager.loadRuleInputs(couponManager.ruleToUpdate.serviceId, function() {
+            couponManager.fillInRuleInputs();
+        });
+    };
+
+    // Fill in rule inputs
+    couponManager.fillInRuleInputs = function() {
+        console.log('fillInRuleInputs with');
+        console.log(couponManager.ruleToUpdate);
+        var operatorId = null;
+        var valueId = null;
+        var idName = null;
+
+        for (idName in couponManager.ruleToUpdate.operators) {
+            // Setting idName operator select
+            operatorId = idName + '-operator';
+            $('#' + operatorId).val(couponManager.ruleToUpdate.operators[idName]);
+
+            valueId = idName + '-value';
+            // Setting idName value input
+            $('#' + valueId).val(couponManager.ruleToUpdate.values[idName]);
+        }
+        couponManager.ruleToSave = couponManager.ruleToUpdate;
+
+        var id = couponManager.ruleIdToUpdate;
+        console.log('id to edit = ' + id);
+        if(id) {
+            console.log('setint rulesToSave[' + id + ']');
+            console.log(couponManager.ruleToSave);
+            couponManager.rulesToSave[id] = couponManager.ruleToSave;
+        }
+    };
+
+    // Save rules on click
+    couponManager.onClickSaveRule = function() {
+        $('#constraint-save-btn').on('click', function () {
+            couponManager.addRuleAjax(couponManager.ruleIdToUpdate);
+        });
+    };
+    couponManager.onClickSaveRule();
+
+    // Remove rule on click
+    couponManager.onClickDeleteRule = function() {
+        $('.constraint-delete-btn').on('click', function (e) {
+            e.preventDefault();
+            var $this = $(this);
+            couponManager.removeRuleAjax($this.attr('data-int'));
+        });
+    };
+    couponManager.onClickDeleteRule();
+
+    // Update rule on click
+    couponManager.onClickUpdateRule = function() {
+        $('.constraint-update-btn').on('click', function (e) {
+            e.preventDefault();
+            var $this = $(this);
+            couponManager.updateRuleAjax($this.attr('data-int'));
+
+            // Hide row being updated
+            $this.parent().parent().remove();
+        });
+    };
+    couponManager.onClickUpdateRule();
+
+    // Reload effect inputs when changing effect
+    couponManager.onEffectChange = function() {
+        $('#effect').on('change', function () {
+            var optionSelected = $("option:selected", this);
+            $('#effectToolTip').html(optionSelected.attr("data-description"));
+        });
+    };
+    couponManager.onEffectChange();
+
+    // Reload rule inputs when changing effect
+    couponManager.onRuleChange = function() {
+        $('#category-rule').on('change', function () {
+            couponManager.loadRuleInputs($(this).val(), function(ruleToSave) {});
+        });
+    };
+    couponManager.onRuleChange();
+
+    // Fill in ready to be saved rule array
+    // var onInputsChange = function()
+    // In AJAX response
+
+});
+
+// Rule to save
+
+var couponManager = {};
+couponManager.ruleToSave = {};
+couponManager.ruleIdToUpdate = false;
\ No newline at end of file
diff --git a/templates/admin/default/coupon-update.html b/templates/admin/default/coupon-update.html
index 3895475b4..925296aae 100755
--- a/templates/admin/default/coupon-update.html
+++ b/templates/admin/default/coupon-update.html
@@ -37,24 +37,19 @@
         <script src="{$asset_url}"></script>
     {/javascripts}
 
+    {javascripts file='assets/js/coupon.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
     <script>
         $(function($){
             miniBrowser(0, '/test_to_remove/datas_coupon_edit.json');
 
-            Array.prototype.clean = function(deleteValue) {
-                for (var i = 0; i < this.length; i++) {
-                    if (this[i] == deleteValue) {
-                        this.splice(i, 1);
-                        i--;
-                    }
-                }
-                return this;
-            };
-
             // Init Rules
-            var initRules = function() {
+            couponManager.initRules = function() {
                 var rules = [];
                 {foreach from=$rulesObject key=k item=rule}
+                    // Init rule
                     var rule = {};
                     rule['serviceId'] = '{$rule.serviceId nofilter}';
                     rule['operators'] = {};
@@ -64,19 +59,24 @@
                         rule['operators']['{$input nofilter}'] = '{$operator nofilter}';
                         rule['values']['{$input nofilter}'] = '{$rule.validators.setValues[$input] nofilter}';
                     {/foreach}
+
+                    // Add rule
                     rules.push(rule);
                 {/foreach}
 
                 return rules;
-            }
+            };
 
             // Save Rules AJAX
-            var saveRuleAjax = function() {
+            couponManager.saveRuleAjax = function() {
+                $('#constraint-add-operators-values').html('<div class="loading" ></div>');
+                console.log('about to save');
+                console.log(couponManager.rulesToSave);
                 var $url = '{$urlAjaxUpdateRules}';
                 $.ajax({
                     type: "POST",
                     url: $url,
-                    data: {literal}{{/literal}rules:JSON.stringify(rulesToSave){literal}}{/literal},
+                    data: {literal}{{/literal}rules:JSON.stringify(couponManager.rulesToSave){literal}}{/literal},
                     statusCode: {
                         404: function() {
                             $('#constraint-add-operators-values').html(
@@ -87,72 +87,13 @@
                 }).done(function(data) {
                     $('#constraint-list').html(data);
                     $('#constraint-add-operators-values').html('');
+                    couponManager.onClickUpdateRule();
+                    couponManager.onClickDeleteRule();
                 });
-            }
-
-            // Remove 1 Rule then Save Rules AJAX
-            var removeRuleAjax = function(id) {
-                // Delete rule in temporary array
-                delete rulesToSave[id];
-                rulesToSave.clean(undefined);
-
-                // Save
-                saveRuleAjax();
-            }
-
-            // Add 1 Rule / or update the temporary Rules array then Save Rules via AJAX
-            var addRuleAjax = function(id) {
-                // If update
-                if(typeof id === 'number' && id % 1 == 0) {
-                    rulesToSave[id] = ruleToSave;
-                } else { // If create
-                    rulesToSave.push(ruleToSave);
-                }
-
-                // Save
-                saveRuleAjax();
-            }
-
-            // Set rule inputs to allow editing
-            var updateRuleAjax = function(id) {
-                ruleToSave = rulesToSave[id];
-                var ruleToUpdate = ruleToSave;
-
-                // Deleting this rule, we will reset it
-                delete rulesToSave[id];
-
-                // Set the rule seletor
-                $("#category-rule option").filter(function() {
-                    return $(this).val() == ruleToSave.serviceId;
-                }).prop('selected', true);
-
-                // Force rule input refresh
-                loadRuleInputs(ruleToSave.serviceId, ruleToUpdate, function(ruleToUpdate) {
-                    fillInRuleInputs(ruleToUpdate);
-                });
-            }
-
-            // Fill in rule inputs
-            var fillInRuleInputs = function(ruleToUpdate) {
-                var valueId = null;
-                var operatorId = null;
-
-                for (idName in ruleToUpdate.operators) {
-                    // Setting idName operator input
-                    operatorId = idName + '-operator';
-                    $('#' + operatorId).val(ruleToUpdate.operators[idName]);
-                    // Setting idName value input
-                    valueId = idName + '-value';
-                    $('#' + valueId).val(ruleToUpdate.values[idName]);
-                }
-            }
-
-
-
-
+            };
 
             // Reload rule inputs
-            var loadRuleInputs = function(ruleId, ruleToSave, callBack) {
+            couponManager.loadRuleInputs = function(ruleId, callBack) {
                 $('#constraint-add-operators-values').html('<div class="loading" ></div>');
                 var url = "{$urlAjaxGetRuleInput}";
                 url = url.replace('ruleId', ruleId)
@@ -167,71 +108,13 @@
                     }
                 }).done(function(data) {
                     $('#constraint-add-operators-values').html(data);
-                    return callBack(ruleToSave);
+
+                    return callBack();
                 });
-            }
-
-
-            // Save rules on click
-            var onClickSaveRule = function() {
-                $('#constraint-save-btn').on('click', function (e) {
-                    addRuleAjax();
-                });
-            }
-            onClickSaveRule();
-
-            // Remove rule on click
-            var onClickDeleteRule = function() {
-                $('.constraint-delete-btn').on('click', function (e) {
-                    e.preventDefault();
-                    var $this = $(this);
-                    removeRuleAjax($this.attr('data-int'));
-                });
-            }
-            onClickDeleteRule();
-
-            // Update rule on click
-            var onClickUpdateRule = function() {
-                $('.constraint-update-btn').on('click', function (e) {
-                    e.preventDefault();
-                    var $this = $(this);
-                    updateRuleAjax($this.attr('data-int'));
-
-                    // Hide row being updated
-                    $this.parent().parent().remove();
-                });
-            }
-            onClickUpdateRule();
-
-            // Reload effect inputs when changing effect
-            var onEffectChange = function() {
-                $('#effect').on('change', function (e) {
-                    var optionSelected = $("option:selected", this);
-                    $('#effectToolTip').html(optionSelected.attr("data-description"));
-                });
-            }
-            onEffectChange();
-
-            // Reload rule inputs when changing effect
-            var onRuleChange = function() {
-                $('#category-rule').on('change', function (e) {
-                    loadRuleInputs($(this).val(), null, function(ruleToSave) {literal}{}{/literal});
-                });
-            }
-            onRuleChange();
-
-            // Fill in ready to be saved rule array
-            // var onInputsChange = function()
-            // In AJAX response
-
-
+            };
 
             // Rules which will be saved
-            var rulesToSave = initRules();
+            couponManager.rulesToSave = couponManager.initRules();
         });
-
-        // Rule to save
-        var ruleToSave = {literal}{}{/literal};
-
     </script>
 {/block}
diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html
index 4933c6745..cdf683d21 100644
--- a/templates/admin/default/coupon/rule-input-ajax.html
+++ b/templates/admin/default/coupon/rule-input-ajax.html
@@ -72,29 +72,31 @@
 <script>
 
     // Init Rules to set
-    ruleToSave['serviceId'] = '{$ruleId}';
-    ruleToSave['operators'] = {literal}{}{/literal};
-    ruleToSave['values'] = {literal}{}{/literal};
+    couponManager.ruleToSave['serviceId'] = '{$ruleId}';
+    couponManager.ruleToSave['operators'] = {literal}{}{/literal};
+    couponManager.ruleToSave['values'] = {literal}{}{/literal};
 {foreach from=$inputs.inputs key=name item=input}
-    ruleToSave['operators']['{$name nofilter}'] = '{foreach from=$inputs.inputs[$name].availableOperators key=keyOperator item=valueOperator name=operators}{if $smarty.foreach.operators.first}{$keyOperator nofilter}{/if}{/foreach}';
-    ruleToSave['values']['{$name nofilter}'] = '{if count($inputs.inputs[$name].availableValues) != 0}{foreach from=$inputs.inputs[$name].availableValues key=keyValue item=valueValue name=values}{if $smarty.foreach.values.first}{$keyValue nofilter}{/if}{/foreach}{else}to set{/if}';
+    couponManager.ruleToSave['operators']['{$name nofilter}'] = '{foreach from=$inputs.inputs[$name].availableOperators key=keyOperator item=valueOperator name=operators}{if $smarty.foreach.operators.first}{$keyOperator nofilter}{/if}{/foreach}';
+    couponManager.ruleToSave['values']['{$name nofilter}'] = '{if count($inputs.inputs[$name].availableValues) != 0}{foreach from=$inputs.inputs[$name].availableValues key=keyValue item=valueValue name=values}{if $smarty.foreach.values.first}{$keyValue nofilter}{/if}{/foreach}{else}to set{/if}';
 {/foreach}
 
 
     // Fill in ready to be saved rule array
-    var onInputsChange = function() {literal}{{/literal}
+    couponManager.onInputsChange = function() {literal}{{/literal}
 {foreach from=$inputs.inputs key=name item=input}
         // Operator selector
         $('#{$name}-operator').change(function (e) {
+            console.log('changin operator');
             var $this = $(this);
-            ruleToSave['operators']['{$name nofilter}'] = $this.val();
+            couponManager.ruleToSave['operators']['{$name nofilter}'] = $this.val();
         });
         // Value input
         $('#{$name}-value').change(function (e) {
+            console.log('changin value');
             var $this = $(this);
-            ruleToSave['values']['{$name nofilter}'] = $this.val();
+            couponManager.ruleToSave['values']['{$name nofilter}'] = $this.val();
         });
 {/foreach}
     {literal}}{/literal}
-    onInputsChange();
+    couponManager.onInputsChange();
 </script>
\ No newline at end of file

From 870612f51c8a9aba45e79cdeeccb932cfe34e2f4 Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 11 Sep 2013 14:43:09 +0200
Subject: [PATCH 47/55] WIP - Coupon Add/Edit/Delete rule AJAX - add tests
 casper JS

---
 core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js | 3 ---
 core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js | 3 ---
 core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh   | 4 ----
 3 files changed, 10 deletions(-)
 delete mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js
 delete mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js
 delete mode 100755 core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh

diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js
deleted file mode 100644
index b89267246..000000000
--- a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/dit.js
+++ /dev/null
@@ -1,3 +0,0 @@
-//DIT = Environnement d'intégration
-var copark_base_url = 'http://ws.copark.dit.linux.thelia.fr/';
-casper.test.done(0);
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js b/core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js
deleted file mode 100644
index 02b753869..000000000
--- a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/uat.js
+++ /dev/null
@@ -1,3 +0,0 @@
-//UAT = Recette client
-var copark_base_url = 'http://ws.copark.uat.openstudio.fr/';
-casper.test.done(0);
\ No newline at end of file
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh b/core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh
deleted file mode 100755
index 785d8ee49..000000000
--- a/core/lib/Thelia/Tests/Functionnal/casperjs/run_ci.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# @author Quentin Dufour
-
-/usrcasperjs test ./exe --pre=./conf/dit.js --xunit=reports/report.xml

From 36d2b873ff9d460dac737e8210c5771f3a5cd4ad Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Wed, 11 Sep 2013 15:08:56 +0200
Subject: [PATCH 48/55] Removed a redondant "use"

---
 core/lib/Thelia/Controller/Admin/BaseAdminController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index f2d76f5ab..4fb8bf31e 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -25,7 +25,6 @@ namespace Thelia\Controller\Admin;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Router;
 use Thelia\Controller\BaseController;
 use Symfony\Component\HttpFoundation\Response;
 use Thelia\Core\Security\Exception\AuthorizationException;

From 59e1981e9ff59d52852a27b5d8109e3c5e285d2a Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 11 Sep 2013 15:23:04 +0200
Subject: [PATCH 49/55] - Add orders view route - Add view & action for orders
 index

---
 .../Thelia/Config/Resources/routing/admin.xml |   8 +
 .../Controller/Admin/OrderController.php      |  39 +++++
 templates/admin/default/orders.html           | 159 ++++++++++++++++++
 3 files changed, 206 insertions(+)
 create mode 100644 core/lib/Thelia/Controller/Admin/OrderController.php
 create mode 100644 templates/admin/default/orders.html

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 8eaeb2547..5e34aec39 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -44,6 +44,14 @@
 
     <!-- end Customer rule management -->
 
+    <!-- Order rule management -->
+
+    <route id="admin.order" path="/admin/order">
+        <default key="_controller">Thelia\Controller\Admin\OrderController::indexAction</default>
+    </route>    
+
+    <!-- end Customer rule management -->
+
     <!-- Categories management -->
 
     <route id="admin.categories.default" path="/admin/categories">
diff --git a/core/lib/Thelia/Controller/Admin/OrderController.php b/core/lib/Thelia/Controller/Admin/OrderController.php
new file mode 100644
index 000000000..b7e2b00ce
--- /dev/null
+++ b/core/lib/Thelia/Controller/Admin/OrderController.php
@@ -0,0 +1,39 @@
+<?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\Controller\Admin;
+
+/**
+ * Class OrderController
+ * @package Thelia\Controller\Admin
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class OrderController extends BaseAdminController
+{
+    public function indexAction()
+    {
+        if (null !== $response = $this->checkAuth("admin.orders.view")) return $response;
+        return $this->render("orders", array("display_order" => 20));
+    }
+
+}
\ No newline at end of file
diff --git a/templates/admin/default/orders.html b/templates/admin/default/orders.html
new file mode 100644
index 000000000..8693f2a33
--- /dev/null
+++ b/templates/admin/default/orders.html
@@ -0,0 +1,159 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Orders'}{/block}
+
+{block name="check-permissions"}admin.orders.view{/block}
+
+{block name="main-content"}
+<div class="orders">
+
+    <div id="wrapper" class="container">
+
+        <ul class="breadcrumb">
+            <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+            <li><a href="{url path='/admin/orders'}">{intl l="Orders"}</a></li>
+        </ul>
+
+        {module_include location='orders_top'}
+
+        <div class="row">
+            <div class="col-md-12">
+                <form action="{url path='/admin/orders/update-values'}" method="post">
+	                <div class="general-block-decorator">
+	                    <table class="table table-striped table-condensed table-left-aligned">
+	                        <caption class="clearfix">
+	                           {intl l='Orders'}
+	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.orders.create"}
+	                                <a class="btn btn-default btn-primary pull-right" title="{intl l='Create an order'}" href="#creation_dialog">
+	                                    <span class="glyphicon glyphicon-plus-sign"></span>
+	                                </a>
+                            	{/loop}
+	                        </caption>
+                            <thead>
+    	                        <tr>
+    	                           <th>{intl l="Order n°"}</th>
+                                   <th>{intl l="Date & Hour"}</th>
+                                   <th>{intl l="Compagny"}</th>
+                                   <th>{intl l="Name"}</th>
+                                   <th>{intl l="Amount"}</th>
+                                   <th>{intl l="Status"}</th>
+                                   
+                                   {module_include location='orders_table_header'}
+
+                                   <th>{intl l="Actions"}</th>
+    	                        </tr>
+                            </thead>
+
+                            <tbody>    	                        
+    	                            <tr>
+
+    	                               	<td><a href="">01230450123045</a></td>
+    	                               	<td>11/09/2013 10:24:31</td>
+    	                               	<td>Thelia</td>
+    	                               	<td><a href="">Dupont</a></td>
+    	                               	<td>251 &euro;</td>
+    	                               	<td><span class="label label-success">Paid</span></td>
+
+    	                                {module_include location='orders_table_row'}
+
+    	                                <td>
+    	                                    <div class="btn-group">
+
+				                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path='/admin/orders/update/$ID'}"><span class="glyphicon glyphicon-edit"></span></a>
+				                                {/loop}
+
+				                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+				                                {/loop}
+				                            </div>
+    	                                </td>
+    	                            </tr>
+    	                            <tr>
+
+    	                               	<td><a href="">01230450123045</a></td>
+    	                               	<td>11/09/2013 10:24:31</td>
+    	                               	<td>Thelia</td>
+    	                               	<td><a href="">Dupont</a></td>
+    	                               	<td>251 &euro;</td>
+    	                               	<td><span class="label label-danger">Canceled</span></td>
+
+    	                                {module_include location='orders_table_row'}
+
+    	                                <td>
+    	                                    <div class="btn-group">
+
+				                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path='/admin/orders/update/$ID'}"><span class="glyphicon glyphicon-edit"></span></a>
+				                                {/loop}
+
+				                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+				                                {/loop}
+				                            </div>
+    	                                </td>
+    	                            </tr>
+    	                            <tr>
+
+    	                               	<td><a href="">01230450123045</a></td>
+    	                               	<td>11/09/2013 10:24:31</td>
+    	                               	<td>Thelia</td>
+    	                               	<td><a href="">Dupont</a></td>
+    	                               	<td>251 &euro;</td>
+    	                               	<td><span class="label label-info">Current</span></td>
+
+    	                                {module_include location='orders_table_row'}
+
+    	                                <td>
+    	                                    <div class="btn-group">
+
+				                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path='/admin/orders/update/$ID'}"><span class="glyphicon glyphicon-edit"></span></a>
+				                                {/loop}
+
+				                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+				                                {/loop}
+				                            </div>
+    	                                </td>
+    	                            </tr>
+    	                        
+    	                        <!-- <tr>
+    	                           <td colspan="3">
+    	                               <div class="alert alert-info">
+    	                               {intl l="No mailing template has been created yet. Click the + button to create one."}
+    	                               </div>
+    	                           </td>
+    	                        </tr> -->
+    	                        
+                            </tbody>
+	                    </table>
+	                </div>
+                </form>
+            </div>
+        </div>
+
+        {module_include location='orders_bottom'}
+
+    </div>
+</div>
+
+{* Delete order confirmation dialog *}
+
+{capture "delete_order_dialog"}
+    <input type="hidden" name="current_order_id" value="{$current_order_id}" />
+    <input type="hidden" name="order_id" id="delete_order_id" value"" />
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "delete_order_dialog"
+    dialog_title    = {intl l="Delete an order"}
+    dialog_message  = {intl l="Do you really want to delete this order ?"}
+
+    form_action         = {url path='/admin/orders/delete'}
+    form_content        = {$smarty.capture.delete_order_dialog nofilter}
+}
+
+{/block}
\ No newline at end of file

From c8b5b9e9fa9800e387e7a3b9eed5fe3af409b000 Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 11 Sep 2013 15:35:25 +0200
Subject: [PATCH 50/55] Working - add tests casper JS

---
 .../Functionnal/casperjs/exe/10_login.js      | 25 -----------------
 .../casperjs/run.sh => run_casperjs.sh        |  3 +--
 templates/admin/default/login.html            |  4 +--
 .../functionnal}/casperjs/conf/local.js       |  0
 .../casperjs/exe/00_parameters.js             |  0
 tests/functionnal/casperjs/exe/10_login.js    | 27 +++++++++++++++++++
 6 files changed, 30 insertions(+), 29 deletions(-)
 delete mode 100644 core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js
 rename core/lib/Thelia/Tests/Functionnal/casperjs/run.sh => run_casperjs.sh (87%)
 rename {core/lib/Thelia/Tests/Functionnal => tests/functionnal}/casperjs/conf/local.js (100%)
 rename {core/lib/Thelia/Tests/Functionnal => tests/functionnal}/casperjs/exe/00_parameters.js (100%)
 create mode 100644 tests/functionnal/casperjs/exe/10_login.js

diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js b/core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js
deleted file mode 100644
index c9c4095db..000000000
--- a/core/lib/Thelia/Tests/Functionnal/casperjs/exe/10_login.js
+++ /dev/null
@@ -1,25 +0,0 @@
-casper.test.comment('Testing login');
-
-casper.start(thelia2_login_admin_url, function() {
-    this.echo('\nLOGIN');
-    this.test.assertTitle('Welcome - Thelia Back Office', 'Web page title OK');
-    this.sendKeys('form[action*="checklogin"] input[name="thelia_admin_login[username]"]', 'thelia2');
-    this.sendKeys('form[action*="checklogin"] input[name="thelia_admin_login[password]"]', 'thelia2');
-    this.click('form[action*="checklogin"] input[type="submit"]');
-});
-
-casper.wait(1000, function() {
-    this.echo("\nWaiting....");
-});
-
-casper.then(function(){
-    this.echo('\nDASHBOARD');
-    console.log('Now on : ' + this.getCurrentUrl());
-    this.test.assertTitle('Back-office home - Thelia Back Office', 'Web page title OK');
-    this.test.assertSelectorHasText('#wrapper > div', ' 			This is the administration home page. Put some interesting statistics here, and display useful information :) 			', 'Web page main content OK');
-});
-
-//RUN
-casper.run(function() {
-    this.test.done();
-});
\ No newline at end of file
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/run.sh b/run_casperjs.sh
similarity index 87%
rename from core/lib/Thelia/Tests/Functionnal/casperjs/run.sh
rename to run_casperjs.sh
index 6e054b152..88636a9d1 100755
--- a/core/lib/Thelia/Tests/Functionnal/casperjs/run.sh
+++ b/run_casperjs.sh
@@ -22,5 +22,4 @@ php install/faker.php
 echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n"
 php Thelia thelia:create-admin --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2
 
-# casperjs test ./exe --pre=./conf/local.js --direct
-
+casperjs test ./tests/functionnal/casperjs/exe --pre=./tests/functionnal/casperjs/conf/local.js --direct
diff --git a/templates/admin/default/login.html b/templates/admin/default/login.html
index 8815eb982..2b994359c 100755
--- a/templates/admin/default/login.html
+++ b/templates/admin/default/login.html
@@ -28,13 +28,13 @@
 
 	                {form_field form=$form field='username'}
 	                <span {if $error}class="error"{/if}>
-					    <input type="text" class="input" placeholder="{intl l='User name'}" name="{$name}" value="{$value}" {$attr} />
+					    <input type="text" id="username" class="input" placeholder="{intl l='User name'}" name="{$name}" value="{$value}" {$attr} />
 					</span>
 	                {/form_field}
 
 	                {form_field form=$form field='password'}
 	                <span {if $error}class="error"{/if}>
-					    <input type="password" class="input" placeholder="{intl l='Password'}" name="{$name}" {$attr} />
+					    <input type="password" id="password" class="input" placeholder="{intl l='Password'}" name="{$name}" {$attr} />
 					</span>
 	                {/form_field}
 
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/conf/local.js b/tests/functionnal/casperjs/conf/local.js
similarity index 100%
rename from core/lib/Thelia/Tests/Functionnal/casperjs/conf/local.js
rename to tests/functionnal/casperjs/conf/local.js
diff --git a/core/lib/Thelia/Tests/Functionnal/casperjs/exe/00_parameters.js b/tests/functionnal/casperjs/exe/00_parameters.js
similarity index 100%
rename from core/lib/Thelia/Tests/Functionnal/casperjs/exe/00_parameters.js
rename to tests/functionnal/casperjs/exe/00_parameters.js
diff --git a/tests/functionnal/casperjs/exe/10_login.js b/tests/functionnal/casperjs/exe/10_login.js
new file mode 100644
index 000000000..81757168d
--- /dev/null
+++ b/tests/functionnal/casperjs/exe/10_login.js
@@ -0,0 +1,27 @@
+casper.test.comment('Testing login');
+
+casper.start(thelia2_login_admin_url, function() {
+    this.echo('\nLOGIN');
+    this.test.assertTitle('Welcome - Thelia Back Office', 'Web page title OK');
+    this.sendKeys('input#username', 'thelia2');
+    this.sendKeys('input#password', 'thelia2');
+    this.click('form[action*="checklogin"] button[type="submit"]');
+});
+
+casper.wait(1000, function() {
+    this.echo("\nWaiting....");
+});
+
+casper.then(function(){
+    this.echo('\nDASHBOARD');
+
+    console.log('Now on : ' + this.getCurrentUrl());
+    // @todo implement dashboard
+//    this.test.assertTitle('Back-office home - Thelia Back Office', 'Web page title OK');
+//    this.test.assertSelectorHasText('#wrapper > div', ' 			This is the administration home page. Put some interesting statistics here, and display useful information :) 			', 'Web page main content OK');
+});
+
+//RUN
+casper.run(function() {
+    this.test.done();
+});
\ No newline at end of file

From e8a4e56324fc930455f07bf9bfe0fa0dbbdbb715 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 16:21:51 +0200
Subject: [PATCH 51/55] tax engine

---
 .../Thelia/Exception/TaxEngineException.php   |   3 +
 core/lib/Thelia/Exception/TypeException.php   |  39 ++++++
 core/lib/Thelia/Model/Base/Tax.php            | 132 +++++++++++++-----
 core/lib/Thelia/Model/Base/TaxQuery.php       |  79 +++++++----
 core/lib/Thelia/Model/Map/TaxTableMap.php     |  46 +++---
 core/lib/Thelia/Model/Tax.php                 |  37 ++++-
 core/lib/Thelia/Model/TaxRuleQuery.php        |   3 -
 core/lib/Thelia/TaxEngine/Calculator.php      |  18 ++-
 .../Thelia/TaxEngine/TaxType/BaseTaxType.php  |  83 +++++++++++
 .../TaxType/FeatureSlicePercentTaxType.php    |  47 +++++++
 .../TaxEngine/TaxType/PricePercentTaxType.php |  45 ++++++
 .../lib/Thelia/Type/FloatToFloatArrayType.php |  56 ++++++++
 core/lib/Thelia/Type/ModelType.php            |  66 +++++++++
 install/insert.sql                            |   6 +-
 install/thelia.sql                            |   3 +-
 local/config/schema.xml                       |   3 +-
 templates/default_save/product.html           |   2 +-
 17 files changed, 561 insertions(+), 107 deletions(-)
 create mode 100755 core/lib/Thelia/Exception/TypeException.php
 create mode 100755 core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php
 create mode 100755 core/lib/Thelia/TaxEngine/TaxType/FeatureSlicePercentTaxType.php
 create mode 100755 core/lib/Thelia/TaxEngine/TaxType/PricePercentTaxType.php
 create mode 100755 core/lib/Thelia/Type/FloatToFloatArrayType.php
 create mode 100755 core/lib/Thelia/Type/ModelType.php

diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php
index d56862ab6..8ce8561ef 100755
--- a/core/lib/Thelia/Exception/TaxEngineException.php
+++ b/core/lib/Thelia/Exception/TaxEngineException.php
@@ -27,6 +27,9 @@ class TaxEngineException extends \RuntimeException
 {
     const UNKNOWN_EXCEPTION = 0;
 
+    const BAD_RECORDED_TYPE = 101;
+    const BAD_RECORDED_REQUIREMENTS = 102;
+
     const UNDEFINED_PRODUCT = 501;
     const UNDEFINED_COUNTRY = 502;
     const UNDEFINED_TAX_RULES_COLLECTION = 503;
diff --git a/core/lib/Thelia/Exception/TypeException.php b/core/lib/Thelia/Exception/TypeException.php
new file mode 100755
index 000000000..442fffe3e
--- /dev/null
+++ b/core/lib/Thelia/Exception/TypeException.php
@@ -0,0 +1,39 @@
+<?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\Exception;
+
+class TypeException extends \RuntimeException
+{
+    const UNKNOWN_EXCEPTION = 0;
+
+    const MODEL_NOT_FOUND = 404;
+
+    public function __construct($message, $code = null, $previous = null)
+    {
+        if ($code === null) {
+            $code = self::UNKNOWN_EXCEPTION;
+        }
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php
index ed4bb40f7..da674b5cf 100644
--- a/core/lib/Thelia/Model/Base/Tax.php
+++ b/core/lib/Thelia/Model/Base/Tax.php
@@ -66,10 +66,16 @@ abstract class Tax implements ActiveRecordInterface
     protected $id;
 
     /**
-     * The value for the rate field.
-     * @var        double
+     * The value for the type field.
+     * @var        string
      */
-    protected $rate;
+    protected $type;
+
+    /**
+     * The value for the serialized_requirements field.
+     * @var        string
+     */
+    protected $serialized_requirements;
 
     /**
      * The value for the created_at field.
@@ -395,14 +401,25 @@ abstract class Tax implements ActiveRecordInterface
     }
 
     /**
-     * Get the [rate] column value.
+     * Get the [type] column value.
      *
-     * @return   double
+     * @return   string
      */
-    public function getRate()
+    public function getType()
     {
 
-        return $this->rate;
+        return $this->type;
+    }
+
+    /**
+     * Get the [serialized_requirements] column value.
+     *
+     * @return   string
+     */
+    public function getSerializedRequirements()
+    {
+
+        return $this->serialized_requirements;
     }
 
     /**
@@ -467,25 +484,46 @@ abstract class Tax implements ActiveRecordInterface
     } // setId()
 
     /**
-     * Set the value of [rate] column.
+     * Set the value of [type] column.
      *
-     * @param      double $v new value
+     * @param      string $v new value
      * @return   \Thelia\Model\Tax The current object (for fluent API support)
      */
-    public function setRate($v)
+    public function setType($v)
     {
         if ($v !== null) {
-            $v = (double) $v;
+            $v = (string) $v;
         }
 
-        if ($this->rate !== $v) {
-            $this->rate = $v;
-            $this->modifiedColumns[] = TaxTableMap::RATE;
+        if ($this->type !== $v) {
+            $this->type = $v;
+            $this->modifiedColumns[] = TaxTableMap::TYPE;
         }
 
 
         return $this;
-    } // setRate()
+    } // setType()
+
+    /**
+     * Set the value of [serialized_requirements] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\Tax The current object (for fluent API support)
+     */
+    public function setSerializedRequirements($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->serialized_requirements !== $v) {
+            $this->serialized_requirements = $v;
+            $this->modifiedColumns[] = TaxTableMap::SERIALIZED_REQUIREMENTS;
+        }
+
+
+        return $this;
+    } // setSerializedRequirements()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
@@ -569,16 +607,19 @@ abstract class Tax implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
             $this->id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxTableMap::translateFieldName('Rate', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->rate = (null !== $col) ? (double) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxTableMap::translateFieldName('Type', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->type = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxTableMap::translateFieldName('SerializedRequirements', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->serialized_requirements = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : TaxTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -591,7 +632,7 @@ abstract class Tax implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 4; // 4 = TaxTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 5; // 5 = TaxTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\Tax object", 0, $e);
@@ -852,8 +893,11 @@ abstract class Tax implements ActiveRecordInterface
         if ($this->isColumnModified(TaxTableMap::ID)) {
             $modifiedColumns[':p' . $index++]  = 'ID';
         }
-        if ($this->isColumnModified(TaxTableMap::RATE)) {
-            $modifiedColumns[':p' . $index++]  = 'RATE';
+        if ($this->isColumnModified(TaxTableMap::TYPE)) {
+            $modifiedColumns[':p' . $index++]  = 'TYPE';
+        }
+        if ($this->isColumnModified(TaxTableMap::SERIALIZED_REQUIREMENTS)) {
+            $modifiedColumns[':p' . $index++]  = 'SERIALIZED_REQUIREMENTS';
         }
         if ($this->isColumnModified(TaxTableMap::CREATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
@@ -875,8 +919,11 @@ abstract class Tax implements ActiveRecordInterface
                     case 'ID':
                         $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
                         break;
-                    case 'RATE':
-                        $stmt->bindValue($identifier, $this->rate, PDO::PARAM_STR);
+                    case 'TYPE':
+                        $stmt->bindValue($identifier, $this->type, PDO::PARAM_STR);
+                        break;
+                    case 'SERIALIZED_REQUIREMENTS':
+                        $stmt->bindValue($identifier, $this->serialized_requirements, PDO::PARAM_STR);
                         break;
                     case 'CREATED_AT':
                         $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
@@ -950,12 +997,15 @@ abstract class Tax implements ActiveRecordInterface
                 return $this->getId();
                 break;
             case 1:
-                return $this->getRate();
+                return $this->getType();
                 break;
             case 2:
-                return $this->getCreatedAt();
+                return $this->getSerializedRequirements();
                 break;
             case 3:
+                return $this->getCreatedAt();
+                break;
+            case 4:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -988,9 +1038,10 @@ abstract class Tax implements ActiveRecordInterface
         $keys = TaxTableMap::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getId(),
-            $keys[1] => $this->getRate(),
-            $keys[2] => $this->getCreatedAt(),
-            $keys[3] => $this->getUpdatedAt(),
+            $keys[1] => $this->getType(),
+            $keys[2] => $this->getSerializedRequirements(),
+            $keys[3] => $this->getCreatedAt(),
+            $keys[4] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach($virtualColumns as $key => $virtualColumn)
@@ -1043,12 +1094,15 @@ abstract class Tax implements ActiveRecordInterface
                 $this->setId($value);
                 break;
             case 1:
-                $this->setRate($value);
+                $this->setType($value);
                 break;
             case 2:
-                $this->setCreatedAt($value);
+                $this->setSerializedRequirements($value);
                 break;
             case 3:
+                $this->setCreatedAt($value);
+                break;
+            case 4:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1076,9 +1130,10 @@ abstract class Tax implements ActiveRecordInterface
         $keys = TaxTableMap::getFieldNames($keyType);
 
         if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setRate($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setCreatedAt($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setUpdatedAt($arr[$keys[3]]);
+        if (array_key_exists($keys[1], $arr)) $this->setType($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setSerializedRequirements($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
     }
 
     /**
@@ -1091,7 +1146,8 @@ abstract class Tax implements ActiveRecordInterface
         $criteria = new Criteria(TaxTableMap::DATABASE_NAME);
 
         if ($this->isColumnModified(TaxTableMap::ID)) $criteria->add(TaxTableMap::ID, $this->id);
-        if ($this->isColumnModified(TaxTableMap::RATE)) $criteria->add(TaxTableMap::RATE, $this->rate);
+        if ($this->isColumnModified(TaxTableMap::TYPE)) $criteria->add(TaxTableMap::TYPE, $this->type);
+        if ($this->isColumnModified(TaxTableMap::SERIALIZED_REQUIREMENTS)) $criteria->add(TaxTableMap::SERIALIZED_REQUIREMENTS, $this->serialized_requirements);
         if ($this->isColumnModified(TaxTableMap::CREATED_AT)) $criteria->add(TaxTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(TaxTableMap::UPDATED_AT)) $criteria->add(TaxTableMap::UPDATED_AT, $this->updated_at);
 
@@ -1157,7 +1213,8 @@ abstract class Tax implements ActiveRecordInterface
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
     {
-        $copyObj->setRate($this->getRate());
+        $copyObj->setType($this->getType());
+        $copyObj->setSerializedRequirements($this->getSerializedRequirements());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
 
@@ -1729,7 +1786,8 @@ abstract class Tax implements ActiveRecordInterface
     public function clear()
     {
         $this->id = null;
-        $this->rate = null;
+        $this->type = null;
+        $this->serialized_requirements = null;
         $this->created_at = null;
         $this->updated_at = null;
         $this->alreadyInSave = false;
diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php
index 07316bf69..93da10f53 100644
--- a/core/lib/Thelia/Model/Base/TaxQuery.php
+++ b/core/lib/Thelia/Model/Base/TaxQuery.php
@@ -23,12 +23,14 @@ use Thelia\Model\Map\TaxTableMap;
  *
  *
  * @method     ChildTaxQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildTaxQuery orderByRate($order = Criteria::ASC) Order by the rate column
+ * @method     ChildTaxQuery orderByType($order = Criteria::ASC) Order by the type column
+ * @method     ChildTaxQuery orderBySerializedRequirements($order = Criteria::ASC) Order by the serialized_requirements column
  * @method     ChildTaxQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildTaxQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
  * @method     ChildTaxQuery groupById() Group by the id column
- * @method     ChildTaxQuery groupByRate() Group by the rate column
+ * @method     ChildTaxQuery groupByType() Group by the type column
+ * @method     ChildTaxQuery groupBySerializedRequirements() Group by the serialized_requirements column
  * @method     ChildTaxQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildTaxQuery groupByUpdatedAt() Group by the updated_at column
  *
@@ -48,12 +50,14 @@ use Thelia\Model\Map\TaxTableMap;
  * @method     ChildTax findOneOrCreate(ConnectionInterface $con = null) Return the first ChildTax matching the query, or a new ChildTax object populated from the query conditions when no match is found
  *
  * @method     ChildTax findOneById(int $id) Return the first ChildTax filtered by the id column
- * @method     ChildTax findOneByRate(double $rate) Return the first ChildTax filtered by the rate column
+ * @method     ChildTax findOneByType(string $type) Return the first ChildTax filtered by the type column
+ * @method     ChildTax findOneBySerializedRequirements(string $serialized_requirements) Return the first ChildTax filtered by the serialized_requirements column
  * @method     ChildTax findOneByCreatedAt(string $created_at) Return the first ChildTax filtered by the created_at column
  * @method     ChildTax findOneByUpdatedAt(string $updated_at) Return the first ChildTax filtered by the updated_at column
  *
  * @method     array findById(int $id) Return ChildTax objects filtered by the id column
- * @method     array findByRate(double $rate) Return ChildTax objects filtered by the rate column
+ * @method     array findByType(string $type) Return ChildTax objects filtered by the type column
+ * @method     array findBySerializedRequirements(string $serialized_requirements) Return ChildTax objects filtered by the serialized_requirements column
  * @method     array findByCreatedAt(string $created_at) Return ChildTax objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildTax objects filtered by the updated_at column
  *
@@ -144,7 +148,7 @@ abstract class TaxQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, RATE, CREATED_AT, UPDATED_AT FROM tax WHERE ID = :p0';
+        $sql = 'SELECT ID, TYPE, SERIALIZED_REQUIREMENTS, CREATED_AT, UPDATED_AT FROM tax WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -275,44 +279,61 @@ abstract class TaxQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query on the rate column
+     * Filter the query on the type column
      *
      * Example usage:
      * <code>
-     * $query->filterByRate(1234); // WHERE rate = 1234
-     * $query->filterByRate(array(12, 34)); // WHERE rate IN (12, 34)
-     * $query->filterByRate(array('min' => 12)); // WHERE rate > 12
+     * $query->filterByType('fooValue');   // WHERE type = 'fooValue'
+     * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%'
      * </code>
      *
-     * @param     mixed $rate The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $type The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildTaxQuery The current query, for fluid interface
      */
-    public function filterByRate($rate = null, $comparison = null)
+    public function filterByType($type = null, $comparison = null)
     {
-        if (is_array($rate)) {
-            $useMinMax = false;
-            if (isset($rate['min'])) {
-                $this->addUsingAlias(TaxTableMap::RATE, $rate['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($rate['max'])) {
-                $this->addUsingAlias(TaxTableMap::RATE, $rate['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
+        if (null === $comparison) {
+            if (is_array($type)) {
                 $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $type)) {
+                $type = str_replace('*', '%', $type);
+                $comparison = Criteria::LIKE;
             }
         }
 
-        return $this->addUsingAlias(TaxTableMap::RATE, $rate, $comparison);
+        return $this->addUsingAlias(TaxTableMap::TYPE, $type, $comparison);
+    }
+
+    /**
+     * Filter the query on the serialized_requirements column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterBySerializedRequirements('fooValue');   // WHERE serialized_requirements = 'fooValue'
+     * $query->filterBySerializedRequirements('%fooValue%'); // WHERE serialized_requirements LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $serializedRequirements The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildTaxQuery The current query, for fluid interface
+     */
+    public function filterBySerializedRequirements($serializedRequirements = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($serializedRequirements)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $serializedRequirements)) {
+                $serializedRequirements = str_replace('*', '%', $serializedRequirements);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(TaxTableMap::SERIALIZED_REQUIREMENTS, $serializedRequirements, $comparison);
     }
 
     /**
diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php
index 11e5047ce..6ca89ae85 100644
--- a/core/lib/Thelia/Model/Map/TaxTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxTableMap.php
@@ -57,7 +57,7 @@ class TaxTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 4;
+    const NUM_COLUMNS = 5;
 
     /**
      * The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class TaxTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 4;
+    const NUM_HYDRATE_COLUMNS = 5;
 
     /**
      * the column name for the ID field
@@ -75,9 +75,14 @@ class TaxTableMap extends TableMap
     const ID = 'tax.ID';
 
     /**
-     * the column name for the RATE field
+     * the column name for the TYPE field
      */
-    const RATE = 'tax.RATE';
+    const TYPE = 'tax.TYPE';
+
+    /**
+     * the column name for the SERIALIZED_REQUIREMENTS field
+     */
+    const SERIALIZED_REQUIREMENTS = 'tax.SERIALIZED_REQUIREMENTS';
 
     /**
      * the column name for the CREATED_AT field
@@ -110,12 +115,12 @@ class TaxTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'Rate', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'rate', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(TaxTableMap::ID, TaxTableMap::RATE, TaxTableMap::CREATED_AT, TaxTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'RATE', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'rate', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, )
+        self::TYPE_PHPNAME       => array('Id', 'Type', 'SerializedRequirements', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'type', 'serializedRequirements', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(TaxTableMap::ID, TaxTableMap::TYPE, TaxTableMap::SERIALIZED_REQUIREMENTS, TaxTableMap::CREATED_AT, TaxTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'TYPE', 'SERIALIZED_REQUIREMENTS', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'type', 'serialized_requirements', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -125,12 +130,12 @@ class TaxTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'Rate' => 1, 'CreatedAt' => 2, 'UpdatedAt' => 3, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'rate' => 1, 'createdAt' => 2, 'updatedAt' => 3, ),
-        self::TYPE_COLNAME       => array(TaxTableMap::ID => 0, TaxTableMap::RATE => 1, TaxTableMap::CREATED_AT => 2, TaxTableMap::UPDATED_AT => 3, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'RATE' => 1, 'CREATED_AT' => 2, 'UPDATED_AT' => 3, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'rate' => 1, 'created_at' => 2, 'updated_at' => 3, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, )
+        self::TYPE_PHPNAME       => array('Id' => 0, 'Type' => 1, 'SerializedRequirements' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'type' => 1, 'serializedRequirements' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
+        self::TYPE_COLNAME       => array(TaxTableMap::ID => 0, TaxTableMap::TYPE => 1, TaxTableMap::SERIALIZED_REQUIREMENTS => 2, TaxTableMap::CREATED_AT => 3, TaxTableMap::UPDATED_AT => 4, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'TYPE' => 1, 'SERIALIZED_REQUIREMENTS' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'type' => 1, 'serialized_requirements' => 2, 'created_at' => 3, 'updated_at' => 4, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -150,7 +155,8 @@ class TaxTableMap extends TableMap
         $this->setUseIdGenerator(true);
         // columns
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addColumn('RATE', 'Rate', 'FLOAT', true, null, null);
+        $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null);
+        $this->addColumn('SERIALIZED_REQUIREMENTS', 'SerializedRequirements', 'LONGVARCHAR', true, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -327,12 +333,14 @@ class TaxTableMap extends TableMap
     {
         if (null === $alias) {
             $criteria->addSelectColumn(TaxTableMap::ID);
-            $criteria->addSelectColumn(TaxTableMap::RATE);
+            $criteria->addSelectColumn(TaxTableMap::TYPE);
+            $criteria->addSelectColumn(TaxTableMap::SERIALIZED_REQUIREMENTS);
             $criteria->addSelectColumn(TaxTableMap::CREATED_AT);
             $criteria->addSelectColumn(TaxTableMap::UPDATED_AT);
         } else {
             $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.RATE');
+            $criteria->addSelectColumn($alias . '.TYPE');
+            $criteria->addSelectColumn($alias . '.SERIALIZED_REQUIREMENTS');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
         }
diff --git a/core/lib/Thelia/Model/Tax.php b/core/lib/Thelia/Model/Tax.php
index 21efbae6a..58144d551 100755
--- a/core/lib/Thelia/Model/Tax.php
+++ b/core/lib/Thelia/Model/Tax.php
@@ -2,8 +2,10 @@
 
 namespace Thelia\Model;
 
+use Symfony\Component\Form\Exception\Exception;
 use Thelia\Exception\TaxEngineException;
 use Thelia\Model\Base\Tax as BaseTax;
+use Thelia\TaxEngine\TaxType\BaseTaxType;
 
 class Tax extends BaseTax
 {
@@ -33,14 +35,37 @@ class Tax extends BaseTax
         return $taxRuleCountryPosition;
     }
 
-    public function getTaxRuleRateSum()
+    public function getTypeInstance()
     {
-        try {
-            $taxRuleRateSum = $this->getVirtualColumn(TaxRuleQuery::ALIAS_FOR_TAX_RATE_SUM);
-        } catch(PropelException $e) {
-            throw new PropelException("Virtual column `" . TaxRuleQuery::ALIAS_FOR_TAX_RATE_SUM . "` does not exist in Tax::getTaxRuleRateSum");
+        $class = '\\Thelia\\TaxEngine\\TaxType\\' . $this->getType();
+
+        /* test type */
+        if(!class_exists($class)) {
+            throw new TaxEngineException('Recorded type does not exists', TaxEngineException::BAD_RECORDED_TYPE);
         }
 
-        return $taxRuleRateSum;
+        $instance = new $class;
+
+        if(!$instance instanceof BaseTaxType) {
+            throw new TaxEngineException('Recorded type does not extends BaseTaxType', TaxEngineException::BAD_RECORDED_TYPE);
+        }
+        
+        return $instance;
+    }
+
+    public function setRequirements($requirements)
+    {
+        parent::setSerializedRequirements(base64_encode(json_encode($requirements)));
+    }
+
+    public function getRequirements()
+    {
+        $requirements = json_decode(base64_decode(parent::getSerializedRequirements()), true);
+
+        if(json_last_error() != JSON_ERROR_NONE || !is_array($requirements)) {
+            throw new TaxEngineException('BAD RECORDED REQUIREMENTS', TaxEngineException::BAD_RECORDED_REQUIREMENTS);
+        }
+
+        return $requirements;
     }
 }
diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php
index f9c6cf1e5..75a21a453 100755
--- a/core/lib/Thelia/Model/TaxRuleQuery.php
+++ b/core/lib/Thelia/Model/TaxRuleQuery.php
@@ -20,7 +20,6 @@ use Thelia\Model\Map\TaxTableMap;
 class TaxRuleQuery extends BaseTaxRuleQuery
 {
     const ALIAS_FOR_TAX_RULE_COUNTRY_POSITION = 'taxRuleCountryPosition';
-    const ALIAS_FOR_TAX_RATE_SUM = 'taxRateSum';
 
     public function getTaxCalculatorGroupedCollection(Product $product, Country $country)
     {
@@ -29,12 +28,10 @@ class TaxRuleQuery extends BaseTaxRuleQuery
                 TaxRuleCountryQuery::create()
                     ->filterByCountry($country, Criteria::EQUAL)
                     ->filterByTaxRuleId($product->getTaxRuleId())
-                    ->groupByPosition()
                     ->orderByPosition()
                     ->find()
             )
             ->withColumn(TaxRuleCountryTableMap::POSITION, self::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION)
-            ->withColumn('ROUND(SUM(' . TaxTableMap::RATE . '), 2)', self::ALIAS_FOR_TAX_RATE_SUM)
         ;
 
         return $search->find();
diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php
index e077a24b8..1630ad550 100755
--- a/core/lib/Thelia/TaxEngine/Calculator.php
+++ b/core/lib/Thelia/TaxEngine/Calculator.php
@@ -36,7 +36,7 @@ class Calculator
 {
     protected $taxRuleQuery = null;
 
-    protected $taxRulesGroupedCollection = null;
+    protected $taxRulesCollection = null;
 
     protected $product = null;
     protected $country = null;
@@ -50,7 +50,7 @@ class Calculator
     {
         $this->product = null;
         $this->country = null;
-        $this->taxRulesGroupedCollection = null;
+        $this->taxRulesCollection = null;
 
         if($product->getId() === null) {
             throw new TaxEngineException('Product id is empty in Calculator::load', TaxEngineException::UNDEFINED_PRODUCT);
@@ -62,14 +62,14 @@ class Calculator
         $this->product = $product;
         $this->country = $country;
 
-        $this->taxRulesGroupedCollection = $this->taxRuleQuery->getTaxCalculatorGroupedCollection($product, $country);
+        $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorGroupedCollection($product, $country);
 
         return $this;
     }
 
     public function getTaxAmount($untaxedPrice)
     {
-        if(null === $this->taxRulesGroupedCollection) {
+        if(null === $this->taxRulesCollection) {
             throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION);
         }
 
@@ -78,9 +78,13 @@ class Calculator
         }
 
         $totalTaxAmount = 0;
-        foreach($this->taxRulesGroupedCollection as $taxRule) {
-            $rateSum = $taxRule->getTaxRuleRateSum();
-            $taxAmount = $untaxedPrice * $rateSum * 0.01;
+        foreach($this->taxRulesCollection as $taxRule) {
+            $taxType = $taxRule->getTypeInstance();
+
+            $taxType->loadRequirements($taxRule->getRequirements());
+
+            $taxAmount = $taxType->calculate($untaxedPrice);
+
             $totalTaxAmount += $taxAmount;
             $untaxedPrice += $taxAmount;
         }
diff --git a/core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php b/core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php
new file mode 100755
index 000000000..d155bb4c0
--- /dev/null
+++ b/core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php
@@ -0,0 +1,83 @@
+<?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\TaxEngine\TaxType;
+
+use Thelia\Type\TypeInterface;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+abstract class BaseTaxType
+{
+    protected $requirements = null;
+
+    public abstract function calculate($untaxedPrice);
+
+    public abstract function getRequirementsList();
+
+    public function loadRequirements($requirementsValues)
+    {
+        $this->requirements = $this->getRequirementsList();
+
+        if(!is_array($this->requirements)) {
+            //@todo throw sg
+            exit('err_1');
+        }
+
+        foreach($this->requirements as $requirement => $requirementType) {
+            if(!$requirementType instanceof TypeInterface) {
+                //@todo throw sg
+                exit('err_2');
+            }
+
+            if(!array_key_exists($requirement, $requirementsValues)) {
+                //@todo throw sg
+                exit('err_3');
+            }
+
+            if(!$requirementType->isValid($requirementsValues[$requirement])) {
+                //@todo throw sg
+                exit('err_4');
+            }
+
+            $this->requirements[$requirement] = $requirementsValues[$requirement];
+        }
+    }
+
+    public function getRequirement($key)
+    {
+        if($this->requirements === null) {
+            //@todo throw sg
+            exit('err_5');
+        }
+
+        if(!array_key_exists($key, $this->requirements)) {
+            //@todo throw sg
+            exit('err_6');
+        }
+
+        return $this->requirements[$key];
+    }
+}
diff --git a/core/lib/Thelia/TaxEngine/TaxType/FeatureSlicePercentTaxType.php b/core/lib/Thelia/TaxEngine/TaxType/FeatureSlicePercentTaxType.php
new file mode 100755
index 000000000..4485f1e21
--- /dev/null
+++ b/core/lib/Thelia/TaxEngine/TaxType/FeatureSlicePercentTaxType.php
@@ -0,0 +1,47 @@
+<?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\TaxEngine\TaxType;
+
+use Thelia\Type\FloatToFloatArrayType;
+use Thelia\Type\ModelType;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+class featureSlicePercentTaxType extends  BaseTaxType
+{
+    public function calculate($untaxedPrice)
+    {
+
+    }
+
+    public function getRequirementsList()
+    {
+        return array(
+            'featureId' => new ModelType('Currency'),
+            'slices' => new FloatToFloatArrayType(),
+        );
+    }
+}
diff --git a/core/lib/Thelia/TaxEngine/TaxType/PricePercentTaxType.php b/core/lib/Thelia/TaxEngine/TaxType/PricePercentTaxType.php
new file mode 100755
index 000000000..1d7152fcf
--- /dev/null
+++ b/core/lib/Thelia/TaxEngine/TaxType/PricePercentTaxType.php
@@ -0,0 +1,45 @@
+<?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\TaxEngine\TaxType;
+
+use Thelia\Type\FloatType;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+class PricePercentTaxType extends BaseTaxType
+{
+    public function calculate($untaxedPrice)
+    {
+        return $untaxedPrice * $this->getRequirement("percent") * 0.01;
+    }
+
+    public function getRequirementsList()
+    {
+        return array(
+            'percent' => new FloatType(),
+        );
+    }
+}
diff --git a/core/lib/Thelia/Type/FloatToFloatArrayType.php b/core/lib/Thelia/Type/FloatToFloatArrayType.php
new file mode 100755
index 000000000..5a70dba91
--- /dev/null
+++ b/core/lib/Thelia/Type/FloatToFloatArrayType.php
@@ -0,0 +1,56 @@
+<?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\Type;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+
+class FloatToFloatArrayType implements TypeInterface
+{
+    public function getType()
+    {
+        return 'Float key to float value array type';
+    }
+
+    public function isValid($value)
+    {
+        if(!is_array($value))
+            return false;
+
+        foreach($value as $key => $value) {
+            if( filter_var($key, FILTER_VALIDATE_FLOAT) === false || filter_var($value, FILTER_VALIDATE_FLOAT) === false ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function getFormattedValue($value)
+    {
+        return $this->isValid($value) ? $value : null;
+    }
+}
diff --git a/core/lib/Thelia/Type/ModelType.php b/core/lib/Thelia/Type/ModelType.php
new file mode 100755
index 000000000..38df857e4
--- /dev/null
+++ b/core/lib/Thelia/Type/ModelType.php
@@ -0,0 +1,66 @@
+<?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\Type;
+
+use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
+use Thelia\Exception\TypeException;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+class ModelType implements TypeInterface
+{
+    protected $expectedModelActiveRecord = null;
+
+    /**
+     * @param $expectedModelActiveRecord
+     * @throws TypeException
+     */
+    public function __construct($expectedModelActiveRecord)
+    {
+        $class = '\\Thelia\\Model\\' . $expectedModelActiveRecord;
+
+        if(!(class_exists($class) && new $class instanceof ActiveRecordInterface)) {
+            throw new TypeException('MODEL NOT FOUND', TypeException::MODEL_NOT_FOUND);
+        }
+
+        $this->expectedModelActiveRecord = $class;
+    }
+
+    public function getType()
+    {
+        return 'Model type';
+    }
+
+    public function isValid($value)
+    {
+        return $value instanceof $this->expectedModelActiveRecord;
+    }
+
+    public function getFormattedValue($value)
+    {
+        return $this->isValid($value) ? $value : null;
+    }
+}
diff --git a/install/insert.sql b/install/insert.sql
index da1414ce3..8ffdcb092 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -17,7 +17,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('image_cache_dir_from_web_root', 'cache/images', 0, 0, NOW(), NOW()),
 ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()),
 ('page_not_found_view', '404.html', 0, 0, NOW(), NOW()),
-('use_tax_free_amounts', 1, 1, 0, NOW(), NOW());
+('use_tax_free_amounts', 0, 1, 0, NOW(), NOW());
 
 
 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES
@@ -1112,9 +1112,9 @@ INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `po
 (268, 'es_ES', 'USA - Alabama', '', '', ''),
 (268, 'fr_FR', 'USA - Alabama', '', '', '');
 
-INSERT INTO  `tax` (`id`, `rate`, `created_at`, `updated_at`)
+INSERT INTO  `tax` (`id`, `type`, `serialized_requirements`, `created_at`, `updated_at`)
   VALUES
-  (1, '19.6', NOW(), NOW());
+  (1, 'PricePercentTaxType', 'eyJwZXJjZW50IjoxOS42fQ==', NOW(), NOW());
 
 INSERT INTO `tax_i18n` (`id`, `locale`, `title`)
   VALUES
diff --git a/install/thelia.sql b/install/thelia.sql
index 0346ffba8..e4e5fb6b7 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -111,7 +111,8 @@ DROP TABLE IF EXISTS `tax`;
 CREATE TABLE `tax`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `rate` FLOAT NOT NULL,
+    `type` VARCHAR(255) NOT NULL,
+    `serialized_requirements` TEXT NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
diff --git a/local/config/schema.xml b/local/config/schema.xml
index afb7b2c41..7590da1e4 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -86,7 +86,8 @@
   </table>
   <table name="tax" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="rate" required="true" type="FLOAT" />
+    <column name="type" required="true" size="255" type="VARCHAR" />
+    <column name="serialized_requirements" required="true" type="LONGVARCHAR" />
     <column name="title" size="255" type="VARCHAR" />
     <column name="description" type="LONGVARCHAR" />
     <behavior name="timestampable" />
diff --git a/templates/default_save/product.html b/templates/default_save/product.html
index 441585aba..cde8b61eb 100755
--- a/templates/default_save/product.html
+++ b/templates/default_save/product.html
@@ -8,7 +8,7 @@ Index : {navigate to="index"}<br />
 
 {ifloop rel="product"}
 
-{loop type="product" name="product" current="true" min_price="50" max_price="100"}
+{loop type="product" name="product" current="true"}
 
 <div style="border: dashed 2px red; padding: 20px; margin: 10px;">
     <h2>PRODUCT ({$ID}) : {$REF}</h2>

From 25756ef9dd81f414a25cacb40e9347950a8fbd8b Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 11 Sep 2013 16:56:16 +0200
Subject: [PATCH 52/55] tax engine

---
 .../Thelia/Exception/TaxEngineException.php   |  6 ++++
 core/lib/Thelia/Model/Tax.php                 |  3 +-
 core/lib/Thelia/Model/TaxRuleQuery.php        |  2 +-
 core/lib/Thelia/TaxEngine/Calculator.php      |  5 +++-
 .../Thelia/TaxEngine/TaxType/BaseTaxType.php  | 19 +++++-------
 .../Thelia/Tests/TaxEngine/CalculatorTest.php | 30 ++++++++++---------
 6 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php
index 8ce8561ef..93f5b8237 100755
--- a/core/lib/Thelia/Exception/TaxEngineException.php
+++ b/core/lib/Thelia/Exception/TaxEngineException.php
@@ -30,9 +30,15 @@ class TaxEngineException extends \RuntimeException
     const BAD_RECORDED_TYPE = 101;
     const BAD_RECORDED_REQUIREMENTS = 102;
 
+    const TAX_TYPE_BAD_ABSTRACT_METHOD = 201;
+    const TAX_TYPE_REQUIREMENT_NOT_FOUND = 202;
+    const TAX_TYPE_BAD_REQUIREMENT_VALUE = 203;
+
     const UNDEFINED_PRODUCT = 501;
     const UNDEFINED_COUNTRY = 502;
     const UNDEFINED_TAX_RULES_COLLECTION = 503;
+    const UNDEFINED_REQUIREMENTS = 504;
+    const UNDEFINED_REQUIREMENT_VALUE = 505;
 
     const BAD_AMOUNT_FORMAT = 601;
 
diff --git a/core/lib/Thelia/Model/Tax.php b/core/lib/Thelia/Model/Tax.php
index 58144d551..738f16508 100755
--- a/core/lib/Thelia/Model/Tax.php
+++ b/core/lib/Thelia/Model/Tax.php
@@ -2,7 +2,6 @@
 
 namespace Thelia\Model;
 
-use Symfony\Component\Form\Exception\Exception;
 use Thelia\Exception\TaxEngineException;
 use Thelia\Model\Base\Tax as BaseTax;
 use Thelia\TaxEngine\TaxType\BaseTaxType;
@@ -49,7 +48,7 @@ class Tax extends BaseTax
         if(!$instance instanceof BaseTaxType) {
             throw new TaxEngineException('Recorded type does not extends BaseTaxType', TaxEngineException::BAD_RECORDED_TYPE);
         }
-        
+
         return $instance;
     }
 
diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php
index 75a21a453..d5ce47546 100755
--- a/core/lib/Thelia/Model/TaxRuleQuery.php
+++ b/core/lib/Thelia/Model/TaxRuleQuery.php
@@ -21,7 +21,7 @@ class TaxRuleQuery extends BaseTaxRuleQuery
 {
     const ALIAS_FOR_TAX_RULE_COUNTRY_POSITION = 'taxRuleCountryPosition';
 
-    public function getTaxCalculatorGroupedCollection(Product $product, Country $country)
+    public function getTaxCalculatorCollection(Product $product, Country $country)
     {
         $search = TaxQuery::create()
             ->filterByTaxRuleCountry(
diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php
index 1630ad550..2708e88c6 100755
--- a/core/lib/Thelia/TaxEngine/Calculator.php
+++ b/core/lib/Thelia/TaxEngine/Calculator.php
@@ -34,6 +34,9 @@ use Thelia\Model\TaxRuleQuery;
  */
 class Calculator
 {
+    /**
+     * @var TaxRuleQuery
+     */
     protected $taxRuleQuery = null;
 
     protected $taxRulesCollection = null;
@@ -62,7 +65,7 @@ class Calculator
         $this->product = $product;
         $this->country = $country;
 
-        $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorGroupedCollection($product, $country);
+        $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product, $country);
 
         return $this;
     }
diff --git a/core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php b/core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php
index d155bb4c0..7f487bf64 100755
--- a/core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php
+++ b/core/lib/Thelia/TaxEngine/TaxType/BaseTaxType.php
@@ -22,6 +22,7 @@
 /*************************************************************************************/
 namespace Thelia\TaxEngine\TaxType;
 
+use Thelia\Exception\TaxEngineException;
 use Thelia\Type\TypeInterface;
 
 /**
@@ -42,24 +43,20 @@ abstract class BaseTaxType
         $this->requirements = $this->getRequirementsList();
 
         if(!is_array($this->requirements)) {
-            //@todo throw sg
-            exit('err_1');
+            throw new TaxEngineException('getRequirementsList must return an array', TaxEngineException::TAX_TYPE_BAD_ABSTRACT_METHOD);
         }
 
         foreach($this->requirements as $requirement => $requirementType) {
             if(!$requirementType instanceof TypeInterface) {
-                //@todo throw sg
-                exit('err_2');
+                throw new TaxEngineException('getRequirementsList must return an array of TypeInterface', TaxEngineException::TAX_TYPE_BAD_ABSTRACT_METHOD);
             }
 
             if(!array_key_exists($requirement, $requirementsValues)) {
-                //@todo throw sg
-                exit('err_3');
+                throw new TaxEngineException('Cannot load requirements : requirement value for `' . $requirement . '` not found', TaxEngineException::TAX_TYPE_REQUIREMENT_NOT_FOUND);
             }
 
             if(!$requirementType->isValid($requirementsValues[$requirement])) {
-                //@todo throw sg
-                exit('err_4');
+                throw new TaxEngineException('Requirement value for `' . $requirement . '` does not match required type', TaxEngineException::TAX_TYPE_BAD_REQUIREMENT_VALUE);
             }
 
             $this->requirements[$requirement] = $requirementsValues[$requirement];
@@ -69,13 +66,11 @@ abstract class BaseTaxType
     public function getRequirement($key)
     {
         if($this->requirements === null) {
-            //@todo throw sg
-            exit('err_5');
+            throw new TaxEngineException('Requirements are empty in BaseTaxType::getRequirement', TaxEngineException::UNDEFINED_REQUIREMENTS);
         }
 
         if(!array_key_exists($key, $this->requirements)) {
-            //@todo throw sg
-            exit('err_6');
+            throw new TaxEngineException('Requirement value for `' . $key . '` does not exists in BaseTaxType::$requirements', TaxEngineException::UNDEFINED_REQUIREMENT_VALUE);
         }
 
         return $this->requirements[$key];
diff --git a/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php b/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php
index fac6ca643..719d90835 100755
--- a/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php
+++ b/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php
@@ -83,9 +83,9 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
 
         $calculator = new Calculator();
 
-        $taxRuleQuery = $this->getMock('\Thelia\Model\TaxRuleQuery', array('getTaxCalculatorGroupedCollection'));
+        $taxRuleQuery = $this->getMock('\Thelia\Model\TaxRuleQuery', array('getTaxCalculatorCollection'));
         $taxRuleQuery->expects($this->once())
-            ->method('getTaxCalculatorGroupedCollection')
+            ->method('getTaxCalculatorCollection')
             ->with($productQuery, $countryQuery)
             ->will($this->returnValue('foo'));
 
@@ -104,7 +104,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
         );
         $this->assertEquals(
             'foo',
-            $this->getProperty('taxRulesGroupedCollection')->getValue($calculator)
+            $this->getProperty('taxRulesCollection')->getValue($calculator)
         );
     }
 
@@ -124,35 +124,37 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetTaxAmountBadAmount()
     {
-        $taxRulesGroupedCollection = new ObjectCollection();
+        $taxRulesCollection = new ObjectCollection();
 
         $calculator = new Calculator();
 
-        $rewritingUrlQuery = $this->getProperty('taxRulesGroupedCollection');
-        $rewritingUrlQuery->setValue($calculator, $taxRulesGroupedCollection);
+        $rewritingUrlQuery = $this->getProperty('taxRulesCollection');
+        $rewritingUrlQuery->setValue($calculator, $taxRulesCollection);
 
         $calculator->getTaxAmount('foo');
     }
 
     public function testGetTaxAmountAndGetTaxedPrice()
     {
-        $taxRulesGroupedCollection = new ObjectCollection();
-        $taxRulesGroupedCollection->setModel('\Thelia\Model\Tax');
+        $taxRulesCollection = new ObjectCollection();
+        $taxRulesCollection->setModel('\Thelia\Model\Tax');
 
         $tax = new Tax();
-        $tax->setVirtualColumn('taxRateSum', 10);
+        $tax->setType('PricePercentTaxType')
+            ->setRequirements(array('percent' => 10));
 
-        $taxRulesGroupedCollection->append($tax);
+        $taxRulesCollection->append($tax);
 
         $tax = new Tax();
-        $tax->setVirtualColumn('taxRateSum', 8);
+        $tax->setType('PricePercentTaxType')
+            ->setRequirements(array('percent' => 8));
 
-        $taxRulesGroupedCollection->append($tax);
+        $taxRulesCollection->append($tax);
 
         $calculator = new Calculator();
 
-        $rewritingUrlQuery = $this->getProperty('taxRulesGroupedCollection');
-        $rewritingUrlQuery->setValue($calculator, $taxRulesGroupedCollection);
+        $rewritingUrlQuery = $this->getProperty('taxRulesCollection');
+        $rewritingUrlQuery->setValue($calculator, $taxRulesCollection);
 
         $taxAmount = $calculator->getTaxAmount(500);
         $taxedPrice = $calculator->getTaxedPrice(500);

From 8d71bfecc51a2f2f4096ff1c3df93fc403b2c671 Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 11 Sep 2013 17:06:04 +0200
Subject: [PATCH 53/55] WIP - add tests casper JS on coupon

---
 tests/functionnal/casperjs/conf/local.js      |  2 +-
 .../functionnal/casperjs/exe/00_parameters.js |  5 +++
 tests/functionnal/casperjs/exe/30_coupons.js  | 39 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 tests/functionnal/casperjs/exe/30_coupons.js

diff --git a/tests/functionnal/casperjs/conf/local.js b/tests/functionnal/casperjs/conf/local.js
index 366d297f2..9fa930598 100644
--- a/tests/functionnal/casperjs/conf/local.js
+++ b/tests/functionnal/casperjs/conf/local.js
@@ -1,3 +1,3 @@
 //LOCAL = ton pc
-var thelia2_base_url = 'http://www.thelia2.dev/index.php/';
+var thelia2_base_url = 'http://www.thelia2.dev/index_dev.php/';
 casper.test.done(0);
diff --git a/tests/functionnal/casperjs/exe/00_parameters.js b/tests/functionnal/casperjs/exe/00_parameters.js
index 81b980d41..a32ee89b5 100644
--- a/tests/functionnal/casperjs/exe/00_parameters.js
+++ b/tests/functionnal/casperjs/exe/00_parameters.js
@@ -2,6 +2,11 @@
 casper.test.comment('Please edit 00_parameters.js to add your configuration');
 
 var thelia2_login_admin_url = thelia2_base_url + 'admin/login';
+var thelia2_login_coupon_list_url = thelia2_base_url + 'admin/login';
+var thelia2_login_coupon_create_url = thelia2_base_url + 'admin/coupon/create';
+var thelia2_login_coupon_read_url = thelia2_base_url + 'admin/coupon/read/1';
+var thelia2_login_coupon_update_url = thelia2_base_url + 'admin/coupon/update/1';
+
 
 
 //var findMyId = /([0-9]+)$/;
diff --git a/tests/functionnal/casperjs/exe/30_coupons.js b/tests/functionnal/casperjs/exe/30_coupons.js
new file mode 100644
index 000000000..3f3d0ee50
--- /dev/null
+++ b/tests/functionnal/casperjs/exe/30_coupons.js
@@ -0,0 +1,39 @@
+casper.test.comment('Testing coupons');
+
+
+////LIST
+// @todo implement
+
+////CREATE
+// @todo implement
+
+//UPDATE COUPON RULE
+casper.start(thelia2_login_coupon_update_url, function() {
+    console.log('Now on : ' + this.getCurrentUrl());
+    this.echo('\nCOUPON RULE - EDIT');
+    this.test.assertTitle('Update coupon - Thelia Back Office', 'Web page title OK');
+//    this.test.assertSelectorHasText('#content-header > h1', 'Liste des pays', 'Web page main content OK');
+    this.test.assertSelectorHasText('tbody#constraint-list tr:nth-child(1)', 'If cart total amount is superior to 40 EUR','1st default rule found');
+    this.test.assertSelectorHasText('tbody#constraint-list tr:nth-child(2)', 'If cart total amount is inferior to 400 EUR','2nd default rule found');
+
+    // Create rule
+    this.evaluate(function() {
+//        document.querySelector('select#category-rule').selectedItem = 'thelia.constraint.rule.available_for_x_articles';
+        $('#category-rule').val('thelia.constraint.rule.available_for_x_articles').change();
+        return true;
+    });
+    this.capture('screenshot-category-rule.png');
+//    this.click('constraint-list > tr:last-child > td > a.constraint-update-btn');
+});
+
+
+////EDIT CHECK
+// @todo implement
+
+////DELETE
+// @todo implement
+
+//RUN
+casper.run(function() {
+    this.test.done();
+});
\ No newline at end of file

From 33d6c850523849b752db83e7950edd1792b15dc3 Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 11 Sep 2013 17:10:36 +0200
Subject: [PATCH 54/55] WIP - add tests casper JS on coupon

---
 tests/functionnal/casperjs/exe/30_coupons.js |  9 ++++++++-
 web/index_dev.php                            | 18 +++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/tests/functionnal/casperjs/exe/30_coupons.js b/tests/functionnal/casperjs/exe/30_coupons.js
index 3f3d0ee50..6031d71f8 100644
--- a/tests/functionnal/casperjs/exe/30_coupons.js
+++ b/tests/functionnal/casperjs/exe/30_coupons.js
@@ -22,10 +22,17 @@ casper.start(thelia2_login_coupon_update_url, function() {
         $('#category-rule').val('thelia.constraint.rule.available_for_x_articles').change();
         return true;
     });
-    this.capture('screenshot-category-rule.png');
+    this.capture('tests/functionnal/casperjs/pictures/screenshot-category-rule.png');
 //    this.click('constraint-list > tr:last-child > td > a.constraint-update-btn');
 });
 
+casper.wait(1000, function() {
+    this.echo("\nWaiting....");
+});
+
+casper.then(function(){
+
+});
 
 ////EDIT CHECK
 // @todo implement
diff --git a/web/index_dev.php b/web/index_dev.php
index 4d0063268..587631466 100755
--- a/web/index_dev.php
+++ b/web/index_dev.php
@@ -32,19 +32,19 @@ $env = 'dev';
 require __DIR__ . '/../core/bootstrap.php';
 
 // List of allowed IP
-$trustedIp = array(
-  '::1',
-  '127.0.0.1'
-);
+//$trustedIp = array(
+//  '::1',
+//  '127.0.0.1'
+//);
 
 $request = Request::createFromGlobals();
 $thelia = new Thelia("dev", true);
 
-if ( false === in_array($request->getClientIp(), $trustedIp)) {
-    // Redirect 401 Unauthorized
-    $response = new Response('Unauthorized', 401);
-    $thelia->terminate($request, $response);
-}
+//if ( false === in_array($request->getClientIp(), $trustedIp)) {
+//    // Redirect 401 Unauthorized
+//    $response = new Response('Unauthorized', 401);
+//    $thelia->terminate($request, $response);
+//}
 
 $response = $thelia->handle($request)->prepare($request)->send();
 

From 41cf74ccac3eb2c0029c0e6ee3d593587e96b15a Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 11 Sep 2013 17:22:31 +0200
Subject: [PATCH 55/55] Working - add ajax loader

---
 .../admin/default/assets/img/ajax-loader.gif  | Bin 2545 -> 13582 bytes
 .../default/assets/less/thelia/thelia.less    |   4 ++--
 templates/admin/default/coupon-update.html    |   1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/admin/default/assets/img/ajax-loader.gif b/templates/admin/default/assets/img/ajax-loader.gif
index 1321dd374af3334dbcd4e031c15a423a0882a71f..948fa9bdb33274f9338eadd930aa1bbd2752882c 100644
GIT binary patch
literal 13582
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
GZ~Z?c7K48P

literal 2545
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
Q?ms&a;tm!#2B>%I-{~VEIsgCw

diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less
index 8576272bf..ee85c7510 100644
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -251,6 +251,6 @@
 
 .loading{
   background: url("@{imgDir}/ajax-loader.gif") no-repeat;
-  height: 24px;
-  width: 24px;
+  height: 30px;
+  width: 30px;
 }
\ No newline at end of file
diff --git a/templates/admin/default/coupon-update.html b/templates/admin/default/coupon-update.html
index 925296aae..16771539a 100755
--- a/templates/admin/default/coupon-update.html
+++ b/templates/admin/default/coupon-update.html
@@ -19,6 +19,7 @@
         {include file='coupon/form.html' formAction={url path={$formAction}} form=$form noRules=false}
     {/form}
 
+
 </section> <!-- #wrapper -->
 {/block}