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

Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment

Browse Source 
Conflicts:
	classes/Tools.php
	controllers/front/ContactController.php
This commit is contained in:
gRoussac
2013-07-17 15:35:18 +02:00
parent ea89c2235d b6fbbe6187
commit d55f31d3b5
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/contact-form.tpl
+2 -2
View File
@@ -89,8 +89,8 @@
{/foreach}
</select>
{elseif !isset($customerThread.id_order) && !isset($isLogged)}
<input type="text" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" />
{elseif $customerThread.id_order > 0}
<input type="text" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order|intval > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order) && !empty($smarty.post.id_order|intval)}{$smarty.post.id_order|intval}{/if}{/if}" />
{elseif $customerThread.id_order|intval > 0}
<input type="text" name="id_order" id="id_order" value="{$customerThread.id_order|intval}" readonly="readonly" />
{/if}
</p>