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

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

Browse Source 
Conflicts:
	core/lib/Thelia/Form/CustomerCreation.php
	templates/admin/default/customers.html
This commit is contained in:
mespeche
2013-09-10 16:44:24 +02:00
parent a485456431 0f46e9d23a
commit 7952e69eb4
27 changed files with 1331 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,9 @@
<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>
@@ -194,11 +197,11 @@
<!-- attribute and feature routes management -->
<route id="admin.configuration.attribute" path="/admin/configuration/product_attributes">
<route id="admin.configuration.product-attribute.default" path="/admin/configuration/product-attributes">
<default key="_controller">Thelia\Controller\Admin\AttributeController::defaultAction</default>
</route>
<route id="admin.configuration.attribute.edit" path="/admin/configuration/product_attributes/update">
<route id="admin.configuration.product-attribute.edit" path="/admin/configuration/product-attributes/update">
<default key="_controller">Thelia\Controller\Admin\AttributeController::updateAction</default>
</route>