Merge branch 'show-iban' of opi/coin into master

coin/billing/templates/billing/invoice.html

@@ -37,10 +37,10 @@
     </tbody>
 </table>
 
-<h4>Règlement</h4>
+<h3>Règlement</h3>
 
 {% if invoice.payments.exists %}
-    <table id="invoice_payments" class="invoice-table full-width">
+    <table id="invoice-payments" class="invoice-table full-width">
         <thead>
             <tr>
                 <th>Type de paiement</th>
@@ -65,10 +65,8 @@
 {% endif %}
 
 {% if invoice.amount_remaining_to_pay > 0 %}
-    <div id="payment_howto" class="panel">
-        <small>
-            {% include "billing/payment_howto.html" %}
-        </small>
+    <div id="payment-howto" class="panel">
+        {% include "billing/payment_howto.html" %}
     </div>
 {% endif %}
 

coin/billing/templates/billing/payment_howto.html

@@ -1,19 +1,31 @@
 {% load isptags %}
 
-<p><strong>Merci de préférer si possible le paiement par virement</strong></p>
-
 <p>
-<strong>Virement</strong><br />
-Titulaire du compte : {{ branding.shortname|upper }}<br/>
-IBAN : {{ branding.bankinfo.iban|pretty_iban }}<br />
+    <strong>Merci de préférer si possible le paiement par virement</strong>
+</p>
+<p>
+    <strong>Virement</strong><br />
+    Titulaire du compte : {% firstof branding.shortname branding.name %}<br/>
+    IBAN : {{ branding.bankinfo.iban|pretty_iban }}<br />
 
-{% if branding.bankinfo.bic %}
-    BIC : {{ branding.bankinfo.bic }}<br />
-{% endif %}
-Merci de faire figurer le code suivant sur votre virement : <strong>#{{ invoice.member.id }}</strong>
-<br /><br />
-<strong>Chèque</strong><br />
-{% with address=branding.registeredoffice %}
-Paiement par chèque à l'ordre de "{{ branding.bankinfo.check_order }}" envoyé à l'adresse : {{ branding.name|upper }}, {{ address.extended_address }}, {{ address.street_address }}, {{ address.postal_code }} {{ address.locality }}
-{% endwith %}
+    {% if branding.bankinfo.bic %}
+        BIC : {{ branding.bankinfo.bic }}<br />
+    {% endif %}
+    {% if invoice %}
+    Merci de faire figurer la référence suivante sur votre virement : <strong>{{ invoice.number }}</strong>
+    {% endif %}
+</p>
+<p>
+    <strong>Chèque</strong><br />
+    {% with address=branding.registeredoffice %}
+    Paiement par chèque à l'ordre de "{{ branding.bankinfo.check_order }}" envoyé à l'adresse : <br />
+    {% firstof branding.shortname branding.name %}<br />
+    {% if address.extended_address %}
+    {{ address.extended_address }}<br />
+    {% endif %}
+    {% if address.street_address %}
+    {{ address.street_address }}<br />
+    {% endif %}
+    {{ address.postal_code }} {{ address.locality }}
+    {% endwith %}
 </p>

coin/members/templates/members/invoices.html

@@ -22,8 +22,14 @@
             <td{% if invoice.amount_remaining_to_pay > 0 %} class="unpaid"{% endif %}>{{ invoice.amount_remaining_to_pay }}</td>
             <td>{% if invoice.is_pdf_exists %}<a href="{% url 'billing:invoice_pdf' id=invoice.number %}"><i class="fa fa-file-pdf-o"></i> PDF</a>{% endif %}</td>
         </tr>
+        {% empty %}
+        <tr class="placeholder"><td colspan="6">Aucune facture.</td></tr>
         {% endfor %}
     </tbody>
 </table>
 
+<h2>Coordonnées bancaires</h2>
+<div id="payment-howto" class="panel">
+    {% include "billing/payment_howto.html" %}
+</div>
 {% endblock %}

coin/static/css/local.css

@@ -229,16 +229,14 @@ table.invoice-table td.total {
     width:100px;
 }
 
-#member_invoices td.unpaid {
+#member-invoices td.unpaid {
     color:red;
 }
-#member_invoices tr.total>td.right {
+#member-invoices tr.total>td.right {
     text-align:right;
 }
 
-#payment_howto p {
-    font-size:0.7rem;
-}
+#payment-howto {}
 
 /* Modifs pour les infos */
 td.center {

coin/templates/menu_items.html

@@ -2,7 +2,7 @@
 <li class="{% ifactive 'home' %}active{% endifactive %}"><a href="{% url 'home' %}"><i class="fa fa-home fa-fw"></i> Tableau de bord</a></li>
 <li class="{% ifactive 'members:detail' %}active{% endifactive %}"><a href="{% url 'members:detail' %}"><i class="fa fa-user fa-fw"></i> Mes informations</a></li>
 <li class="{% ifactive 'members:subscriptions' %}active{% endifactive %}"><a href="{% url 'members:subscriptions' %}"><i class="fa fa-cog fa-fw"></i> Mes abonnements</a></li>
-<li class="{% ifactive 'members:invoices' %}active{% endifactive %}"><a href="{% url 'members:invoices' %}"><i class="fa fa-eur fa-fw"></i> Mes factures</a></li>
+<li class="{% ifactive 'members:invoices' %}active{% endifactive %}"><a href="{% url 'members:invoices' %}"><i class="fa fa-eur fa-fw"></i> Factures &amp; paiements</a></li>
 <li class="{% ifactive 'members:contact' %}active{% endifactive %}"><a href="{% url 'members:contact' %}"><i class="fa fa-life-ring fa-fw"></i> Contact / Support</a></li>
 <li class="divider"></li>
 {% if user.is_staff %}<li><a href="{% url 'admin:index' %}"><i class="fa fa-cogs fa-fw"></i> Administration</a></li>{% endif %}