From 273328b8b38bcd9f6afe47e9adc723d194725645 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Mon, 2 Jan 2012 14:06:28 +0000
Subject: [PATCH] [-] FO : #PSTEST-171 - Set a designation shipping method with
 multiple carriers (carrier1 - carrier2, ...)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11993 b9a71923-0436-4b27-9f14-aed3839534dd
---
 themes/default/order-carrier.tpl | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index e827cf164..c33c3d9bc 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -122,17 +122,14 @@
 						<table class="resume">
 							<tr>
 								<td class="delivery_option_logo">
-									{* If there is only one carrier, show the logo of the carrier *}
-									{if $option.unique_carrier}
-										{foreach $option.carrier_list as $carrier}
-											{if $carrier.logo}
-												<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
-											{else}
-												{$carrier.instance->name}
-											{/if}
-										{/foreach}
-									{else}
-									{/if}
+									{foreach $option.carrier_list as $carrier}
+										{if $carrier.logo}
+											<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
+										{else}
+											{$carrier.instance->name}
+											{if !$carrier@last} - {/if}
+										{/if}
+									{/foreach}
 								</td>
 								<td>
 								{if $option.is_best_grade}