From 0d2aed15be19970e8a8417238bbfd0e50f27439c Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Wed, 14 Nov 2012 14:47:26 +0000
Subject: [PATCH] [-] FO : replaced order id by order reference in the contact
 form (but kept the id_order for retrocompatibility) #PSCFV-5491

---
 classes/order/Order.php                 | 1 -
 controllers/front/ContactController.php | 9 ++++-----
 themes/default/contact-form.tpl         | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/classes/order/Order.php b/classes/order/Order.php
index 8cf3c5552..022286358 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1843,7 +1843,6 @@ class OrderCore extends ObjectModel
 		$query->select('MIN(id_order) as min, MAX(id_order) as max');
 		$query->from('orders');
 		$query->where('id_cart = '.(int)$this->id_cart);
-		$query->orderBy('id_order');
 		
 		$order = Db::getInstance()->getRow($query);
 		
diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index a16dbdb6d..468683253 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -271,20 +271,19 @@ class ContactControllerCore extends FrontController
 				SELECT id_order
 				FROM '._DB_PREFIX_.'orders
 				WHERE id_customer = '.(int)$this->context->customer->id.' ORDER BY date_add');
+			$order_tab = array();
 			foreach ($getOrders as $row)
 			{
 				$order = new Order($row['id_order']);
 				$date = explode(' ', $order->date_add);
-				$orders[$row['id_order']] = Tools::displayDate($date[0], $this->context->language->id);
+				$orders[] = 
 				$tmp = $order->getProducts();
 				foreach ($tmp as $key => $val)
 					$products[$row['id_order']][$val['product_id']] = array('value' => $val['product_id'], 'label' => $val['product_name']);
+					p(Tools::getValue('id_order'));
+				$order_tab[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0], $this->context->language->id), 'selected' => (int)Tools::getValue('id_order') == $order->id);
 			}
 
-			$order_tab = array();
-			foreach ($orders as $key => $val)
-				$order_tab[] = array('value' => $key, 'label' => $key.' -- '.$val, 'selected' => (int)(Tools::getValue('id_order')) == $key);
-							
 			$this->context->smarty->assign('orderList', $order_tab);
 			$this->context->smarty->assign('orderedProductList', $products);
 		}
diff --git a/themes/default/contact-form.tpl b/themes/default/contact-form.tpl
index d43d59ff3..29428d92d 100644
--- a/themes/default/contact-form.tpl
+++ b/themes/default/contact-form.tpl
@@ -81,12 +81,12 @@
 		{if !$PS_CATALOG_MODE}
 			{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
 			<p class="text select">
-				<label for="id_order">{l s='Order ID'}</label>
+				<label for="id_order">{l s='Order Reference'}</label>
 				{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
 					<select name="id_order" >
 						<option value="0">{l s='-- Choose --'}</option>
 						{foreach from=$orderList item=order}
-							<option value="{$order.value|intval}">{$order.label|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				{elseif !isset($customerThread.id_order) && !isset($isLogged)}