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

[-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs

Browse Source
This commit is contained in:
gRoussac
2013-04-08 10:50:03 +02:00
parent 5b6dc1e9e9
commit d6ee2acc90
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderHistory.php
+18 -8
View File
@@ -117,20 +117,30 @@ class OrderHistoryCore extends ObjectModel
{ {
$assign[$key]['name'] = $product_download->display_filename; $assign[$key]['name'] = $product_download->display_filename;
$dl_link = $product_download->getTextLink(false, $virtual_product['download_hash']) $dl_link = $product_download->getTextLink(false, $virtual_product['download_hash'])
.'&id_order='.$order->id .'&id_order='.(int)$order->id
.'&secure_key='.$order->secure_key; .'&secure_key='.$order->secure_key;
$assign[$key]['link'] = $dl_link; $assign[$key]['link'] = $dl_link;
if ($virtual_product['download_deadline'] != '0000-00-00 00:00:00') if ($virtual_product['date_expiration'] != '0000-00-00 00:00:00')
$assign[$key]['deadline'] = Tools::displayDate($virtual_product['download_deadline'], $order->id_lang); $assign[$key]['deadline'] = Tools::displayDate($virtual_product['date_expiration '], $order->id_lang);
if ($product_download->nb_downloadable != 0) if ($product_download->nb_downloadable != 0)
$assign[$key]['downloadable'] = $product_download->nb_downloadable; $assign[$key]['downloadable'] = (int)$product_download->nb_downloadable;
} }
} }
$customer = new Customer((int)$order->id_customer); $customer = new Customer((int)$order->id_customer);
$context->smarty->assign('virtualProducts', $assign);
$context->smarty->assign('id_order', $order->id); $links = '<ul>';
$iso = Language::getIsoById((int)($order->id_lang)); foreach($assign as $product)
$links = $context->smarty->fetch(_PS_MAIL_DIR_.$iso.'/download-product.tpl'); {
$links .= '<li>';
$links .= '<a href="'.$product['link'].'">'.Tools::htmlentitiesUTF8($product['name']).'</a>';
if (isset($product['deadline']))
$links .= '&nbsp;'.Tools::htmlentitiesUTF8(Tools::displayError('expires on')).'&nbsp;'.$product['deadline'];
if (isset($product['downloadable']))
$links .= '&nbsp;'.Tools::htmlentitiesUTF8(sprintf(Tools::displayError('downloadable %d time(s)'), (int)$product['downloadable']));
$links .= '</li>';
}
$links .= '<ul>';
$data = array( $data = array(
'{lastname}' => $customer->lastname, '{lastname}' => $customer->lastname,
'{firstname}' => $customer->firstname, '{firstname}' => $customer->firstname,