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

[-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color}

Browse Source
This commit is contained in:
Vincent Augagneur
2013-06-04 16:14:34 +02:00
parent 682d10143e
commit 5ec36dac88
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mails/en/order_conf.html
View File

@@ -35,7 +35,7 @@
<td align="left">
<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;"><!-- Title -->
<tbody>
<tr style="background-color: #b9babe; text-align: center;">
<tr style="background-color: {color}; text-align: center;">
<th style="width: 15%; padding: 0.6em 0;">Reference</th>
<th style="width: 30%; padding: 0.6em 0;">Product</th>
<th style="width: 20%; padding: 0.6em 0;">Unit price</th>
@@ -52,8 +52,8 @@
</tr>
<tr style="text-align: right;">
<td>&nbsp;</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="3">Products</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;" colspan="3">Products</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;">{total_products}</td>
</tr>
<tr style="text-align: right;">
<td>&nbsp;</td>
@@ -72,8 +72,8 @@
</tr>
<tr style="text-align: right; font-weight: bold;">
<td>&nbsp;</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;" colspan="3">Total paid</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;">{total_paid}</td>
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;" colspan="3">Total paid</td>
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;">{total_paid}</td>
</tr>
</tbody>
</table>
@@ -98,7 +98,7 @@
<td>
<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;">
<tbody>
<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 style="background-color: {color}; 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>
@@ -125,4 +125,4 @@
</tbody>
</table>
</body>
</html>
</html>

14
modules/mailalerts/mails/en/new_order.html
View File

@@ -16,7 +16,7 @@
<p>Payment method: <b>{payment}</b></p>
<table style="width: 100%; font-size: 11px; color: #374953;">
<tr style="background-color: #b9babe; text-align: center;">
<tr style="background-color: {color}; text-align: center;">
<th style="width: 15%; padding: 0.6em;">Reference</th>
<th>Product</th>
<th style="width: 15%; padding: 0.6em;">Price</th>
@@ -27,8 +27,8 @@
<td>{items}</td>
</tr>
<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>
<td style="background-color: {color}; padding: 0.6em 0.4em;" colspan="4">Products</td>
<td style="background-color: {color}; 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>
@@ -43,15 +43,15 @@
<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: {color}; padding: 0.6em 0.4em;" colspan="4">Total paid</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;">{total_paid}</td>
<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>
<table style="width: 100%; font-size: 11px; color: #374953;">
<tr style="background-color: #b9babe; text-transform: uppercase;">
<tr style="background-color: {color}; 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>
@@ -68,4 +68,4 @@
</tr>
</table>
</body>
</html>
</html>