From b954a729a4ed9b5d2bc2800b5ffc11a6a98cf391 Mon Sep 17 00:00:00 2001
From: Marion Muszynski <marion@antadis.com>
Date: Thu, 8 Jun 2017 16:05:19 +0200
Subject: [PATCH] addition of return comment

---
 adm/tabs/AdminOrders.php                            | 3 +++
 modules/ant_returnprocess/AdminAntReturnprocess.php | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/adm/tabs/AdminOrders.php b/adm/tabs/AdminOrders.php
index 83cf4c29..0f24ea48 100755
--- a/adm/tabs/AdminOrders.php
+++ b/adm/tabs/AdminOrders.php
@@ -1589,6 +1589,9 @@ class AdminOrders extends AdminTab
                 }
                 if(count($returnable) > 0) {
                     $instructions = array(
+                        1 => 'Remboursement + Mise en stock',
+                        2 => 'Échange',
+                        3 => 'Défectueux',
                         4 => 'Commande à ré-expédier',
                         5 => 'Commande à rembourser',
                     );
diff --git a/modules/ant_returnprocess/AdminAntReturnprocess.php b/modules/ant_returnprocess/AdminAntReturnprocess.php
index b986d880..1110de4c 100644
--- a/modules/ant_returnprocess/AdminAntReturnprocess.php
+++ b/modules/ant_returnprocess/AdminAntReturnprocess.php
@@ -909,12 +909,13 @@ class AdminAntReturnprocess extends AdminTab
                         <div class="row">
                             <div class="col-md-7">
                                 <div>';
-                                    $return_link = Db::getInstance()->getRow('
-                                    SELECT `return_number`, `link`
+                                $return_link = Db::getInstance()->getRow('
+                                    SELECT `return_number`, `link`, `return_comment`
                                     FROM `'._DB_PREFIX_.'order_return_link`
                                     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;">'.(($return_link && !empty($return_link['return_comment']))?'Commentaire : " '.$return_link['return_comment'].' "':'Sans commentaire').'<p>';
                         $html .= '</div>
                                 <table class="table">
                                     <thead>