[*] PDF : Free shipping in invoice PDF display X2 thanks @axometeam

harelguy · Jul 12, 2013 · b880bc3 · b880bc3
1 parent 6f9e415
commit b880bc3
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/pdf/invoice.tpl b/pdf/invoice.tpl
@@ -164,7 +164,7 @@
 				</tr>
 					{foreach $order_detail.customizedDatas as $customizationPerAddress}
 						{foreach $customizationPerAddress as $customizationId => $customization}
-							<tr style="line-height:6px;background-color:{$bgcolor}; ">
+							<tr style="line-height:6px;background-color:{$bgcolor};">
 								<td style="line-height:3px; text-align: left; width: 45%; vertical-align: top">
 
 										<blockquote>
@@ -198,11 +198,8 @@
 				<!-- CART RULES -->
 				{assign var="shipping_discount_tax_incl" value="0"}
 				{foreach $cart_rules as $cart_rule}
-					{if $cart_rule.free_shipping}
-						{assign var="shipping_discount_tax_incl" value=$order_invoice->total_shipping_tax_incl}
-					{/if}
 					{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 style="line-height:3px;text-align:left;width:60%;vertical-align:top" colspan="{if !$tax_excluded_display}5{else}4{/if}">{$cart_rule.name}</td>
 						<td>
 							{if $tax_excluded_display}
@@ -237,7 +234,7 @@
 				{if $order_invoice->total_discount_tax_incl > 0}
 				<tr style="line-height:5px;">
 					<td style="text-align: right; font-weight: bold">{l s='Total Vouchers' pdf='true'}</td>
-					<td style="width: 17%; text-align: right;">-{displayPrice currency=$order->id_currency price=($order_invoice->total_discount_tax_incl + $shipping_discount_tax_incl)}</td>
+					<td style="width: 17%; text-align: right;">-{displayPrice currency=$order->id_currency price=($order_invoice->total_discount_tax_incl)}</td>
 				</tr>
 				{/if}