dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #905 from PhpMadman/RMARef

Browse Source 
[-] BO : Order-follow displayed order id instead of order reference
This commit is contained in:
Gregory Roussac
2013-10-29 07:44:26 -07:00
parent d5eedd5eaa 7c1623c7fa
commit f58526c701
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderReturn.php
+1
View File
@@ -144,6 +144,7 @@ class OrderReturnCore extends ObjectModel
$data[$k]['type'] = 'Return'; $data[$k]['type'] = 'Return';
$data[$k]['tracking_number'] = $or['id_order_return']; $data[$k]['tracking_number'] = $or['id_order_return'];
$data[$k]['can_edit'] = false; $data[$k]['can_edit'] = false;
$data[$k]['reference'] = Order::getUniqReferenceOf($or['id_order']);
} }
return $data; return $data;
} }
themes/default/order-follow.tpl
+1 -1
View File
@@ -70,7 +70,7 @@
{foreach from=$ordersReturn item=return name=myLoop} {foreach from=$ordersReturn item=return name=myLoop}
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}"> <tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td> <td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td> <td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{$return.reference}</a></td>
<td class="history_method"><span class="bold">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td> <td class="history_method"><span class="bold">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
<td class="bold">{dateFormat date=$return.date_add full=0}</td> <td class="bold">{dateFormat date=$return.date_add full=0}</td>
<td class="history_invoice"> <td class="history_invoice">