diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 1d610a90a..10a0d5371 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -560,8 +560,8 @@ abstract class PaymentModuleCore extends Module '{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1), '{carrier}' => $virtual_product ? $this->l('No carrier') : $carrier->name, '{payment}' => Tools::substr($order->payment, 0, 32), - '{products}' => $products_list, - '{discounts}' => $cart_rules_list, + '{products}' => $this->formatProductAndVoucherForEmail($products_list), + '{discounts}' => $this->formatProductAndVoucherForEmail($cart_rules_list), '{total_paid}' => Tools::displayPrice($order->total_paid, $currency, false), '{total_products}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts, $currency, false), '{total_discounts}' => Tools::displayPrice($order->total_discounts, $currency, false), @@ -630,6 +630,18 @@ abstract class PaymentModuleCore extends Module } } + public function formatProductAndVoucherForEmail($content) + { + return ' + + + + + + + '.$content.'
'; + } + /** * @param Object Address $the_address that needs to be txt formated * @return String the txt formated address block diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html index bdd7c2a5e..3125061f0 100644 --- a/mails/de/order_conf.html +++ b/mails/de/order_conf.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -32,11 +32,16 @@ -
 
{products} {discounts} + - + + + + + + @@ -110,6 +115,6 @@ -
Artikelnr.ProduktStückpreisMengeGesamtpreis
{products}
{discounts}
  Produkte{shop_name} powered with PrestaShop™
- +
+ \ No newline at end of file diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 0ae962690..32bca14c0 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -36,7 +36,12 @@ -{products} {discounts} + + + + + + diff --git a/mails/es/order_conf.html b/mails/es/order_conf.html index 046b572a9..29ea724e4 100644 --- a/mails/es/order_conf.html +++ b/mails/es/order_conf.html @@ -36,7 +36,12 @@
ReferenceProductUnit priceQuantityTotal price
{products}
{discounts}
  Products
-{products} {discounts} + + + + + + diff --git a/mails/fr/order_conf.html b/mails/fr/order_conf.html index 5b52eb082..fa3848108 100644 --- a/mails/fr/order_conf.html +++ b/mails/fr/order_conf.html @@ -36,7 +36,12 @@
ReferenciaProductoPrecio UnidadCantidadPrecio Total
{products}
{discounts}
  Productos
-{products} {discounts} + + + + + + diff --git a/mails/it/order_conf.html b/mails/it/order_conf.html index 3b155de71..a70e60aa1 100644 --- a/mails/it/order_conf.html +++ b/mails/it/order_conf.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + +
RéférenceProduitPrix unitaireQuantitéPrix total
{products}
{discounts}
  Total produits
@@ -39,7 +39,12 @@ -{products} {discounts} + + + + + + @@ -113,6 +118,6 @@ -
RiferimentoProdottoPrezzo unitarioQuantitàPrezzo totale
{products}
{discounts}
  Prodotti{shop_name} powered with PrestaShop™
- + + \ No newline at end of file