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

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-12-21 15:20:50 +01:00
commit 3dd620e9e9
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

@ -1433,7 +1433,7 @@ class AdminOrders extends AdminTab
<div class="col-md-4">
<h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;">
'.$order->printCarrier($order->id_carrier,array()).' Adresse Livraison
'.($cart->id_carrier!=(int)Configuration::get('ANT_CARRIER_DOM') && in_array($cart->id_carrier,$carriers_socol)?'<a style="color:#fff;cursor:pointer;" class="pull-right" id="changeAddress" data-url="scaddressedit.php?id_cart='.(int)$order->id_cart.'"><i class="glyphicon glyphicon-edit"></i></a>':'').'
'.($cart->id_carrier==(int)Configuration::get('ANT_CARRIER_DOM') && in_array($cart->id_carrier,$carriers_socol)?'<a style="color:#fff;cursor:pointer;" class="pull-right" id="changeAddress" data-url="scaddressedit.php?id_cart='.(int)$order->id_cart.'"><i class="glyphicon glyphicon-edit"></i></a>':'').'
'.(in_array($cart->id_carrier,$carriers_mr)?'<a style="color:#fff;cursor:pointer" class="pull-right" id="changeAddress" data-url="mraddressedit.php?id_cart='.(int)$order->id_cart.'"><i class="glyphicon glyphicon-edit"></i></a>':'').'
</h5>
<p style="padding:5px 20px;background:#efefef;">'.$data['order_address'].'</p>