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

[-] BO : Fixed bug #PSFV-363. The mails are more detailed for the customer

Browse Source
This commit is contained in:
vSchoener
2012-01-12 14:56:53 +00:00
parent 721a108398
commit 300bf8bfc7
11 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/ContactController.php
+10 -4
View File
@@ -117,11 +117,17 @@ class ContactControllerCore extends FrontController
} }
if (!empty($contact->email)) if (!empty($contact->email))
{ {
$mailVarList = array(
'{email}' => $from,
'{message}' => stripslashes($message),
'{id_order}' => (int)Tools::getValue('id_order'),
'{attached_file}' => $_FILES['fileUpload']['name'] ? $_FILES['fileUpload']['name'] : '');
if (Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form'), if (Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form'),
array('{email}' => $from, '{message}' => stripslashes($message)), $contact->email, $contact->name, $from, ($customer->id ? $customer->firstname.' '.$customer->lastname : ''), $mailVarList, $contact->email, $contact->name, $from, ($customer->id ? $customer->firstname.' '.$customer->lastname : ''),
$fileAttachment) $fileAttachment) &&
&& Mail::Send($this->context->language->id, 'contact_form', Mail::l('Your message has been correctly sent'), array('{message}' => stripslashes($message)), $from)) Mail::Send($this->context->language->id, 'contact_form', Mail::l('Your message has been correctly sent'), $mailVarList, $from))
$this->context->smarty->assign('confirmation', 1); $this->context->smarty->assign('confirmation', 1);
else else
$this->errors[] = Tools::displayError('An error occurred while sending message.'); $this->errors[] = Tools::displayError('An error occurred while sending message.');
} }
mails/de/contact_form.html
+5 -1
View File
@@ -20,7 +20,11 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td align="left">Ihre Nachricht: {message}</td> <td align="left">
Ihre Nachricht: {message}<br /><br />
Bestellnummer : {id_order}<br /><br />
Befestigung : {attached_file}
</td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
mails/de/contact_form.txt
+4
View File
@@ -2,6 +2,10 @@ Ihre Nachricht wurde korrekt an unseren Kundendienst weitergeleitet.
Ihre Nachricht: {message} Ihre Nachricht: {message}
Bestellnummer : {id_order}
Befestigung : {attached_file}
Wir werden so schnell wie möglich antworten. Wir werden so schnell wie möglich antworten.
{shop_name} powered with PrestaShop™ {shop_name} powered with PrestaShop™
mails/en/contact_form.html
+3 -1
View File
@@ -19,7 +19,9 @@
<tr> <tr>
<td align="left"> <td align="left">
Your message has been sent successfully.<br /><br /> Your message has been sent successfully.<br /><br />
Message: {message} Message: {message}<br /><br />
Order ID : {id_order}<br /><br />
Attached file : {attached_file}
</td> </td>
</tr> </tr>
<tr><td>&nbsp;</td></tr> <tr><td>&nbsp;</td></tr>
mails/en/contact_form.txt
+4
View File
@@ -6,6 +6,10 @@ Your message:
{message} {message}
Order ID : {id_order}
Attached file : {attached_file}
We will respond as soon as possible. We will respond as soon as possible.
Regards, Regards,
mails/es/contact_form.html
+31 -32
View File
@@ -1,40 +1,39 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
</head> </head>
<body> <body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;"> <table style="font-family:Verdana,sans-serif; font-size:11px; color:#374953; width: 550px;">
<tbody> <tr>
<tr> <td align="left">
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td> <a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
</tr> </td>
<tr> </tr>
<td>&nbsp;</td> <tr><td>&nbsp;</td></tr>
</tr> <tr>
<tr> <td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your message to {shop_name} Customer Service</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your message has been correctly sent to our Customer Service.</td> </tr>
</tr> <tr><td>&nbsp;</td></tr>
<tr> <tr>
<td>&nbsp;</td> <td align="left">
</tr> Your message has been sent successfully.<br /><br />
<tr> mensaje: {message}<br /><br />
<td align="left">Your message: {message}</td> Número de pedido : {id_order}<br /><br />
</tr> fijación : {attached_file}
<tr> </td>
<td>&nbsp;</td> </tr>
</tr> <tr><td>&nbsp;</td></tr>
<tr> <tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">We will answer as soon as possible.</td> <td align="left">We will answer as soon as possible.</td>
</tr> </tr>
<tr> <tr><td>&nbsp;</td></tr>
<td>&nbsp;</td> <tr>
</tr> <td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<tr> <a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td> </td>
</tr> </tr>
</tbody>
</table> </table>
</body> </body>
</html> </html>
mails/es/contact_form.txt
+3
View File
@@ -4,6 +4,9 @@ Tu mensaje:
{message} {message}
Número de pedido : {id_order}
fijación : {attached_file}
Te responderemos cuanto antes. Te responderemos cuanto antes.
mails/fr/contact_form.html
+4 -1
View File
@@ -18,7 +18,10 @@
<tr><td>&nbsp;</td></tr> <tr><td>&nbsp;</td></tr>
<tr> <tr>
<td align="left"> <td align="left">
Votre message: {message} Votre message a bien été envoyé.<br /><br />
Message : {message}<br /><br />
Numéro de commande : {id_order}<br /><br />
Fichié attaché : {attached_file}
</td> </td>
</tr> </tr>
<tr><td>&nbsp;</td></tr> <tr><td>&nbsp;</td></tr>
mails/fr/contact_form.txt
+3
View File
@@ -4,6 +4,9 @@ Votre message:
{message} {message}
Numéro de commande : {id_order}
Fichié attaché : {attached_file}
Nous vous répondrons dés que possible. Nous vous répondrons dés que possible.
mails/it/contact_form.html
+5 -1
View File
@@ -20,7 +20,11 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td align="left">Il tuo messaggio: {message}</td> <td align="left">
Il tuo messaggio: {message}<br /><br />
Numero d'ordine : {id_order}<br /><br />
Attaccamento : {attached_file}
</td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
mails/it/contact_form.txt
+3
View File
@@ -4,6 +4,9 @@ Il tuo messaggio:
{message} {message}
Numero d'ordine : {id_order}
Attaccamento : {attached_file}
Risponderemo quanto prima. Risponderemo quanto prima.