// MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
df255f66c1
commit
a875fecb20
968 files changed
+26082
-3937
No files matched your search
@@ -86,8 +86,12 @@
|
||||
<th style="text-align: left; padding: 0.3em 1em;">Dirección de entrega</th><th style="text-align: left; padding: 0.3em 1em;">Dirección de facturación</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 /><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>
|
||||
@@ -115,4 +119,4 @@
|
||||
</table>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
Reference in new issue
Block a user