diff --git a/www/override/classes/Mail.php b/www/override/classes/Mail.php index b0db8f9e..3501da93 100644 --- a/www/override/classes/Mail.php +++ b/www/override/classes/Mail.php @@ -271,8 +271,13 @@ class Mail extends MailCore $id_shop = Context::getContext()->shop->id; $id_lang = Context::getContext()->cookie->id_lang; - $template_vars['{header_img}'] = 'http://eurothemix.antadis.fr/themes/eurothemix/mails/header-mail.png'; - $template_vars['{footer_img}'] = 'http://eurothemix.antadis.fr/themes/eurothemix/mails/footer-mail.png'; + /* à décommenter lors de la MEL */ + //$template_vars['{header_img}'] = 'http://www.chocolatdemariage.com/themes/chocolatdemariage/mails/header-mail.jpg'; + //$template_vars['{footer_img}'] = 'http://www.chocolatdemariage.com/themes/chocolatdemariage/mails/footer-mail.jpg'; + + /* à supprimer lors de la MEL */ + $template_vars['{header_img}'] = 'http://image.noelshack.com/fichiers/2017/35/3/1504084714-header-mail.jpg'; + $template_vars['{footer_img}'] = 'http://image.noelshack.com/fichiers/2017/35/3/1504084725-footer-mail.jpg'; $template_vars['{box-border-color}'] = '#ffffff'; $template_vars['{box-bg-color}'] = '#ffffff'; diff --git a/www/themes/chocolatdemariage/css/global.css b/www/themes/chocolatdemariage/css/global.css index 3feb7ab7..8d39e915 100644 --- a/www/themes/chocolatdemariage/css/global.css +++ b/www/themes/chocolatdemariage/css/global.css @@ -4516,7 +4516,7 @@ body.content_only { margin: 0; } #product .star_content .star { height: 28px; position: relative; - width: 18px; + width: 17px; z-index: 2; display: inline-block; } diff --git a/www/themes/chocolatdemariage/mails/footer-mail.jpg b/www/themes/chocolatdemariage/mails/footer-mail.jpg index a334f095..ec5a9363 100644 Binary files a/www/themes/chocolatdemariage/mails/footer-mail.jpg and b/www/themes/chocolatdemariage/mails/footer-mail.jpg differ diff --git a/www/themes/chocolatdemariage/mails/header-mail.jpg b/www/themes/chocolatdemariage/mails/header-mail.jpg index a3d60bf1..1fb321a4 100644 Binary files a/www/themes/chocolatdemariage/mails/header-mail.jpg and b/www/themes/chocolatdemariage/mails/header-mail.jpg differ diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_conf.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_conf.html new file mode 100644 index 00000000..c7a7466c --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_conf.html @@ -0,0 +1,113 @@ + + + + + + Nachricht von {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Hallo, + +
 
+ + + + + + +
  + + + + Vielen Dank für Ihre Anmeldung zu unserem Newsletter. + + +  
+
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_conf.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_conf.txt new file mode 100644 index 00000000..15de82ca --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_conf.txt @@ -0,0 +1,10 @@ + +[/{shop_url}] + +Hallo, + +VIELEN DANK FÜR IHRE ANMELDUNG ZU UNSEREM NEWSLETTER. + +{shop_name} [/{shop_url}] powered by PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_verif.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_verif.html new file mode 100644 index 00000000..d5dd7db7 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_verif.html @@ -0,0 +1,113 @@ + + + + + + Nachricht von {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Hallo, + +
 
+ + + + + + +
  + + + Sie haben sich soeben für unseren Newsletter angemeldet. Bitte bestätigen Sie Ihre Anmeldung durch Klick auf den folgenden Link:
+ {verif_url} + + + 		 
+
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_verif.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_verif.txt new file mode 100644 index 00000000..22cbfa79 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_verif.txt @@ -0,0 +1,13 @@ + +[/{shop_url}] + +Hallo, + +Sie haben sich soeben für unseren Newsletter angemeldet. Bitte +bestätigen Sie Ihre Anmeldung durch Klick auf den folgenden Link: + +{verif_url} [/{verif_url}] + +{shop_name} [/{shop_url}] powered by PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_voucher.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_voucher.html new file mode 100644 index 00000000..e35fdc5e --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_voucher.html @@ -0,0 +1,114 @@ + + + + + + Nachricht von {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Hallo, + +
 
+ + + + + + +
  + +

+ Newsletter-Anmeldung

+ + Sie haben unseren Newsletter abonniert. Als Dankeschön erhalten Sie den folgenden Gutschein: {discount} + + + 		 
+
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_voucher.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_voucher.txt new file mode 100644 index 00000000..e4509c44 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/de/newsletter_voucher.txt @@ -0,0 +1,11 @@ + +[/{shop_url}] + +Hallo, + +Sie haben unseren Newsletter abonniert. Als Dankeschön erhalten +Sie den folgenden Gutschein: {discount} + +{shop_name} [/{shop_url}] powered by PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_conf.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_conf.html new file mode 100644 index 00000000..db54100e --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_conf.html @@ -0,0 +1,113 @@ + + + + + + Mensaje desde {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Hola, + +
 
+ + + + + + +
  + + + + Gracias por suscribirse a nuestro boletín. + + +  
+
 
+ {shop_name} creado por PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_conf.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_conf.txt new file mode 100644 index 00000000..e75dbe67 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_conf.txt @@ -0,0 +1,10 @@ + +[/{shop_url}] + +Hola, + +GRACIAS POR SUSCRIBIRSE A NUESTRO BOLETÍN. + +{shop_name} [/{shop_url}] creado por PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_verif.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_verif.html new file mode 100644 index 00000000..207a2ba5 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_verif.html @@ -0,0 +1,113 @@ + + + + + + Mensaje desde {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Hola, + +
 
+ + + + + + +
  + + + Gracias por suscribirse a nuestro boletín de noticias, confirmar su solicitud haciendo clic en enlace de té abajo:
+ {verif_url} + + + 		 
+
 
+ {shop_name} creado por PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_verif.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_verif.txt new file mode 100644 index 00000000..059d9211 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_verif.txt @@ -0,0 +1,13 @@ + +[/{shop_url}] + +Hola, + +Gracias por suscribirse a nuestro boletín de noticias, confirmar su +solicitud haciendo clic en enlace de té abajo: + +{verif_url} [/{verif_url}] + +{shop_name} [/{shop_url}] creado por PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_voucher.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_voucher.html new file mode 100644 index 00000000..2589158c --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_voucher.html @@ -0,0 +1,114 @@ + + + + + + Mensaje desde {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Hola, + +
 
+ + + + + + +
  + +

+ Suscripción a nuestro boletín de noticias

+ + Después de su suscripción a nuestro boletín, nos complace ofrecerle el siguiente cupón: {discount} + + + 		 
+
 
+ {shop_name} creado por PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_voucher.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_voucher.txt new file mode 100644 index 00000000..57b34358 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/es/newsletter_voucher.txt @@ -0,0 +1,11 @@ + +[/{shop_url}] + +Hola, + +Después de su suscripción a nuestro boletín, nos complace +ofrecerle el siguiente cupón: {discount} + +{shop_name} [/{shop_url}] creado por PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_conf.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_conf.html index d5b44119..8f241e49 100644 --- a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_conf.html +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_conf.html @@ -1,32 +1,114 @@ + + + + + + Message de {shop_name} + + + - - + + +
  - +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_voucher.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_voucher.html index f1bda14d..17d5fff8 100644 --- a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_voucher.html +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/fr/newsletter_voucher.html @@ -1,33 +1,114 @@ + + + + + + Message de {shop_name} + + + - - + + +
  - +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_conf.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_conf.html new file mode 100644 index 00000000..f4dabe7f --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_conf.html @@ -0,0 +1,113 @@ + + + + + + Messaggio da {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Salve, + +
 
+ + + + + + +
  + + + + Grazie per esserti iscritto alla nostra newsletter. + + +  
+
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_conf.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_conf.txt new file mode 100644 index 00000000..e9d99714 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_conf.txt @@ -0,0 +1,10 @@ + +[/{shop_url}] + +Salve, + +GRAZIE PER ESSERTI ISCRITTO ALLA NOSTRA NEWSLETTER. + +{shop_name} [/{shop_url}] powered by PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_verif.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_verif.html new file mode 100644 index 00000000..27f89ef5 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_verif.html @@ -0,0 +1,113 @@ + + + + + + Messaggio da {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Salve, + +
 
+ + + + + + +
  + + + Grazie per esserti iscritto alla nostra newsletter, ti preghiamo di confermare l'iscrizione cliccando sul seguente link:
+ {verif_url} + + + 		 
+
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_verif.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_verif.txt new file mode 100644 index 00000000..b8d4e7a2 --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_verif.txt @@ -0,0 +1,13 @@ + +[/{shop_url}] + +Salve, + +Grazie per esserti iscritto alla nostra newsletter, ti preghiamo di +confermare l'iscrizione cliccando sul seguente link: + +{verif_url} [/{verif_url}] + +{shop_name} [/{shop_url}] powered by PrestaShop(tm) +[http://www.prestashop.com/] + diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_voucher.html b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_voucher.html new file mode 100644 index 00000000..9da9035e --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_voucher.html @@ -0,0 +1,114 @@ + + + + + + Messaggio da {shop_name} + + + + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ + Salve, + +
 
+ + + + + + +
  + +

+ Iscrizione Newsletter

+ + In seguito all'iscrizione alla newsletter, abbiamo il piacere di offrirti il seguente buono: {discount} + + + 		 
+
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_voucher.txt b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_voucher.txt new file mode 100644 index 00000000..a3fa9a9e --- /dev/null +++ b/www/themes/chocolatdemariage/modules/blocknewsletter/mails/it/newsletter_voucher.txt @@ -0,0 +1,11 @@ + +[/{shop_url}] + +Salve, + +In seguito all'iscrizione alla newsletter, abbiamo il piacere di +offrirti il seguente buono: {discount} + +{shop_name} [/{shop_url}] powered by PrestaShop(tm) +[http://www.prestashop.com/] +