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

[-] TR : fix #PSCFV-4202

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17534 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-09-25 13:35:46 +00:00
parent 61036a1c61
commit 9df166fce6
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/mailalerts/mails/en/new_order.html
+33 -33
View File
@@ -6,14 +6,14 @@
</head>
<body style="font-family: Verdana, sans-serif; font-size: 11px;">
<p style="line-height: 17px;"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a><br /><br />
Congratulations! A new order was placed on <b>{shop_name}</b> from the following customer:<br /><strong style="color: #db3484;">{firstname} {lastname} ({email})</b></p>
Congratulations! A new order was placed on <b>{shop_name}</b> from the following customer:<br /><strong style="color: #db3484;">{firstname} {lastname} ({email})</strong></p>
<table border="0">
<tr>
<td style="width: 550px; font-family: Verdana, sans-serif; font-size: 11px;">
<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">Order Details</p>
<p>Order: <b><span style="color: #db3484;">#{order_name}</span> placed on {date}</b></p>
<p>Payment method: <b>{payment}</b></p>
<p>Payment method: <b>{payment}</b></p>
<table style="width: 100%; font-size: 11px; color: #374953;">
<tr style="background-color: #b9babe; text-align: center;">
@@ -24,43 +24,43 @@
<th style="width: 20%; padding: 0.6em;">Total Price</th>
</tr>
{items}
<tr style="text-align: right;">
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Products</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Discounts</td>
<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_discounts}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Gift-wrapping</td>
<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_wrapping}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #dde2e6; padding: 0.6em 0.4em;" colspan="4">Shipping</td>
<td style="background-color: #dde2e6; padding: 0.6em 0.4em;">{total_shipping}</td>
</tr>
<tr style="text-align: right; font-weight: bold;">
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;" colspan="4">Total paid</td>
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;">{total_paid}</td>
<tr style="text-align: right;">
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Products</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Discounts</td>
<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_discounts}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Gift-wrapping</td>
<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_wrapping}</td>
</tr>
<tr style="text-align: right;">
<td style="background-color: #dde2e6; padding: 0.6em 0.4em;" colspan="4">Shipping</td>
<td style="background-color: #dde2e6; padding: 0.6em 0.4em;">{total_shipping}</td>
</tr>
<tr style="text-align: right; font-weight: bold;">
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;" colspan="4">Total paid</td>
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;">{total_paid}</td>
</tr>
</table>
<p>Carrier: <b>{carrier}</b></p>
<p>Carrier: <b>{carrier}</b></p>
<table style="width: 100%; font-size: 11px; color: #374953;">
<table style="width: 100%; font-size: 11px; color: #374953;">
<tr style="background-color: #b9babe; text-transform: uppercase;">
<th style="text-align: left; padding: 0.3em 1em;">Delivery address</th>
<th style="text-align: left; padding: 0.3em 1em;">Billing address</th>
</tr>
<tr>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_block_html}</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_block_html}</td>
</tr>
</table>
<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">Customer message: <b>{message}</b></p>
</tr>
<tr>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_block_html}</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_block_html}</td>
</tr>
</table>
<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">Customer message: <b>{message}</b></p>
<p style="width: 100%; text-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></p>
</td>
</tr>