[-] FO : Merge of https://github.com/ldecoker/PrestaShop/commit/d3bf4d233005511e08554a7c283e0b992815e01a

2013-11-26 16:26:35 +01:00
parent a71bfa8d4e
commit 7f304fc768
2 changed files with 441 additions and 9 deletions
@@ -451,17 +451,17 @@
 				<li><h3 class="page-subheading">{if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)}&nbsp;<span class="address_alias">({$address.object.alias})</span>{/if}</h3></li>
 				{foreach $address.ordered as $pattern}
 					{assign var=addressKey value=" "|explode:$pattern}
-					<li>
-					{foreach $addressKey as $key}
-						<span class="{if isset($addresses_style[$key])}{$addresses_style[$key]}{/if}">
-							{if isset($address.formated[$key])}
-								{$address.formated[$key]|escape:'html':'UTF-8'}
-							{/if}
-						</span>
+					{assign var=addedli value=false}
+					{foreach from=$addressKey item=key name=foo}
+						{if isset($address.formated[$key]) && !empty($address.formated[$key])}
+							{if (!$addedli)}
+								{$addedli = true}
+				<li>
+					<span class="{if isset($addresses_style[$key])}{$addresses_style[$key]}{/if}">{/if}{$address.formated[$key]|escape:'html':'UTF-8'}{/if}{if ($smarty.foreach.foo.last && $addedli)}</span>
+				</li>{/if}
 					{/foreach}
-					</li>
 				{/foreach}
-				</ul>
+			</ul>
        </div>
 		{/foreach}
 	{/if}