dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] PDF : Bug Fixed #PSCFV-2788 - Incorrect discount value if free shipping

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16179 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2012-07-02 15:24:32 +00:00
parent 5f26752083
commit ed3fb8daaa
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pdf/invoice.tpl
+5 -1
View File
@@ -184,11 +184,15 @@
<!-- END PRODUCTS --> <!-- END PRODUCTS -->
<!-- CART RULES --> <!-- CART RULES -->
{assign var="shipping_discount_tax_incl" value="0"}
{foreach $cart_rules as $cart_rule} {foreach $cart_rules as $cart_rule}
{cycle values='#FFF,#DDD' assign=bgcolor} {cycle values='#FFF,#DDD' assign=bgcolor}
<tr style="line-height:6px;background-color:{$bgcolor};" text-align="left"> <tr style="line-height:6px;background-color:{$bgcolor};" text-align="left">
<td colspan="{if !$tax_excluded_display}5{else}4{/if}">{$cart_rule.name}</td> <td colspan="{if !$tax_excluded_display}5{else}4{/if}">{$cart_rule.name}</td>
<td> <td>
{if $cart_rule.free_shipping}
{assign var="shipping_discount_tax_incl" value=$order_invoice->total_shipping_tax_incl}
{/if}
{if $tax_excluded_display} {if $tax_excluded_display}
- {$cart_rule.value_tax_excl} - {$cart_rule.value_tax_excl}
{else} {else}
@@ -221,7 +225,7 @@
{if $order_invoice->total_discount_tax_incl > 0} {if $order_invoice->total_discount_tax_incl > 0}
<tr style="line-height:5px;"> <tr style="line-height:5px;">
<td style="text-align: right; font-weight: bold">{l s='Total Vouchers' pdf='true'}</td> <td style="text-align: right; font-weight: bold">{l s='Total Vouchers' pdf='true'}</td>
<td style="width: 15%; text-align: right;">-{displayPrice currency=$order->id_currency price=$order_invoice->total_discount_tax_incl}</td> <td style="width: 15%; text-align: right;">-{displayPrice currency=$order->id_currency price=($order_invoice->total_discount_tax_incl + $shipping_discount_tax_incl)}</td>
</tr> </tr>
{/if} {/if}