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

Conflicts:
	templates/admin/default/admin-layout.tpl

core/lib/Thelia/Config/Resources/action.xml

@@ -47,6 +47,11 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
+        <service id="thelia.action.coupon" class="Thelia\Action\Coupon">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
         <service id="thelia.action.currency" class="Thelia\Action\Currency">
             <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>

core/lib/Thelia/Config/Resources/config.xml

@@ -33,6 +33,7 @@
         <loop class="Thelia\Core\Template\Loop\Cart" name="cart"/>
         <loop class="Thelia\Core\Template\Loop\Image" name="image"/>
         <loop class="Thelia\Core\Template\Loop\Config" name="config"/>
+        <loop class="Thelia\Core\Template\Loop\Coupon" name="coupon"/>
         <loop class="Thelia\Core\Template\Loop\Message" name="message"/>
         <loop class="Thelia\Core\Template\Loop\Delivery" name="delivery"/>
     </loops>
@@ -63,6 +64,8 @@
 
         <form name="thelia.admin.currency.creation" class="Thelia\Form\CurrencyCreationForm"/>
         <form name="thelia.admin.currency.modification" class="Thelia\Form\CurrencyModificationForm"/>
+
+        <form name="thelia.admin.coupon.creation" class="Thelia\Form\CouponCreationForm"/>
     </forms>
 
 
@@ -146,11 +149,7 @@
 
         <service id="smarty.plugin.thelialoop" class="Thelia\Core\Template\Smarty\Plugins\TheliaLoop" scope="request">
             <tag name="thelia.parser.register_plugin"/>
-
-            <argument type="service" id="request" />
-            <argument type="service" id="event_dispatcher"/>
-            <argument type="service" id="thelia.securityContext"/>
-
+            <argument type="service" id="service_container" />
             <call method="setLoopList">
                 <argument>%thelia.parser.loops%</argument>
             </call>
@@ -210,6 +209,44 @@
         <service id="service_container" synthetic="true" />
 
         <service id="kernel" synthetic="true" />
+
+        <!-- Coupon module -->
+        <service id="thelia.adapter" class="Thelia\Coupon\CouponBaseAdapter">
+            <argument type="service" id="service_container" />
+        </service>
+        <service id="thelia.coupon.manager" class="Thelia\Coupon\CouponManager">
+            <argument type="service" id="service_container" />
+        </service>
+        <service id="thelia.coupon.factory" class="Thelia\Coupon\CouponFactory">
+            <argument type="service" id="service_container" />
+        </service>
+
+        <service id="thelia.constraint.factory" class="Thelia\Constraint\ConstraintFactory">
+            <argument type="service" id="service_container" />
+        </service>
+        <service id="thelia.constraint.rule.available_for_everyone" class="Thelia\Constraint\Rule\AvailableForEveryoneManager">
+            <argument type="service" id="thelia.adapter" />
+            <tag name="thelia.coupon.addRule"/>
+        </service>
+        <service id="thelia.constraint.rule.available_for_x_articles" class="Thelia\Constraint\Rule\AvailableForXArticlesManager">
+            <argument type="service" id="thelia.adapter" />
+            <tag name="thelia.coupon.addRule"/>
+        </service>
+        <service id="thelia.constraint.rule.available_for_total_amount" class="Thelia\Constraint\Rule\AvailableForTotalAmountManager">
+            <argument type="service" id="thelia.adapter" />
+            <tag name="thelia.coupon.addRule"/>
+        </service>
+
+        <service id="thelia.coupon.type.remove_x_amount" class="Thelia\Coupon\Type\RemoveXAmountManager">
+            <argument type="service" id="thelia.adapter" />
+            <tag name="thelia.coupon.addCoupon"/>
+        </service>
+        <service id="thelia.coupon.type.remove_x_percent" class="Thelia\Coupon\Type\RemoveXPercentManager">
+            <argument type="service" id="thelia.adapter" />
+            <tag name="thelia.coupon.addCoupon"/>
+        </service>
+
+
     </services>
 
 </config>

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -31,6 +31,14 @@
         <default key="_controller">Thelia\Controller\Admin\CategoryController::defaultAction</default>
     </route>
 
+    <!-- Customer rule management -->
+
+    <route id="admin.customers" path="/admin/customers">
+        <default key="_controller">Thelia\Controller\Admin\CustomerController::indexAction</default>
+    </route>
+
+    <!-- end Customer rule management -->
+
     <!-- Categories management -->
 
     <route id="admin.categories.default" path="/admin/categories">
@@ -60,6 +68,41 @@
     <route id="admin.categories.update-position" path="/admin/categories/update-position">
         <default key="_controller">Thelia\Controller\Admin\CategoryController::updatePositionAction</default>
     </route>
+    <route id="admin.category.ajax" path="/admin/catalog/category/parent/{parentId}.{_format}" methods="GET">
+        <default key="_controller">Thelia\Controller\Admin\CategoryController::getByParentIdAction</default>
+        <requirement key="_format">xml|json</requirement>
+    </route>
+
+
+
+
+
+
+
+    <!-- Route to the Coupon controller (process Coupon browsing) -->
+    <route id="admin.coupon.list" path="/admin/coupon">
+        <default key="_controller">Thelia\Controller\Admin\CouponController::browseAction</default>
+    </route>
+    <route id="admin.coupon.create" path="/admin/coupon/create">
+        <default key="_controller">Thelia\Controller\Admin\CouponController::createAction</default>
+    </route>
+    <route id="admin.coupon.update" path="/admin/coupon/update/{couponId}">
+        <default key="_controller">Thelia\Controller\Admin\CouponController::updateAction</default>
+    </route>
+    <route id="admin.coupon.read" path="/admin/coupon/read/{couponId}">
+        <default key="_controller">Thelia\Controller\Admin\CouponController::readAction</default>
+    </route>
+    <route id="admin.coupon.rule.input" path="/admin/coupon/rule/{ruleId}">
+        <default key="_controller">Thelia\Controller\Admin\CouponController::getRuleInputAction</default>
+    </route>
+    <route id="admin.coupon.rule.update" path="/admin/coupon/{couponId}/rule/update/">
+        <default key="_controller">Thelia\Controller\Admin\CouponController::updateRulesAction</default>
+    </route>
+
+
+
+
+
 
     <!-- Routes to the Config (system variables) controller -->
 

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

@@ -15,17 +15,29 @@
         <default key="_view">connexion</default>
     </route>
 
+    <route id="customer.create.view" path="/register">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">register</default>
+    </route>
+
     <route id="customer.update.process" path="/customer/update" methods="post">
         <default key="_controller">Thelia\Controller\Front\CustomerController::updateAction</default>
     </route>
 
     <route id="customer.login.process" path="/customer/login" methods="post">
         <default key="_controller">Thelia\Controller\Front\CustomerController::loginAction</default>
+        <default key="_view">login</default>
+    </route>
+
+    <route id="customer.login.view" path="/login">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">login</default>
     </route>
 
     <route id="customer.logout.process" path="/customer/logout">
         <default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default>
     </route>
+
     <!-- end customer routes -->
 
     <!-- customer address routes -->