TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Boyquotes
2014-03-21 09:30:30 +01:00
parent 34937fe3ec 3e60725507
commit 95335babac
452 changed files with 24215 additions and 21493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -7,6 +7,7 @@
<!-- Route to administration base -->
<route id="admin" path="/admin">
<default key="_controller">Thelia\Controller\Admin\AdminController::indexAction</default>
<default key="not-logged">1</default>
</route>
<!-- home -->
@@ -24,6 +25,7 @@
<!-- Route to the administration login page -->
<route id="admin.login" path="/admin/login">
<default key="_controller">Thelia\Controller\Admin\SessionController::showLoginAction</default>
<default key="not-logged">1</default>
</route>
<!-- Route to the administration logout page -->
@@ -34,6 +36,7 @@
<!-- Route to the login check controller -->
<route id="admin.checklogin" path="/admin/checklogin">
<default key="_controller">Thelia\Controller\Admin\SessionController::checkLoginAction</default>
<default key="not-logged">1</default>
</route>
<!-- Route to the catalog controller -->
@@ -337,6 +340,10 @@
<default key="_controller">Thelia\Controller\Admin\ProductController::priceCaclulator</default>
</route>
<route id="admin.product.calculate-raw-price" path="/admin/product/calculate-raw-price">
<default key="_controller">Thelia\Controller\Admin\ProductController::calculatePrice</default>
</route>
<route id="admin.product.load-converted-prices" path="/admin/product/load-converted-prices">
<default key="_controller">Thelia\Controller\Admin\ProductController::loadConvertedPrices</default>
</route>