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-05-15 13:57:51 +02:00
commit 3c258749f9
1 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
modules/ant_returnprocess/AdminAntReturnprocess.php
View File

@ -529,7 +529,7 @@ class AdminAntReturnprocess extends AdminTab
$success_mess = 'Les instructions on été renvoyées';
break;
case '5':
$success_mess = 'Le nouveau statut de le commande a bien été enregistré';
$success_mess = 'Le nouveau statut de la commande a bien été enregistré';
break;
default:
$success_mess = 'Mise à jour enregistrée';
@ -1049,7 +1049,18 @@ class AdminAntReturnprocess extends AdminTab
SELECT a.*, orsl.`name`
FROM '._DB_PREFIX_.'order_return a
LEFT JOIN '._DB_PREFIX_.'order_return_state_lang orsl ON (orsl.`id_order_return_state` = a.`state` AND orsl.`id_lang` = '.(int)($cookie->id_lang).')
'.(Tools::getValue('return_order')?' WHERE a.id_order='.Tools::getValue('return_order'):'')
WHERE a.state != 5
'.(Tools::getValue('return_order')?' AND a.id_order='.(int)Tools::getValue('return_order'):'').'
ORDER BY a.date_upd ASC'
);
$ended_order_returns = Db::getInstance()->ExecuteS('
SELECT a.*, orsl.`name`
FROM '._DB_PREFIX_.'order_return a
LEFT JOIN '._DB_PREFIX_.'order_return_state_lang orsl ON (orsl.`id_order_return_state` = a.`state` AND orsl.`id_lang` = '.(int)($cookie->id_lang).')
WHERE a.state = 5
'.(Tools::getValue('return_order')?' AND a.id_order='.(int)Tools::getValue('return_order'):'').'
ORDER BY a.date_upd ASC'
);
$colorStates = array(
@ -1146,6 +1157,51 @@ class AdminAntReturnprocess extends AdminTab
</div>
<div>
</div>
<div class="row">
<div class="col-md-12">
<div class="panel">
<div class="panel-title">
<h2><span class="anticon anticon-loop"></span> Retours Terminés</h2>
<div class="clearfix"></div>
</div>
<div class="panel-content">
<div class="table-responsive">
<table class="table table-custombordered">
<thead>
<tr>
<th>'.$this->l('#').'</th>
<th>'.$this->l('# Order').'</th>
<th>'.$this->l('# Customer').'</th>
<th>'.$this->l('Status').'</th>
<th>'.$this->l('Date').'</th>
<th class="text-center">'.$this->l('Action').'</th>
</tr>
</thead>
<tbody>';
foreach ($ended_order_returns as $key => $return) {
$html .= '
<tr '.(Tools::getValue('return_order') == $return['id_order']? 'class="info"':'').'>
<td><strong>'.$return['id_order_return'].'</strong></td>
<td><strong>n° '.$return['id_order'].'</strong></td>
<td><strong>'.$return['id_customer'].'</strong></td>
<td><span class="'.$colorStates[$return['state']].'"></span> '.$return['name'].'</td>
<td>'.date('d/m/Y H:i',strtotime($return['date_add'])).'</td>
<td align="center">
<div class="input-group-btn" role="group">
<a class="btn btn-default" href="/adm/index.php?tab=AdminAntReturnprocess&id_order_return='.(int) $return['id_order_return'].'&updateorder_return&token='.Tools::getValue('token').'"><span style="font-size:12px;" class="text-purple-dark glyphicon glyphicon-edit"></span></a>
<!--a class="btn btn-default" href="/adm/index.php?tab=AdminAntReturnprocess&id_order_return='.(int) $return['id_order_return'].'&deleteorder_return&token='.Tools::getValue('token').'"><span style="font-size:12px;" class="text-purple-dark glyphicon glyphicon-trash"></span></a-->
</div>
</td>
</tr>
';
}
$html .= '</tbody>
</table>
</div>
</div>
</div>
<div>
</div>
<div class="clearfix"></div>';
$helper->_js .= '