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

[-] BO : fix #PSCFV-3600

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17718 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-10-03 12:34:30 +00:00
parent c0bdebf11a
commit 9bce983280
6 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mailalerts/mailalerts.php
View File

@@ -388,7 +388,7 @@ class MailAlerts extends Module
file_exists(dirname(__FILE__).'/mails/'.$iso.'/'.$template.'.html'))
Mail::Send(
$id_lang,
'new_order',
$template,
sprintf(Mail::l('New order - #%06d', $id_lang), $order->id),
$template_vars,
explode(self::__MA_MAIL_DELIMITOR__, $this->_merchant_mails),

22
modules/mailalerts/mails/de/new_order.html
View File

@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Neue Bestellung</title>
</head>
<body>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Neue Bestellung</title>
</head>
<body>
<p style="line-height: 17px;"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a><br /><br /> Sie haben eine neue Bestellung erhalten von:<br /><strong style="color: #db3484;">{firstname} {lastname} ({email})</strong></p>
<table border="0">
<tbody>
@@ -13,10 +13,12 @@
<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">Einzelheiten zur Bestellung</p>
<p>Bestellung: <strong><span style="color: #db3484;">#{order_name}</span> ausgef&uuml;hrt am {date}</strong></p>
<p>Zahlung: <strong>{payment}</strong></p>
{items}
<table style="width: 100%; font-size: 11px; color: #374953;">
<tbody>
<tr style="background-color: #b9babe; text-align: center;"><th style="width: 15%; padding: 0.6em;">Referenz</th><th>Produkt</th><th style="width: 15%; padding: 0.6em;">St&uuml;ckpreis</th><th style="width: 15%; padding: 0.6em;">Menge</th><th style="width: 20%; padding: 0.6em;">Gesamtpreis</th></tr>
<tr>
<td>{items}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Produkte</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
@@ -54,6 +56,6 @@
</td>
</tr>
</tbody>
</table>
</body>
</table>
</body>
</html>

4
modules/mailalerts/mails/en/new_order.html
View File

@@ -23,7 +23,9 @@
<th style="width: 15%; padding: 0.6em;">Quantity</th>
<th style="width: 20%; padding: 0.6em;">Total Price</th>
</tr>
{items}
<tr>
<td>{items}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Products</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>

22
modules/mailalerts/mails/es/new_order.html
View File

@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Nuevo orden</title>
</head>
<body>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Nuevo orden</title>
</head>
<body>
<p style="line-height: 17px;"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a><br /><br /> Felicidades! Una nueva orden se ha puesto en <strong>{shop_name}</strong> por el siguiente cliente:<br /><strong style="color: #db3484;">{firstname} {lastname} ({email})</strong></p>
<table border="0">
<tbody>
@@ -13,10 +13,12 @@
<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">Detalles de la orden</p>
<p>Orden: <strong><span style="color: #db3484;">#{order_name}</span> puesto en {date}</strong></p>
<p>M&eacute;todo de pago: <strong>{payment}</strong></p>
{items}
<table style="width: 100%; font-size: 11px; color: #374953;">
<tbody>
<tr style="background-color: #b9babe; text-align: center;"><th style="width: 15%; padding: 0.6em;">Referencia</th><th>Producto</th><th style="width: 15%; padding: 0.6em;">Precio</th><th style="width: 15%; padding: 0.6em;">Cantidad</th><th style="width: 20%; padding: 0.6em;">Precio total</th></tr>
<tr>
<td>{items}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Productos</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
@@ -54,6 +56,6 @@
</td>
</tr>
</tbody>
</table>
</body>
</table>
</body>
</html>

23
modules/mailalerts/mails/fr/new_order.html
View File

@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Nouvelle commande</title>
</head>
<body>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Nouvelle commande</title>
</head>
<body>
<p style="line-height: 17px;"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a><br /><br /> Bravo! Une nouvelle commande a &eacute;t&eacute; pass&eacute;e sur votre boutique <strong>{shop_name}</strong> par ce client :<br /><strong style="color: #db3484;">{firstname} {lastname} ({email})</strong></p>
<table border="0">
<tbody>
@@ -13,10 +13,13 @@
<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">D&eacute;tails de commande</p>
<p>Commande : <strong><span style="color: #db3484;">#{order_name}</span> pass&eacute;e le {date}</strong></p>
<p>Moyen de paiement : <strong>{payment}</strong></p>
{items}
<table style="width: 100%; font-size: 11px; color: #374953;">
<tbody>
<tr style="background-color: #b9babe; text-align: center;"><th style="width: 15%; padding: 0.6em;">R&eacute;f&eacute;rence</th><th>Produit</th><th style="width: 15%; padding: 0.6em;">Prix</th><th style="width: 15%; padding: 0.6em;">Quantit&eacute;</th><th style="width: 20%; padding: 0.6em;">Prix Total</th></tr>
<tr>
<td>{items}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Produits</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
@@ -54,6 +57,6 @@
</td>
</tr>
</tbody>
</table>
</body>
</table>
</body>
</html>

23
modules/mailalerts/mails/it/new_order.html
View File

@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Nuovo ordine</title>
</head>
<body>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[{shop_name}] Nuovo ordine</title>
</head>
<body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<tbody>
<tr>
@@ -32,10 +32,13 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">{items}
<td align="left">
<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;">
<tbody>
<tr style="background-color: #b9babe; text-align: center;"><th style="width: 15%; padding: 0.6em 0;">Riferimento</th><th>Prodotto</th><th style="width: 15%; padding: 0.6em 0;">Prezzo unitario</th><th style="width: 15%; padding: 0.6em 0;">Quantit&agrave;</th><th style="width: 20%; padding: 0.6em 0;">Prezzo totale</th></tr>
<tr>
<td>{items}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Prodotti</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
@@ -108,6 +111,6 @@
</tr>
</tbody>
</table>
</body>
</body>
</html>