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

Merge branch 'ticket/r14716-order-detail-device' into develop

Browse Source
This commit is contained in:
Michael RICOIS 2018-01-09 11:55:38 +01:00
commit 130a2e27b3
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
adm/tabs/AdminOrders.php
View File

@ -1285,6 +1285,20 @@ class AdminOrders extends AdminTab
}
$html.='
</div>';
switch($order->appli) {
default:
case 0:
$deviceHtml = '<p style="margin-bottom:0px;"><span class="anticon anticon-display"></span> '.$this->l('Commande faite via le site').'</p>';
break;
case 1:
$deviceHtml = '<p style="margin-bottom:0px;"><span class="anticon anticon-android"></span> '.$this->l('Commande faite via l\'appli').'</p>';
break;
case 2:
$deviceHtml = '<p style="margin-bottom:0px;"><span class="anticon anticon-mobile"></span> '.$this->l('Commande faite via le site mobile').'</p>';
break;
}
$html.='<div class="row">
<div class="col-md-12">
<div class="panel">
@ -1308,7 +1322,7 @@ class AdminOrders extends AdminTab
<div class="row">
<div class="col-md-6" style="padding-right:0;">
<div style="background:#efefef;padding:10px;">
'.($order->appli?'<p style="margin-bottom:0px;"><span class="anticon anticon-mobile"></span> '.$this->l('Commande faite via l\'appli').'</p>':'<p style="margin-bottom:0px;"><span class="anticon anticon-display"></span> '.$this->l('Commande faite via le site').'</p>').'
'.$deviceHtml.'
<p style="margin-bottom:0px;"><span class="anticon anticon-credit-card"></span> '.Tools::substr($order->payment, 0, 32).' '.($order->module ? '('.$order->module.')' : '').'</p>
<p><span class="anticon anticon-cart"></span> <a href="?tab=AdminCarts&id_cart='.$cart->id.'&viewcart&token='.Tools::getAdminToken('AdminCarts'.(int)(Tab::getIdFromClassName('AdminCarts')).(int)($cookie->id_employee)).'">'.$this->l('Cart #').sprintf('%06d', $cart->id).'</a></p>
<p style="margin-bottom:0px;"><span class="anticon anticon-'.($order->recyclable ? 'checkmark text-green-light' : 'cross text-rose').'"></span> '.$this->l('Recycled package').'</p>