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

Merge branch 'delivery'

Browse Source 
Conflicts:
	composer.lock
	install/insert.sql
This commit is contained in:
Manuel Raynaud
2013-09-07 16:37:54 +02:00
parent 9ebf16f1f6 0aad4baf26
commit 1e660cd930
23 changed files with 669 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@
<loop class="Thelia\Core\Template\Loop\Image" name="image"/>
<loop class="Thelia\Core\Template\Loop\Config" name="config"/>
<loop class="Thelia\Core\Template\Loop\Message" name="message"/>
<loop class="Thelia\Core\Template\Loop\Delivery" name="delivery"/>
</loops>
<forms>

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

@@ -60,4 +60,11 @@
<default key="_view">cart</default>
</route>
<!-- order management process -->
<route id="order.delivery.add" path="/delivery/choose/{delivery_id}">
<default key="_controller">Thelia\Controller\Front\DeliveryController::select</default>
<requirement key="delivery_id">\d+</requirement>
</route>
<!-- end order management process -->
</routes>