Revert "Merge branch 'cleanmaster' into modules"

This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
This commit is contained in:
Etienne Roudeix
2013-12-20 11:16:42 +01:00
parent d0ff5260f7
commit b3ac365b45
332 changed files with 3575 additions and 4787 deletions

View File

@@ -112,19 +112,12 @@
<tr>
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Discount"}</strong></td>
<td><strong>{$orderCurrency} {$DISCOUNT}</strong></td>
<td><strong>{$orderCurrency} 0</strong></td>
</tr>
<tr class="active">
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Coupon code"}</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>
<td><strong>{$orderCurrency} 0</strong></td>
</tr>
<tr>
<td colspan="2" class="td-unstyled"></td>