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

[-] FO : fix bug #PSCFV-737 - cannot download virtual file from order history

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14997 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-05-02 12:55:53 +00:00
parent ea51aba2bb
commit 0c2a5f508b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderDetail.php
-1
View File
@@ -238,7 +238,6 @@ class OrderDetailCore extends ObjectModel
FROM `'._DB_PREFIX_.'order_detail` od FROM `'._DB_PREFIX_.'order_detail` od
LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (od.`product_id`=pd.`id_product`) LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (od.`product_id`=pd.`id_product`)
WHERE od.`download_hash` = \''.pSQL(strval($hash)).'\' WHERE od.`download_hash` = \''.pSQL(strval($hash)).'\'
AND od.`product_attribute_id` = pd.`id_product_attribute`
AND pd.`active` = 1'; AND pd.`active` = 1';
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql); return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
} }
themes/default/order-detail.tpl
+2 -2
View File
@@ -87,7 +87,7 @@
<div class="adresses_bloc clearfix"> <div class="adresses_bloc clearfix">
<br /> <br />
<ul class="address item" {if $order->isVirtual()}style="display:none;"{/if}> <ul class="address item {if $order->isVirtual()}full_width{/if}">
<li class="address_title">{l s='Invoice'}</li> <li class="address_title">{l s='Invoice'}</li>
{foreach from=$inv_adr_fields name=inv_loop item=field_item} {foreach from=$inv_adr_fields name=inv_loop item=field_item}
{if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li> {if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>
@@ -100,7 +100,7 @@
{/foreach} {/foreach}
</ul> </ul>
<ul class="address alternate_item {if $order->isVirtual()}full_width{/if}"> <ul class="address alternate_item" {if $order->isVirtual()}style="display:none;"{/if}>
<li class="address_title">{l s='Delivery'}</li> <li class="address_title">{l s='Delivery'}</li>
{foreach from=$dlv_adr_fields name=dlv_loop item=field_item} {foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
{if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li> {if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>