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

Merge branch 'cart'

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
This commit is contained in:
Manuel Raynaud
2013-08-08 10:11:22 +02:00
parent 64031a1883 57b6cc10a0
commit 7e5c296fb2
31 changed files with 999 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Config/Resources/action.xml
View File

@@ -14,6 +14,8 @@
<service id="thelia.action.cart" class="Thelia\Action\Cart">
<tag name="kernel.event_subscriber"/>
<argument type="service" id="event_dispatcher"/>
</service>
<service id="thelia.action.customer" class="Thelia\Action\Customer" scope="request">

4
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -33,10 +33,14 @@
<form name="thelia.customer.login" class="Thelia\Form\CustomerLogin"/>
<form name="thelia.admin.login" class="Thelia\Form\AdminLogin"/>
<<<<<<< HEAD
<form name="thelia.admin.category.creation" class="Thelia\Form\CategoryCreationForm"/>
<form name="thelia.admin.category.deletion" class="Thelia\Form\CategoryDeletionForm"/>
=======
<form name="thelia.cart.add" class="Thelia\Form\CartAdd"/>
>>>>>>> cart
</forms>