Merge branch 'master' into frontend

2013-10-22 10:17:47 +02:00
parent 0c1ed8e702 f70c5362e9
commit e9c6f403a3
233 changed files with 8781 additions and 7561 deletions
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -111,6 +111,11 @@
            <tag name="kernel.event_subscriber"/>
        </service>

+        <service id="thelia.action.tax" class="Thelia\Action\Tax">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
        <service id="thelia.action.content" class="Thelia\Action\Content">
            <argument type="service" id="service_container"/>
            <tag name="kernel.event_subscriber"/>
@@ -136,6 +141,21 @@
            <tag name="kernel.event_subscriber"/>
        </service>

+        <service id="thelia.action.module" class="Thelia\Action\Module">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="thelia.action.cache" class="Thelia\Action\Cache">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="thelia.action.profile" class="Thelia\Action\Profile">
+            <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
@@ -7,6 +7,7 @@
    <loops>
        <loop class="Thelia\Core\Template\Loop\Accessory" name="accessory"/>
        <loop class="Thelia\Core\Template\Loop\Address" name="address"/>
+        <loop class="Thelia\Core\Template\Loop\Admin" name="admin"/>
        <loop class="Thelia\Core\Template\Loop\Area" name="area"/>
        <loop class="Thelia\Core\Template\Loop\AssociatedContent" name="associated_content"/>
        <loop class="Thelia\Core\Template\Loop\Attribute" name="attribute"/>
@@ -33,6 +34,7 @@
        <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\Profile" name="profile"/>
        <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"/>
@@ -128,13 +130,18 @@
        <form name="thelia.admin.taxrule.taxlistupdate" class="Thelia\Form\TaxRuleTaxListUpdateForm"/>
        <form name="thelia.admin.taxrule.add" class="Thelia\Form\TaxRuleCreationForm"/>

+        <form name="thelia.admin.tax.modification" class="Thelia\Form\TaxModificationForm"/>
+        <form name="thelia.admin.tax.taxlistupdate" class="Thelia\Form\TaxTaxListUpdateForm"/>
+        <form name="thelia.admin.tax.add" class="Thelia\Form\TaxCreationForm"/>
+
+        <form name="thelia.admin.profile.add" class="Thelia\Form\ProfileCreationForm"/>
+        <form name="thelia.admin.profile.modification" class="Thelia\Form\ProfileModificationForm"/>
+
        <form name="thelia.admin.template.creation" class="Thelia\Form\TemplateCreationForm"/>
        <form name="thelia.admin.template.modification" class="Thelia\Form\TemplateModificationForm"/>

        <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"/>
        
        <form name="thelia.admin.language.creation" class="Thelia\Form\LanguageCreationForm"/>

@@ -147,6 +154,8 @@

        <form name="thelia.shopping_zone_area" class="Thelia\Form\ShippingZone\ShippingZoneAddArea"/>
        <form name="thelia.shopping_zone_remove_area" class="Thelia\Form\ShippingZone\ShippingZoneRemoveArea"/>
+
+        <form name="thelia.contact" class="Thelia\Form\ContactForm"/>
    </forms>


@@ -160,6 +169,7 @@
        <command class="Thelia\Command\ModuleActivateCommand"/>
        <command class="Thelia\Command\CreateAdminUser"/>
        <command class="Thelia\Command\ReloadDatabaseCommand"/>
+        <command class="Thelia\Command\GenerateResources"/>
    </commands>

    <services>
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -757,6 +757,32 @@

    <!-- end countries routes management -->

+    <!-- profiles management -->
+
+    <route id="admin.configuration.profiles.list" path="/admin/configuration/profiles">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::defaultAction</default>
+        <requirement key="address_id">\d+</requirement>
+    </route>
+
+    <route id="admin.configuration.profiles.update" path="/admin/configuration/profiles/update/{profile_id}">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::updateAction</default>
+        <requirement key="tax_id">\d+</requirement>
+    </route>
+
+    <route id="admin.configuration.profiles.add" path="/admin/configuration/profiles/add">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::createAction</default>
+    </route>
+
+    <route id="admin.configuration.profiles.save" path="/admin/configuration/profiles/save">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::processUpdateAction</default>
+    </route>
+
+    <route id="admin.configuration.profiles.delete" path="/admin/configuration/profiles/delete">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::deleteAction</default>
+    </route>
+
+    <!-- end profiles management -->
+
    <!-- feature and features value management -->

    <route id="admin.configuration.features.default" path="/admin/configuration/features">
@@ -816,13 +842,43 @@

    <!-- Modules rule management -->

-    <route id="admin.module" path="/admin/modules">
+    <route id="admin.module" path="/admin/configuration/modules">
        <default key="_controller">Thelia\Controller\Admin\ModuleController::indexAction</default>
    </route>

+    <route id="admin.module.toggle-activation" path="/admin/configuration/modules/toggle-activation/{module_id}">
+        <default key="_controller">Thelia\Controller\Admin\ModuleController::toggleActivationAction</default>
+        <requirement key="module_id">\d+</requirement>
+    </route>
+
+    <route id="admin.module.delete" path="/admin/configuration/modules/delete">
+        <default key="_controller">Thelia\Controller\Admin\ModuleController::deleteAction</default>
+    </route>
+
    <!-- end Modules rule management -->

-    <!-- taxe rules management -->
+    <!-- tax management -->
+
+    <route id="admin.configuration.taxes.update" path="/admin/configuration/taxes/update/{tax_id}">
+        <default key="_controller">Thelia\Controller\Admin\TaxController::updateAction</default>
+        <requirement key="tax_id">\d+</requirement>
+    </route>
+
+    <route id="admin.configuration.taxes.add" path="/admin/configuration/taxes/add">
+        <default key="_controller">Thelia\Controller\Admin\TaxController::createAction</default>
+    </route>
+
+    <route id="admin.configuration.taxes.save" path="/admin/configuration/taxes/save">
+        <default key="_controller">Thelia\Controller\Admin\TaxController::processUpdateAction</default>
+    </route>
+
+    <route id="admin.configuration.taxes.delete" path="/admin/configuration/taxes/delete">
+        <default key="_controller">Thelia\Controller\Admin\TaxController::deleteAction</default>
+    </route>
+
+    <!-- end tax management -->
+
+    <!-- tax rules management -->

    <route id="admin.configuration.taxes-rules.list" path="/admin/configuration/taxes_rules">
        <default key="_controller">Thelia\Controller\Admin\TaxRuleController::defaultAction</default>
@@ -849,6 +905,11 @@
        <default key="_controller">Thelia\Controller\Admin\TaxRuleController::deleteAction</default>
    </route>

+    <route id="admin.configuration.taxes-rules.set-default" path="/admin/configuration/taxes_rules/update/set_default/{tax_rule_id}">
+        <default key="_controller">Thelia\Controller\Admin\TaxRuleController::setDefaultAction</default>
+        <requirement key="tax_rule_id">\d+</requirement>
+    </route>
+
    <!-- end tax rules management -->


@@ -859,4 +920,4 @@
        <requirement key="template">.*</requirement>
    </route>

-</routes>
+</routes>
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -164,4 +164,23 @@
    </route>
    <!-- end order management process -->

+    <route id="mail.test" path="/mail/test">
+        <default key="_controller">Thelia\Controller\Front\Mail::test</default>
+    </route>
+
+    <route id="contact.display" path="/contact" methods="get">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">contact</default>
+    </route>
+
+    <route id="contact.send" path="/contact" methods="post">
+        <default key="_controller">Thelia\Controller\Front\ContactController::sendAction</default>
+        <default key="_view">contact</default>
+    </route>
+
+    <route id="contact.success" path="/contact/success">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">contact-success</default>
+    </route>
+
 </routes>