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

[+] FO : don't send email if there's no file associated to the virtual product

Browse Source 
[*] FO : change the download link for files associated to product attributes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9056 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lBrieu
2011-10-05 13:53:51 +00:00
parent a1f4c147b9
commit fc8a13192c
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/OrderHistory.php
+17 -11
View File
@@ -161,17 +161,21 @@ class OrderHistoryCore extends ObjectModel
$assign = array(); $assign = array();
foreach ($virtualProducts AS $key => $virtualProduct) foreach ($virtualProducts AS $key => $virtualProduct)
{ {
$id_product_download = ProductDownload::getIdFromIdProduct($virtualProduct['product_id']); $id_product_download = ProductDownload::getIdFromIdAttibute($virtualProduct['product_id'], $virtualProduct['product_attribute_id']);
$product_download = new ProductDownload($id_product_download); $product_download = new ProductDownload($id_product_download);
$assign[$key]['name'] = $product_download->display_filename; // If this virtual item has an associated file, we'll provide the link to download the file in the email
$dl_link = $product_download->getTextLink(false, $virtualProduct['download_hash']) if ($product_download->display_filename != '')
.'&id_order='.$order->id {
.'&secure_key='.$order->secure_key; $assign[$key]['name'] = $product_download->display_filename;
$assign[$key]['link'] = $dl_link; $dl_link = $product_download->getTextLink(false, $virtualProduct['download_hash'])
if ($virtualProduct['download_deadline'] != '0000-00-00 00:00:00') .'&id_order='.$order->id
$assign[$key]['deadline'] = Tools::displayDate($virtualProduct['download_deadline'], $order->id_lang); .'&secure_key='.$order->secure_key;
if ($product_download->nb_downloadable != 0) $assign[$key]['link'] = $dl_link;
$assign[$key]['downloadable'] = $product_download->nb_downloadable; if ($virtualProduct['download_deadline'] != '0000-00-00 00:00:00')
$assign[$key]['deadline'] = Tools::displayDate($virtualProduct['download_deadline'], $order->id_lang);
if ($product_download->nb_downloadable != 0)
$assign[$key]['downloadable'] = $product_download->nb_downloadable;
}
} }
$context->smarty->assign('virtualProducts', $assign); $context->smarty->assign('virtualProducts', $assign);
$context->smarty->assign('id_order', $order->id); $context->smarty->assign('id_order', $order->id);
@@ -179,7 +183,9 @@ class OrderHistoryCore extends ObjectModel
$links = $context->smarty->fetch(_PS_MAIL_DIR_.$iso.'/download-product.tpl'); $links = $context->smarty->fetch(_PS_MAIL_DIR_.$iso.'/download-product.tpl');
$tmpArray = array('{nbProducts}' => count($virtualProducts), '{virtualProducts}' => $links); $tmpArray = array('{nbProducts}' => count($virtualProducts), '{virtualProducts}' => $links);
$data = array_merge ($data, $tmpArray); $data = array_merge ($data, $tmpArray);
Mail::Send((int)$order->id_lang, 'download_product', Mail::l('Virtual product to download', $order->id_lang), $data, $result['email'], $result['firstname'].' '.$result['lastname']); // If there's at least one downloadable file
if (!empty($assign))
Mail::Send((int)$order->id_lang, 'download_product', Mail::l('Virtual product to download', $order->id_lang), $data, $result['email'], $result['firstname'].' '.$result['lastname']);
} }
if (Validate::isLoadedObject($order)) if (Validate::isLoadedObject($order))