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

Merge branch 'ticket-13166-ReturnProcess_2'

Browse Source
This commit is contained in:
Marion Muszynski 2017-06-08 16:05:39 +02:00
commit 0ddbca1945
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adm/tabs/AdminOrders.php
View File

@ -1589,6 +1589,9 @@ class AdminOrders extends AdminTab
} }
if(count($returnable) > 0) { if(count($returnable) > 0) {
$instructions = array( $instructions = array(
1 => 'Remboursement + Mise en stock',
2 => 'Échange',
3 => 'Défectueux',
4 => 'Commande à ré-expédier', 4 => 'Commande à ré-expédier',
5 => 'Commande à rembourser', 5 => 'Commande à rembourser',
); );

5
modules/ant_returnprocess/AdminAntReturnprocess.php
View File

@ -909,12 +909,13 @@ class AdminAntReturnprocess extends AdminTab
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<div>'; <div>';
$return_link = Db::getInstance()->getRow(' $return_link = Db::getInstance()->getRow('
SELECT `return_number`, `link` SELECT `return_number`, `link`, `return_comment`
FROM `'._DB_PREFIX_.'order_return_link` FROM `'._DB_PREFIX_.'order_return_link`
WHERE `id_order_return` = '.(int) $id_order_return.' WHERE `id_order_return` = '.(int) $id_order_return.'
'); ');
$html .= '<p class="text-purple-dark" style="font-weight:bold;"><span class="anticon anticon-qrcode"></span> Lien retour Etiquette MR : '.($return_link? '<a style="color:#444;" href="'.$return_link['link'].'" onclick="window.open(this.href); return false;">'.$return_link['return_number'].'</a> <a class="text-purple-dark" title="Renvoyer les instructions retour" href="'.$currentIndex.'&send_return_instruction=1&updateorder_return&id_order_return='.$id_order_return.'&id_order='.(int)$order->id.'&token='.$this->token.'"><i class="glyphicon glyphicon-send"></i></a>':'Pas de lien retour').'<p>'; $html .= '<p class="text-purple-dark" style="font-weight:bold;"><span class="anticon anticon-qrcode"></span> Lien retour Etiquette MR : '.($return_link? '<a style="color:#444;" href="'.$return_link['link'].'" onclick="window.open(this.href); return false;">'.$return_link['return_number'].'</a> <a class="text-purple-dark" title="Renvoyer les instructions retour" href="'.$currentIndex.'&send_return_instruction=1&updateorder_return&id_order_return='.$id_order_return.'&id_order='.(int)$order->id.'&token='.$this->token.'"><i class="glyphicon glyphicon-send"></i></a>':'Pas de lien retour').'<p>';
$html .= '<p class="text-purple-dark" style="font-weight:bold;">'.(($return_link && !empty($return_link['return_comment']))?'Commentaire : " '.$return_link['return_comment'].' "':'Sans commentaire').'<p>';
$html .= '</div> $html .= '</div>
<table class="table"> <table class="table">
<thead> <thead>