diff --git a/modules/ant_returnprocess/AdminAntReturnprocess.php b/modules/ant_returnprocess/AdminAntReturnprocess.php index 1817face..415a5745 100644 --- a/modules/ant_returnprocess/AdminAntReturnprocess.php +++ b/modules/ant_returnprocess/AdminAntReturnprocess.php @@ -626,7 +626,7 @@ class AdminAntReturnprocess extends AdminTab HelperFormBootstrap::displaySuccess('Etiquette envoyée à l\'imprimante'); - $id_order_return = (int)(Tools::getValue('id_order_return'))); + $id_order_return = (int) Tools::getValue('id_order_return'); $orderReturn = new OrderReturn($id_order_return); $orderReturn->state = 5; // return is ended if ($orderReturn->save()) @@ -900,19 +900,23 @@ class AdminAntReturnprocess extends AdminTab $html .=' -
-

'.$this->l('Historique statut:').'

- '; - foreach ($return_history as $key => $history) { +
'; + if($return_history && !empty($return_history)) { $html .= ' -
- - - - '; +

'.$this->l('Historique :').'

+
'.date('d/m/Y H:i',strtotime($history['date_add'])).''.$history['state'].''.$history['employee'].'
'; + foreach ($return_history as $key => $history) { + $html .= ' + + + + + '; + } + $html .= ' +
'.date('d/m/Y H:i',strtotime($history['date_add'])).''.$history['state'].''.$history['employee'].'
'; } $html .= ' -
'.$this->l('Changer le statut du retour').'