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

Merge branch 'master' into modules

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
This commit is contained in:
Franck Allimant
2013-12-20 11:32:01 +01:00
parent 2979ca0092 5f8a6a1a5e
commit 9092e39296
335 changed files with 4732 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
templates/backOffice/default/order-edit.html
View File

@@ -112,12 +112,19 @@
<tr>
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Discount"}</strong></td>
<td><strong>{$orderCurrency} 0</strong></td>
<td><strong>{$orderCurrency} {$DISCOUNT}</strong></td>
</tr>
<tr class="active">
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Coupon code"}</strong></td>
<td><strong>{$orderCurrency} 0</strong></td>
<td>
{loop type="order_coupon" name="couponcode" order=$ID}
{$CODE}{if $LOOP_COUNT != $LOOP_TOTAL}, {/if}
{/loop}
{elseloop rel="couponcode"}
<strong>Ø</strong>
{/elseloop}
</td>
</tr>
<tr>
<td colspan="2" class="td-unstyled"></td>

2
templates/backOffice/default/shipping-zones.html
View File

@@ -37,7 +37,7 @@
</thead>
<tbody>
{loop type="delivery" name="delivery.list" backend_context="1"}
{loop type="module" module_type="2" active="*" name="delivery.list" backend_context="1"}
<tr>
<td><a href="{url path="/admin/configuration/shipping_zones/update/$ID"}">{$TITLE}</a></td>