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

Merge branch 'ticket-13166-ReturnProcess' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-06-02 11:20:41 +02:00
commit ff69aa7935
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/ant_returnprocess/AdminAntReturnprocess.php
View File

@ -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 .='</tbody>
</table>
</div>
<div class="col-md-offset-1 col-md-4">
<p style="margin-bottom:0;">'.$this->l('Historique statut:').'</p>
<table class="table">';
foreach ($return_history as $key => $history) {
<div class="col-md-offset-1 col-md-4">';
if($return_history && !empty($return_history)) {
$html .= '
<tr>
<td style="font-size:11px;">'.date('d/m/Y H:i',strtotime($history['date_add'])).'</td>
<td style="font-size:11px;font-weight:bold">'.$history['state'].'</td>
<td style="font-size:11px;">'.$history['employee'].'</td>
</tr>';
<p style="margin-bottom:0;">'.$this->l('Historique :').'</p>
<table class="table">';
foreach ($return_history as $key => $history) {
$html .= '
<tr>
<td style="font-size:11px;">'.date('d/m/Y H:i',strtotime($history['date_add'])).'</td>
<td style="font-size:11px;font-weight:bold">'.$history['state'].'</td>
<td style="font-size:11px;">'.$history['employee'].'</td>
</tr>';
}
$html .= '
</table>';
}
$html .= '
</table>
<h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;">'.$this->l('Changer le statut du retour').'</h5>
<form style="padding:10px 20px;background:#efefef;" action="'.$currentIndex.'&submitAddorder_return=1&updateorder_return&id_order_return='.(int)$orderReturn->id.'&token='.$this->token.'" method="post">
<input type="hidden" name="id_order" value="'.$orderReturn->id_order.'" />