From f43da83d80aebcf6065b77a1db5d0e7d66e45263 Mon Sep 17 00:00:00 2001 From: Agence CINS Date: Wed, 29 May 2013 18:51:00 +0200 Subject: [PATCH 1/2] [-] MO: Fix sendtoafriend module #PSCFV-8340 http://code.google.com/p/jquery-json/issues/detail?id=43 --- modules/sendtoafriend/sendtoafriend-extra.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sendtoafriend/sendtoafriend-extra.tpl b/modules/sendtoafriend/sendtoafriend-extra.tpl index f7439b9cd..e7c594ed4 100644 --- a/modules/sendtoafriend/sendtoafriend-extra.tpl +++ b/modules/sendtoafriend/sendtoafriend-extra.tpl @@ -45,7 +45,7 @@ $('document').ready(function(){ {/literal}url: "{$module_dir}sendtoafriend_ajax.php",{literal} type: "POST", headers: {"cache-control": "no-cache"}, - data: {action: 'sendToMyFriend', secure_key: '{/literal}{$stf_secure_key}{literal}', friend: unescape(JSON.stringify(datas).replace(/u/g, '%u'))},{/literal}{literal} + data: {action: 'sendToMyFriend', secure_key: '{/literal}{$stf_secure_key}{literal}', friend: unescape(JSON.stringify(datas).replace(/\\u/g, '%u'))},{/literal}{literal} dataType: "json", success: function(result){ $.fancybox.close(); From bce42c7f8da6573f3bc61bfaf1ddb9ff60a292fb Mon Sep 17 00:00:00 2001 From: Agence CINS Date: Wed, 29 May 2013 21:31:44 +0200 Subject: [PATCH 2/2] [-] MO: Fix newsletter module mail like newsletter_voucher.html - Edit html/css/translation for newsletter_conf.html and newsletter_verif.html - Use {color} variable --- .../mails/en/newsletter_conf.html | 30 ++++++++++++++--- .../mails/en/newsletter_verif.html | 33 ++++++++++++++++--- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.html b/modules/blocknewsletter/mails/en/newsletter_conf.html index 9ac194f78..bb6e23840 100644 --- a/modules/blocknewsletter/mails/en/newsletter_conf.html +++ b/modules/blocknewsletter/mails/en/newsletter_conf.html @@ -5,10 +5,30 @@ Message from {shop_name} -
{shop_name}

Hi -

Thank you for subscribing to our newsletter

- -
{shop_name} powered by PrestaShop™
-
+ + + + + + + + + + + + + + + + + + + + + + + + +
{shop_name}
 
Hi,
 
Thank you for subscribing to our newsletter
 
{shop_name} powered by PrestaShop™
\ No newline at end of file diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.html b/modules/blocknewsletter/mails/en/newsletter_verif.html index 1c3e92cda..6f8ded685 100644 --- a/modules/blocknewsletter/mails/en/newsletter_verif.html +++ b/modules/blocknewsletter/mails/en/newsletter_verif.html @@ -2,11 +2,36 @@ - Message de {shop_name} + Message from {shop_name} -
{shop_name}

Hi,

Thank you for subscribing to our newsletter, please confirm your request by clicking the link below:
{verif_url} -
{shop_name} Powered by PrestaShop™
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{shop_name}
 
Hi,
 
Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :
{verif_url}
 
{shop_name} Powered by PrestaShop™
\ No newline at end of file