// Merge -> revision 7875

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-03 16:16:49 +00:00
parent 6f08bcb12e
commit f2b5ee338b
38 changed files with 320 additions and 85 deletions
+8 -1
View File
@@ -29,7 +29,10 @@
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{if !isset($smarty.get.ajax)}
<div class="block-center" id="block-history">
<div id="block-order-detail">
{/if}
<form action="{if isset($opc) && $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}" method="post" class="submit">
<div>
<input type="hidden" value="{$order->id}" name="id_order"/>
@@ -369,3 +372,7 @@
{else}
<p><img src="{$img_dir}icon/infos.gif" alt="" class="icon" />&nbsp;{l s='You can\'t make a merchandise return with a guest account'}</p>
{/if}
{if !isset($smarty.get.ajax)}
</div>
</div>
{/if}