antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket/r15172-change-adress-socol' into develop

Browse Source
This commit is contained in:
David 2017-12-29 18:13:34 +01:00
commit 392bccd110
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/tabs/AdminOrders.php
View File

@ -2958,7 +2958,7 @@ class AdminOrders extends AdminTab
AND (`pradress1`!= "" OR `pradress2`!= "" OR `pradress3`!= "" OR `pradress4`!= "")
');
// If socol AND id_carrier is DOM
if($socol && (int)$cart->id_carrier == (int)Configuration::get('ANT_CARRIER_DOM')) {
if($socol) {
$order_address = nl2br(preg_replace("/(\r\n){2,}/", "\r\n", implode("\r\n", array(
$socol['cefirstname'].' '.$socol['cename'],
$socol['cecompanyname'],