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

Merge branch 'actions'

Browse Source 
Conflicts:
	core/lib/Thelia/Action/Currency.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
This commit is contained in:
Manuel Raynaud
2013-09-04 10:53:32 +02:00
parent 0efe393e3c d23190303c
commit 8b2007f94d
23 changed files with 252 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Action/Currency.php
View File

@@ -69,7 +69,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
*
* @param CurrencyChangeEvent $event
*/
public function modify(CurrencyChangeEvent $event)
public function update(CurrencyChangeEvent $event)
{
$search = CurrencyQuery::create();
@@ -165,7 +165,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
{
return array(
TheliaEvents::CURRENCY_CREATE => array("create", 128),
TheliaEvents::CURRENCY_MODIFY => array("modify", 128),
TheliaEvents::CURRENCY_UPDATE => array("update", 128),
TheliaEvents::CURRENCY_DELETE => array("delete", 128),
TheliaEvents::CURRENCY_SET_DEFAULT => array("setDefault", 128),
TheliaEvents::CURRENCY_UPDATE_RATES => array("updateRates", 128),