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

Revert "Revert "Merge branch 'cleanmaster' into modules""

Browse Source 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
This commit is contained in:
Etienne Roudeix
2014-01-06 11:25:25 +01:00
parent d4582f467f
commit 99038e688a
327 changed files with 3728 additions and 3732 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>

14
templates/frontOffice/default/order-invoice.html
View File

@@ -122,8 +122,17 @@
</tbody>
<tfoot>
<tr >
<td rowspan="4" colspan="3" class="empty">&nbsp;</td>
<th class="shipping">{intl l="Discount"}</th>
<td class="shipping">
<div class="shipping-price">
<span class="price">{order attr="discount"} {currency attr="symbol"}</span>
</div>
</td>
</tr>
<tr >
<td rowspan="3" colspan="3" class="empty">&nbsp;</td>
<th class="shipping">{intl l="Shipping Tax"}</th>
<td class="shipping">
<div class="shipping-price">
@@ -134,6 +143,9 @@
<tr >
<th class="coupon"><label for="coupon">{intl l="You may have a coupon ?"}</label></th>
<td class="coupon">
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{url path="/order/invoice"}" />
{/form_field}
{form_field form=$form field='coupon-code'}
<div class="{if $error}has-error{/if}">
<div class="input-group">