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

# By Manuel Raynaud (60) and others # Via Manuel Raynaud (16) and others * 'master' of https://github.com/thelia/thelia: (113 commits) implement process for changing folder position allow possibility to change folder visibility allow to create folder add dispatcher before/after for folder crud management icreate folder delete event process folder update action create folder events display info in folders edition template push model re-add home link in menu comment dev menu in layout translate some missing string fixes order integration order process change some informations in layou fix query in Thelia\Model\Folder::countAllContents allow to order products on category page Add default language & editing language default field Vertical align middle tables Fixed translations ... Conflicts: core/lib/Thelia/Tools/I18n.php templates/admin/default/category-edit.html
2013-09-21 14:44:57 +02:00
parent ced7b5e6dc cc2a3914a9
commit cf7e6d6952
655 changed files with 38814 additions and 5319 deletions
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -97,6 +97,11 @@
            <tag name="kernel.event_subscriber"/>
        </service>

+        <service id="thelia.action.folder" class="Thelia\Action\Folder">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
    </services>

 </config>
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -18,18 +18,21 @@
        <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"/>
+        <loop class="Thelia\Core\Template\Loop\Payment" name="payment"/>
        <loop class="Thelia\Core\Template\Loop\Product" name="product"/>
        <loop class="Thelia\Core\Template\Loop\ProductSaleElements" name="product_sale_elements"/>
        <loop class="Thelia\Core\Template\Loop\Feed" name="feed"/>
        <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"/>
@@ -37,6 +40,7 @@
        <loop class="Thelia\Core\Template\Loop\Message" name="message"/>
        <loop class="Thelia\Core\Template\Loop\Delivery" name="delivery"/>
        <loop class="Thelia\Core\Template\Loop\Template" name="template"/> <!--  This is product templates ;-) -->
+        <loop class="Thelia\Core\Template\Loop\TaxRule" name="tax-rule"/>
    </loops>

    <forms>
@@ -62,9 +66,16 @@
        <form name="thelia.admin.product.creation" class="Thelia\Form\ProductCreationForm"/>
        <form name="thelia.admin.product.deletion" class="Thelia\Form\ProductModificationForm"/>

+        <form name="thelia.admin.folder.creation" class="Thelia\Form\FolderCreationForm"/>
+        <form name="thelia.admin.folder.modification" class="Thelia\Form\FolderModificationForm"/>
+
+        <form name="thelia.admin.content.creation" class="Thelia\Form\ContentCreationForm"/>
+        <form name="thelia.admin.content.modification" class="Thelia\Form\ContentModificationForm"/>
+
        <form name="thelia.cart.add" class="Thelia\Form\CartAdd"/>

        <form name="thelia.order.delivery" class="Thelia\Form\OrderDelivery"/>
+        <form name="thelia.order.payment" class="Thelia\Form\OrderPayment"/>

        <form name="thelia.admin.config.creation" class="Thelia\Form\ConfigCreationForm"/>
        <form name="thelia.admin.config.modification" class="Thelia\Form\ConfigModificationForm"/>
@@ -93,6 +104,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>


@@ -103,6 +116,7 @@
        <command class="Thelia\Command\ModuleGenerateCommand"/>
        <command class="Thelia\Command\ModuleGenerateModelCommand"/>
        <command class="Thelia\Command\ModuleGenerateSqlCommand"/>
+        <command class="Thelia\Command\ModuleActivateCommand"/>
        <command class="Thelia\Command\CreateAdminUser"/>
        <command class="Thelia\Command\ReloadDatabaseCommand"/>
    </commands>
@@ -218,6 +232,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 -->

@@ -161,6 +167,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>
@@ -174,6 +182,60 @@
        <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>
+    </route>
+
+    <route id="admin.folders.create" path="/admin/folders/create">
+        <default key="_controller">Thelia\Controller\Admin\FolderController::createAction</default>
+    </route>
+
+    <route id="admin.folders.update" path="/admin/folders/update" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\FolderController::updateAction</default>
+    </route>
+
+    <route id="admin.folders.toggle-online" path="/admin/folders/toggle-online">
+        <default key="_controller">Thelia\Controller\Admin\FolderController::setToggleVisibilityAction</default>
+    </route>
+
+    <route id="admin.folders.save" path="/admin/folders/save">
+        <default key="_controller">Thelia\Controller\Admin\FolderController::processUpdateAction</default>
+    </route>
+
+    <route id="admin.folders.delete" path="/admin/folders/delete">
+        <default key="_controller">Thelia\Controller\Admin\FolderController::deleteAction</default>
+    </route>
+
+    <route id="admin.folders.update-position" path="/admin/folders/update-position">
+        <default key="_controller">Thelia\Controller\Admin\FolderController::updatePositionAction</default>
+    </route>

    <!-- Route to the Coupon controller (process Coupon browsing) -->

@@ -405,7 +467,34 @@
        <requirement key="country_id">\d+</requirement>
    </route>

-    <!-- end countries routes  management -->
+    <!-- end countries routes management -->
+
+    <!-- Shipping zones routes management -->
+
+    <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.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>
+
+    <!-- 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 -->
+

    <!-- feature and features value management -->

@@ -464,6 +553,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,27 +112,36 @@
        <default key="_view">cart</default>
    </route>

-    <route id="order.delivery" path="/order/delivery" methods="post">
+    <!-- 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>
    </route>

-    <route id="order.delivery.process" path="/order/delivery">
+    <route id="order.delivery" path="/order/delivery">
        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
        <default key="_view">order_delivery</default>
    </route>

+    <route id="order.invoice.process" path="/order/invoice" methods="post">
+        <default key="_controller">Thelia\Controller\Front\OrderController::invoice</default>
+        <default key="_view">order_invoice</default>
+    </route>
+
    <route id="order.invoice" path="/order/invoice">
        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
        <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 -->