Merge branch 'master' into content

Conflicts: core/lib/Thelia/Core/Event/TheliaEvents.php templates/admin/default/folders.html
2013-09-20 17:41:38 +02:00
parent 466798e7af 369b7e1be1
commit 805b38ab9a
143 changed files with 15038 additions and 2789 deletions
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -18,9 +18,10 @@
        <loop class="Thelia\Core\Template\Loop\Currency" name="currency"/>
        <loop class="Thelia\Core\Template\Loop\Customer" name="customer"/>
        <loop class="Thelia\Core\Template\Loop\Feature" name="feature"/>
-        <loop class="Thelia\Core\Template\Loop\FeatureAvailability" name="feature_availability"/>
+        <loop class="Thelia\Core\Template\Loop\FeatureAvailability" name="feature-availability"/>
        <loop class="Thelia\Core\Template\Loop\FeatureValue" name="feature_value"/>
        <loop class="Thelia\Core\Template\Loop\Folder" name="folder"/>
+        <loop class="Thelia\Core\Template\Loop\Module" name="module"/>
        <loop class="Thelia\Core\Template\Loop\Order" name="order"/>
        <loop class="Thelia\Core\Template\Loop\OrderStatus" name="order-status"/>
        <loop class="Thelia\Core\Template\Loop\CategoryPath" name="category-path"/>
@@ -31,6 +32,7 @@
        <loop class="Thelia\Core\Template\Loop\Title" name="title"/>
        <loop class="Thelia\Core\Template\Loop\Lang" name="lang"/>
        <loop class="Thelia\Core\Template\Loop\CategoryTree" name="category-tree"/>
+        <loop class="Thelia\Core\Template\Loop\FolderTree" name="folder-tree"/>
        <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"/>
@@ -101,6 +103,8 @@
        <form name="thelia.admin.country.creation" class="Thelia\Form\CountryCreationForm"/>
        <form name="thelia.admin.country.modification" class="Thelia\Form\CountryModificationForm"/>

+        <form name="thelia.admin.profile.modification" class="Thelia\Form\ProfileModificationForm"/>
+
    </forms>


@@ -227,6 +231,7 @@
            <argument type="service" id="request" />
            <argument type="service" id="thelia.securityContext" />
            <argument type="service" id="thelia.parser.context"/>
+            <argument type="service" id="event_dispatcher"/>
        </service>

        <service id="smarty.plugin.adminUtilities" class="Thelia\Core\Template\Smarty\Plugins\AdminUtilities" scope="request">
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -24,6 +24,12 @@
        <default key="_controller">Thelia\Controller\Admin\SessionController::checkLoginAction</default>
    </route>

+    <!-- Route to edit admin profile -->
+    <route id="admin.profile.update.view" path="/admin/profile/update" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\AdminController::updateAction</default>
+    </route>
+
+

 	<!-- Route to the catalog controller -->

@@ -144,6 +150,8 @@
        <default key="_controller">Thelia\Controller\Admin\ProductController::updatePositionAction</default>
    </route>

+    <!-- Related content -->
+
    <route id="admin.products.related-content.add" path="/admin/products/related-content/add">
        <default key="_controller">Thelia\Controller\Admin\ProductController::addRelatedContentAction</default>
    </route>
@@ -156,7 +164,33 @@
        <default key="_controller">Thelia\Controller\Admin\ProductController::getAvailableRelatedContentAction</default>
        <requirement key="_format">xml|json</requirement>
    </route>
-    
+
+    <!-- Product accessories -->
+
+    <route id="admin.products.accessories.add" path="/admin/products/accessory/add">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::addAccessoryAction</default>
+    </route>
+
+    <route id="admin.products.accessories.delete" path="/admin/products/accessory/delete">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::deleteAccessoryAction</default>
+    </route>
+
+    <route id="admin.product.accessories-content" path="/admin/product/{productId}/available-accessories/{categoryId}.{_format}" methods="GET">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::getAvailableAccessoriesAction</default>
+        <requirement key="_format">xml|json</requirement>
+    </route>
+
+    <route id="admin.products.update-accessory-position" path="/admin/products/update-accessory-position">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::updateAccessoryPositionAction</default>
+    </route>
+
+    <!--Features and attributes -->
+
+    <route id="admin.products.update-attributes-and-features" path="/admin/product/{productId}/update-attributes-and-features">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::updateAttributesAndFeaturesAction</default>
+    </route>
+
+
    <!--  Folder routes management -->
    <route id="admin.folders.default" path="/admin/folders">
        <default key="_controller">Thelia\Controller\Admin\FolderController::defaultAction</default>
@@ -404,17 +438,26 @@

    <!-- Shipping zones routes management -->

-    <route id="admin.configuration.shipping-zones.default" path="/admin/configuration/shipping-zones">
+    <route id="admin.configuration.shipping-zones.default" path="/admin/configuration/shipping_zones">
        <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::indexAction</default>
    </route>

-    <route id="admin.configuration.shipping-zones.create" path="/admin/configuration/shipping-zones/create">
-        <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::createAction</default>
+    <route id="admin.configuration.shipping-zones.update.view" path="/admin/configuration/shipping_zones/update/{shipping_zones_id}" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::updateAction</default>
+        <requirement key="shipping_zones_id">\d+</requirement>
    </route>

-    <route id="admin.configuration.shipping-zones.update.view" path="/admin/configuration/shipping-zones/update/{shipping_zones_id}" methods="get">
-        <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::updateAction</default>
-        <requirement key="country_id">\d+</requirement>
+    <!-- end shipping routes management -->
+
+    <!-- Shipping zones routes management -->
+
+    <route id="admin.configuration.shipping-configuration.default" path="/admin/configuration/shipping_configuration">
+        <default key="_controller">Thelia\Controller\Admin\ShippingConfigurationController::indexAction</default>
+    </route>
+
+    <route id="admin.configuration.shipping-configuration.update.view" path="/admin/configuration/shipping_configuration/update/{shipping_configuration_id}" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\ShippingConfigurationController::updateAction</default>
+        <requirement key="shipping_configuration_id">\d+</requirement>
    </route>

    <!-- end shipping routes management -->
@@ -477,6 +520,15 @@

    <!-- end feature and feature routes  management -->

+    <!-- Modules rule management -->
+
+    <route id="admin.module" path="/admin/modules">
+        <default key="_controller">Thelia\Controller\Admin\ModuleController::indexAction</default>
+    </route>
+
+    <!-- end Modules rule management -->
+
+
 	<!-- The default route, to display a template -->

    <route id="admin.processTemplate" path="/admin/{template}">
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -112,6 +112,9 @@
        <default key="_view">cart</default>
    </route>

+    <!-- end cart routes -->
+
+    <!-- order management process -->
    <route id="order.delivery.process" path="/order/delivery" methods="post">
        <default key="_controller">Thelia\Controller\Front\OrderController::deliver</default>
        <default key="_view">order_delivery</default>
@@ -123,7 +126,7 @@
    </route>

    <route id="order.invoice.process" path="/order/invoice" methods="post">
-        <default key="_controller">Thelia\Controller\Front\OrderController::pay</default>
+        <default key="_controller">Thelia\Controller\Front\OrderController::invoice</default>
        <default key="_view">order_invoice</default>
    </route>

@@ -132,12 +135,13 @@
        <default key="_view">order_invoice</default>
    </route>

-    <!-- end cart routes -->
+    <route id="order.payment.process" path="/order/pay">
+        <default key="_controller">Thelia\Controller\Front\OrderController::pay</default>
+    </route>

-    <!-- order management process -->
-    <route id="order.delivery.add" path="/delivery/choose/{delivery_id}">
-        <default key="_controller">Thelia\Controller\Front\DeliveryController::select</default>
-        <requirement key="delivery_id">\d+</requirement>
+    <route id="order.placed" path="/order/placed/{order_id}">
+        <default key="_controller">Thelia\Controller\Front\OrderController::orderPlaced</default>
+        <default key="_view">order_placed</default>
    </route>
    <!-- end order management process -->