|
|
@@ -949,6 +949,7 @@ class CommandeController extends BackendController { |
|
|
|
$commande->date = date('Y-m-d H:i:s', strtotime($date.' '.date('H:i:s'))) ; |
|
|
|
$commande->id_point_vente = $id_pv ; |
|
|
|
$commande->id_production = $production->id ; |
|
|
|
$commande->type = Commande::TYPE_ADMIN ; |
|
|
|
|
|
|
|
if($id_user) |
|
|
|
{ |
|
|
@@ -1013,6 +1014,12 @@ class CommandeController extends BackendController { |
|
|
|
$str_commentaire = '<span class="glyphicon glyphicon-comment">'.Html::encode($commande->commentaire).'</span>' ; |
|
|
|
} |
|
|
|
|
|
|
|
$str_label_type_commande = ''; |
|
|
|
if($commande->type) |
|
|
|
{ |
|
|
|
$str_label_type_commande = ' <span class="label label-warning">vous</span>' ; |
|
|
|
} |
|
|
|
|
|
|
|
echo json_encode([ |
|
|
|
'id_commande' => $commande->id, |
|
|
|
'total_pv' => number_format($point_vente->recettes, 2).' €', |
|
|
@@ -1023,7 +1030,7 @@ class CommandeController extends BackendController { |
|
|
|
. 'data-commande=\''.$json_commande.'\' ' |
|
|
|
. 'data-date="'.date('d/m H:i', strtotime($commande->date)).'">' |
|
|
|
. '<span class="montant">'.number_format($commande->montant, 2).' €</span>' |
|
|
|
. '<span class="user">'.$str_user.'</span>' |
|
|
|
. '<span class="user">'.$str_user.$str_label_type_commande.'</span>' |
|
|
|
. $str_commentaire |
|
|
|
. '</a></li>', |
|
|
|
]) ; |