From 25615cd08577dba99ef5b5b4eb46128de2aafe12 Mon Sep 17 00:00:00 2001 From: bLeveque Date: Sat, 19 May 2012 17:13:49 +0000 Subject: [PATCH] [-] MO : Fixed bug #PSCFV-2414 - Mail alert "Order e-mail" was badly formated - Fixed in the 5 languages --- modules/mailalerts/mails/de/new_order.html | 175 ++++++++----------- modules/mailalerts/mails/en/new_order.html | 175 ++++++++----------- modules/mailalerts/mails/es/new_order.html | 177 ++++++++------------ modules/mailalerts/mails/fr/new_order.html | 175 ++++++++----------- modules/mailalerts/mails/it/new_order.html | 185 ++++++++------------- 5 files changed, 332 insertions(+), 555 deletions(-) diff --git a/modules/mailalerts/mails/de/new_order.html b/modules/mailalerts/mails/de/new_order.html index 35df06c2c..31b784f43 100644 --- a/modules/mailalerts/mails/de/new_order.html +++ b/modules/mailalerts/mails/de/new_order.html @@ -1,112 +1,69 @@ - - - [{shop_name}] Neue Bestellung - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Sie haben eine neue Bestellung erhalten von {firstname} {lastname}.
 
Einzelheiten zur Bestellung
 
Bestellung: {order_name} ausgeführt am {date}
Zahlung: {payment}
 
{items} - - - - - - - - - - - - - - - - - - - - - - - - -
ReferenzProduktStückpreisMengeGesamtpreis
Produkte{total_products}
Ermäßigungen{total_discounts}
Geschenkverpackung{total_wrapping}
Versand{total_shipping}
Gesamt bezahlt{total_paid}
-
 
Versand
 
Lieferer: {carrier}
 
- - - - - - - - -
LIEFERadressERECHNUNGSadressE
{delivery_block_html}{invoice_block_html}
-
 
Kundennachricht
 
{message}
 
{shop_name} powered with PrestaShop™
- + + + [{shop_name}] Neue Bestellung + + +

{shop_name}

+ Sie haben eine neue Bestellung erhalten von:
{firstname} {lastname} ({email})

+ + + + +
+

Einzelheiten zur Bestellung

+ +

Bestellung: #{order_name} ausgeführt am {date}

+

Zahlung: {payment}

+ + + + + + + + + + {items} + + + + + + + + + + + + + + + + + + + + +
ReferenzProduktStückpreisMengeGesamtpreis
Produkte{total_products}
Ermäßigungen{total_discounts}
Geschenkverpackung{total_wrapping}
Versand{total_shipping}
Gesamt bezahlt{total_paid}
+ +

Lieferer: {carrier}

+ + + + + + + + + + +
LieferadresseRechnungsadresse
{delivery_block_html}{invoice_block_html}
+ +

Kundennachricht: {message}

+ +

{shop_name} powered with PrestaShop™

+
+ \ No newline at end of file diff --git a/modules/mailalerts/mails/en/new_order.html b/modules/mailalerts/mails/en/new_order.html index 58d9be915..7f6298c2e 100644 --- a/modules/mailalerts/mails/en/new_order.html +++ b/modules/mailalerts/mails/en/new_order.html @@ -1,112 +1,69 @@ - - - [{shop_name}] New order - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
You've a new order from {firstname} {lastname} ({email}).
 
Order details
 
Order: {order_name} placed on {date}
Payment: {payment}
 
{items} - - - - - - - - - - - - - - - - - - - - - - - - -
ReferenceProductUnit priceQuantityTotal price
Products{total_products}
Discounts{total_discounts}
Gift-wrapping{total_wrapping}
Shipping{total_shipping}
Total paid{total_paid}
-
 
Shipping
 
Carrier: {carrier}
 
- - - - - - - - -
Delivery addressBilling address
{delivery_block_html}{invoice_block_html}
-
 
Customer message
 
{message}
 
{shop_name} powered with PrestaShop™
- + + + [{shop_name}] New order + + +

{shop_name}

+ Congratulations! A new order was placed on {shop_name} from the following customer:
{firstname} {lastname} ({email})

+ + + + +
+

Order Details

+ +

Order: #{order_name} placed on {date}

+

Payment method: {payment}

+ + + + + + + + + + {items} + + + + + + + + + + + + + + + + + + + + +
ReferenceProductPriceQuantityTotal Price
Products{total_products}
Discounts{total_discounts}
Gift-wrapping{total_wrapping}
Shipping{total_shipping}
Total paid{total_paid}
+ +

Carrier: {carrier}

+ + + + + + + + + + +
Delivery addressBilling address
{delivery_block_html}{invoice_block_html}
+ +

Customer message: {message}

+ +

{shop_name} powered with PrestaShop™

+
+ \ No newline at end of file diff --git a/modules/mailalerts/mails/es/new_order.html b/modules/mailalerts/mails/es/new_order.html index ddf7a3d6a..f739411fb 100644 --- a/modules/mailalerts/mails/es/new_order.html +++ b/modules/mailalerts/mails/es/new_order.html @@ -1,112 +1,69 @@ - - - [{shop_name}] Nuevo orden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Has un nuevo orden de {firstname} {lastname} ({email}).
 
Detalles del orden
 
Orden: {order_name} puesto en {date}
De pago: {payment}
 
{items} - - - - - - - - - - - - - - - - - - - - - - - - -
ReferenciaProductoPrecio unitarioCantidadEl precio total
Productos{total_products}
Descuentos{total_discounts}
Envolver regalos{total_wrapping}
Transporte{total_shipping}
Total pagado{total_paid}
-
 
Transporte
 
Carrier: {carrier}
 
- - - - - - - - -
Dirección de entregaDirección de facturación
{delivery_block_html}{invoice_block_html}
-
 
Customer message
 
{message}
 
{shop_name} desarrollado por PrestaShop™
- - \ No newline at end of file + + + [{shop_name}] Nuevo orden + + +

{shop_name}

+ Felicidades! Una nueva orden se ha puesto en {shop_name} por el siguiente cliente:
{firstname} {lastname} ({email})

+ + + + +
+

Detalles de la orden

+ +

Orden: #{order_name} puesto en {date}

+

Método de pago: {payment}

+ + + + + + + + + + {items} + + + + + + + + + + + + + + + + + + + + +
ReferenciaProductoPrecioCantidadPrecio total
Productos{total_products}
Descuentos{total_discounts}
Envolver regalos{total_wrapping}
Transporte{total_shipping}
Total pagado{total_paid}
+ +

Transporte: {carrier}

+ + + + + + + + + + +
Dirección de entregaDirección de facturación
{delivery_block_html}{invoice_block_html}
+ +

Mensaje del cliente: {message}

+ +

{shop_name} desarrollado por PrestaShop™

+
+ + diff --git a/modules/mailalerts/mails/fr/new_order.html b/modules/mailalerts/mails/fr/new_order.html index 55cd36819..75f293bfe 100644 --- a/modules/mailalerts/mails/fr/new_order.html +++ b/modules/mailalerts/mails/fr/new_order.html @@ -1,112 +1,69 @@ - - - [{shop_name}] Nouvelle commande - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
{firstname} {lastname} ({email}) vient de passer une commande.
 
Détails
 
Commande {order_name} passée le {date}
Paiement : {payment}
 
{items} - - - - - - - - - - - - - - - - - - - - - - - - -
RéférenceArticlePrix unitaireQuantitéPrix total
Produits{total_products}
Réductions{total_discounts}
Emballage cadeau{total_wrapping}
Frais de port{total_shipping}
Total{total_paid}
-
 
Transport
 
Transporteur : {carrier}
 
- - - - - - - - -
Adresse de livraisonAdresse de facturation
{delivery_block_html}{invoice_block_html}
-
 
Message client
 
{message}
 
{shop_name} propulsé avec PrestaShop™
- + + + [{shop_name}] Nouvelle commande + + +

{shop_name}

+ Bravo! Une nouvelle commande a été passée sur votre boutique {shop_name} par ce client :
{firstname} {lastname} ({email})

+ + + + +
+

Détails de commande

+ +

Commande : #{order_name} passée le {date}

+

Moyen de paiement : {payment}

+ + + + + + + + + + {items} + + + + + + + + + + + + + + + + + + + + +
RéférenceProduitPrixQuantitéPrix Total
Produits{total_products}
Réductions{total_discounts}
Emballage cadeaux{total_wrapping}
Frais de port{total_shipping}
Total payé{total_paid}
+ +

Transporteur : {carrier}

+ + + + + + + + + + +
Adresse de livraisonAdresse de facturation
{delivery_block_html}{invoice_block_html}
+ +

Message du client : {message}

+ +

{shop_name} propulsé avec PrestaShop™

+
+ \ No newline at end of file diff --git a/modules/mailalerts/mails/it/new_order.html b/modules/mailalerts/mails/it/new_order.html index 53e956403..e5c293d7e 100644 --- a/modules/mailalerts/mails/it/new_order.html +++ b/modules/mailalerts/mails/it/new_order.html @@ -1,120 +1,69 @@ - - - [{shop_name}] Nuovo ordine - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
Hai un nuovo ordine da parte di {firstname} {lastname}.
Dati dell'ordine
Ordine: {order_name} effettuato il {date}
Pagamento: {payment}
{items} - - - - - - - - - - - - - - - - - - - - - - - - - - -
Riferimento Prodotto Prezzo unitarioQuantità Prezzo totale
Prodotti{total_products}
Sconti{total_discounts}
Carta regalo{total_wrapping}
Spedizione{total_shipping}
Totale pagato{total_paid}
-
Spedizione
Mezzo di spedizione: {carrier}
- - - - - - - - - - -
INDIRIZZO DI CONSEGNA INDIRIZZO DI FATTURAZIONE
-{delivery_block_html} - -{invoice_block_html} -
-
Messaggio cliente
{message}
{shop_name} powered with PrestaShop™
- - + + + [{shop_name}] Nuovo ordine + + +

{shop_name}

+ Hai un nuovo ordine da parte di:
{firstname} {lastname} ({email})

+ + + + +
+

Dati dell'ordine

+ +

Ordine: #{order_name} effettuato il {date}

+

Pagamento: {payment}

+ + + + + + + + + + {items} + + + + + + + + + + + + + + + + + + + + +
RiferimentoProdottoPrezzoQuantitàPrezzo totale
Prodotti{total_products}
Sconti{total_discounts}
Carta regalo{total_wrapping}
Spedizione{total_shipping}
Totale pagato{total_paid}
+ +

Mezzo di spedizione: {carrier}

+ + + + + + + + + + +
Indirizzo di consegnaIndirizzo di fatturazione
{delivery_block_html}{invoice_block_html}
+ +

Messaggio cliente: {message}

+ +

{shop_name} powered with PrestaShop™

+
+ + \ No newline at end of file