From 27f646c200235d18013b55645deff4faf1dcfc17 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Sun, 17 Jun 2018 17:44:38 +0200 Subject: [PATCH] Afficher le bon prix c'est encore mieux --- cotisations/payment.py | 2 +- cotisations/templates/cotisations/new_facture.html | 2 ++ cotisations/templates/cotisations/payment.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cotisations/payment.py b/cotisations/payment.py index 48411c35..b1ca953e 100644 --- a/cotisations/payment.py +++ b/cotisations/payment.py @@ -29,7 +29,7 @@ def accept_payment(request, factureid): messages.success( request, _("The payment of %(amount)s € has been accepted.") % { - 'amount': invoice.prix() + 'amount': invoice.prix_total() } ) # In case a cotisation was bought, inform the user, the diff --git a/cotisations/templates/cotisations/new_facture.html b/cotisations/templates/cotisations/new_facture.html index 4dab92d3..6e90a12f 100644 --- a/cotisations/templates/cotisations/new_facture.html +++ b/cotisations/templates/cotisations/new_facture.html @@ -35,11 +35,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% csrf_token %}

{% trans "New invoice" %}

+ {% if user.solde %}

{% blocktrans %} User's balance : {{ user.solde }} € {% endblocktrans %}

+ {% endif %} {% bootstrap_form factureform %} {{ venteform.management_form }} diff --git a/cotisations/templates/cotisations/payment.html b/cotisations/templates/cotisations/payment.html index a0a1abae..bfdde5c4 100644 --- a/cotisations/templates/cotisations/payment.html +++ b/cotisations/templates/cotisations/payment.html @@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

{% blocktrans %} - Refill of {{ amount }} € + Pay {{ amount }} € {% endblocktrans %}