From be3801174b9599e39157bc9d8b981c519fe161fd Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Fri, 31 Aug 2012 09:35:23 +0000
Subject: [PATCH] [-] BO : #PSCFV-3848 : Add reference order instead of id
 order for follow an order

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17123 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/front/OrderConfirmationController.php | 3 +++
 themes/default/order-confirmation.tpl             | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index 1b40ede70..3beba0cbe 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -32,6 +32,7 @@ class OrderConfirmationControllerCore extends FrontController
 	public $id_cart;
 	public $id_module;
 	public $id_order;
+	public $reference;
 	public $secure_key;
 
 	/**
@@ -57,6 +58,7 @@ class OrderConfirmationControllerCore extends FrontController
 			Tools::redirect($redirectLink.(Tools::isSubmit('slowvalidation') ? '&slowvalidation' : ''));
 
 		$order = new Order((int)($this->id_order));
+		$this->reference = $order->reference;
 		if (!Validate::isLoadedObject($order) || $order->id_customer != $this->context->customer->id || $this->secure_key != $order->secure_key)
 			Tools::redirect($redirectLink);
 		$module = Module::getInstanceById((int)($this->id_module));
@@ -82,6 +84,7 @@ class OrderConfirmationControllerCore extends FrontController
 		{
 			$this->context->smarty->assign(array(
 				'id_order' => $this->id_order,
+				'reference_order' => $this->reference,
 				'id_order_formatted' => sprintf('#%06d', $this->id_order)
 			));
 			/* If guest we clear the cookie for security reason */
diff --git a/themes/default/order-confirmation.tpl b/themes/default/order-confirmation.tpl
index 53953ce6c..62ed2744a 100644
--- a/themes/default/order-confirmation.tpl
+++ b/themes/default/order-confirmation.tpl
@@ -40,8 +40,8 @@
 <br />
 {if $is_guest}
 	<p>{l s='Your order ID is:'} <span class="bold">{$id_order_formatted}</span> . {l s='Your order ID has been sent to you via e-mail.'}</p>
-	<a href="{$link->getPageLink('guest-tracking', true, NULL, "id_order={$id_order}")}" title="{l s='Follow my order'}"><img src="{$img_dir}icon/order.gif" alt="{l s='Follow my order'}" class="icon" /></a>
-	<a href="{$link->getPageLink('guest-tracking', true, NULL, "id_order={$id_order}")}" title="{l s='Follow my order'}">{l s='Follow my order'}</a>
+	<a href="{$link->getPageLink('guest-tracking', true, NULL, "id_order={$reference_order}")}" title="{l s='Follow my order'}"><img src="{$img_dir}icon/order.gif" alt="{l s='Follow my order'}" class="icon" /></a>
+	<a href="{$link->getPageLink('guest-tracking', true, NULL, "id_order={$reference_order}")}" title="{l s='Follow my order'}">{l s='Follow my order'}</a>
 {else}
 	<a href="{$link->getPageLink('history', true)}" title="{l s='Back to orders'}"><img src="{$img_dir}icon/order.gif" alt="{l s='Back to orders'}" class="icon" /></a>
 	<a href="{$link->getPageLink('history', true)}" title="{l s='Back to orders'}">{l s='Back to orders'}</a>