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

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-07-28 09:20:57 +00:00
1 parent df255f66c1
commit a875fecb20
968 files changed
+26082 -3937
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mails/it/order_conf.html
+7 -3
View File
@@ -92,8 +92,12 @@
<th style="text-align: left; padding: 0.3em 1em;">INDIRIZZO DI CONSEGNA</th> <th style="text-align: left; padding: 0.3em 1em;">INDIRIZZO DI FATTURAZIONE</th>
</tr>
<tr>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_company} <br /><span style="color: #db3484; font-weight: bold;">{delivery_firstname} {delivery_lastname}</span> <br />{delivery_address1} <br />{delivery_address2} <br />{delivery_city} {delivery_postal_code} <br />{delivery_country} {delivery_state} <br />{delivery_phone} <br />{delivery_other}</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_company} <br />{invoice_vat_number} <br /><span style="color: #db3484; font-weight: bold;">{invoice_firstname} {invoice_lastname}</span> <br />{invoice_address1} <br />{invoice_address2} <br />{invoice_city} {invoice_postal_code} <br />{invoice_country} {invoice_state} <br />{invoice_phone} <br />{invoice_other}</td>
<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>
</tbody>
</table>
@@ -117,4 +121,4 @@
</tbody>
</table>
</body>
</html>
</html>
mails/it/order_conf.txt
+2 -15
View File
@@ -18,24 +18,11 @@ Spedizione
Indirizzo di consegna:
{delivery_company}
{delivery_firstname} {delivery_lastname}
{delivery_address1}
{delivery_address2}
{delivery_postal_code} {delivery_city}
{delivery_country} {delivery_state}
{delivery_other}
{delivery_block_html}
Indirizzo di fatturazione:
{invoice_company}
{invoice_vat_number}
{invoice_firstname} {invoice_lastname}
{invoice_address1}
{invoice_address2}
{invoice_postal_code} {invoice_city}
{invoice_country} {invoice_state}
{invoice_other}
{delivery_block_html}
Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.
Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}guest-tracking.php