Merge branch 'ticket-AideContact-SAV' into develop

This commit is contained in:
Marion Muszynski 2016-11-04 15:02:04 +01:00
commit e4f6d284a1

View File

@ -303,7 +303,7 @@ class BlockOrderSummary extends Module {
$order_address = nl2br(preg_replace("/(\r\n){2,}/", "\r\n", implode("\r\n", array(
$socol['cefirstname'].' '.$socol['cename'],
$socol['cecompanyname'],
$socol['prname'],
($socol['delivery_mode']=="DOM")?'':$socol['prname'],
$socol['prcompladress'],
$socol['pradress1'],
$socol['pradress2'],