Browse Source

added an inclusion tag to display the address of the isp

Jocelyn Delande 10 years ago
parent
commit
7010718d84

+ 2 - 7
coin/billing/templates/billing/invoice_pdf.html

@@ -1,4 +1,4 @@
-{% load static %}
+{% load static isptags %}
 <html>
 	<head>
 		<title>Facture N°{{ invoice.number }}</title>
@@ -77,15 +77,10 @@
 	<table>
 		<tr>
 			<td id="coordonnees_isp">
-            {% with address=branding.registeredoffice %}
 				<p>
-				Association {{ branding.shortname|upper }}<br />
-				{{ address.extended_address }}<br />
-				{{ address.street_address }}<br />
-				{{ address.postal_code }} {{ address.locality }}</p>
+                {% multiline_isp_addr branding %}
 				<p>{{ branding.email }}<br/>
 				<a href="{{ branding.website }}">{{ branding.website }}</a></p>
-            {% endwith %}
 			</td>
 			<td id="coordonnees_client">
 				<strong>Facturé à :</strong><br/>

+ 6 - 0
coin/isp_database/templates/isp_database/includes/isp_address_multiline.html

@@ -0,0 +1,6 @@
+{% with address=branding.registeredoffice %}
+Association {{ branding.shortname|upper }}<br />
+{{ address.extended_address }}<br />
+{{ address.street_address }}<br />
+{{ address.postal_code }} {{ address.locality }}</p>
+{% endwith %}

+ 0 - 0
coin/isp_database/templatetags/__init__.py


+ 7 - 0
coin/isp_database/templatetags/isptags.py

@@ -0,0 +1,7 @@
+from django.template import Template, Library
+
+register = Library()
+
+@register.inclusion_tag('isp_database/includes/isp_address_multiline.html')
+def multiline_isp_addr(branding):
+    return {'branding': branding}