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-06 12:19:35 +02:00
commit 168a947797
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ant_returnprocess/AdminAntReturnprocess.php
View File

@ -1404,7 +1404,7 @@ class AdminAntReturnprocess extends AdminTab
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'
ORDER BY a.date_add DESC'
);
$ended_order_returns = Db::getInstance()->ExecuteS('
@ -1413,7 +1413,7 @@ class AdminAntReturnprocess extends AdminTab
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'
ORDER BY a.date_add DESC'
);
if(Tools::getValue('return_order') && empty($order_returns) && empty($ended_order_returns)) {