From 1f6b30c82fd0d09d72bc243a1962bd161a483c28 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Tue, 3 Jul 2018 14:54:41 +0200
Subject: [PATCH] =?UTF-8?q?M=C3=AAme=20template=20pour=20la=20validation?=
=?UTF-8?q?=20de=20paiement.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cotisations/payment_methods/cheque/views.py | 7 +++-
.../templates/cotisations/payment.html | 1 +
.../templates/cotisations/payment_form.html | 37 -------------------
3 files changed, 6 insertions(+), 39 deletions(-)
delete mode 100644 cotisations/templates/cotisations/payment_form.html
diff --git a/cotisations/payment_methods/cheque/views.py b/cotisations/payment_methods/cheque/views.py
index cb009deb..bcf707f9 100644
--- a/cotisations/payment_methods/cheque/views.py
+++ b/cotisations/payment_methods/cheque/views.py
@@ -39,6 +39,9 @@ def cheque(request, invoice_pk):
)
return render(
request,
- 'cotisations/payment_form.html',
- {'form': form}
+ 'cotisations/payment.html',
+ {
+ 'form': form,
+ 'amount': invoice.prix_total()
+ }
)
diff --git a/cotisations/templates/cotisations/payment.html b/cotisations/templates/cotisations/payment.html
index bfdde5c4..57940485 100644
--- a/cotisations/templates/cotisations/payment.html
+++ b/cotisations/templates/cotisations/payment.html
@@ -37,6 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</h3>
<form class="form" method="{{ method }}" action="{{ action }}">
{{ content | safe }}
+ {% bootstrap_form form %}
{% trans "Pay" as tr_pay %}
{% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' %}
</form>
diff --git a/cotisations/templates/cotisations/payment_form.html b/cotisations/templates/cotisations/payment_form.html
deleted file mode 100644
index 1057b7cb..00000000
--- a/cotisations/templates/cotisations/payment_form.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "cotisations/sidebar.html" %}
-{% comment %}
-Re2o est un logiciel d'administration développé initiallement au rezometz. Il
-se veut agnostique au réseau considéré, de manière à être installable en
-quelques clics.
-
-Copyright © 2018 Hugo Levy-Falk
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-{% endcomment %}
-
-{% load bootstrap3 %}
-{% load staticfiles%}
-{% load i18n %}
-
-{% block title %}{% trans form.title %}{% endblock %}
-
-{% block content %}
- <h2>{% trans form.title %}</h2>
- <form class="form" method="post">
- {% csrf_token %}
- {% bootstrap_form form %}
- {% bootstrap_button tr_confirm button_type='submit' icon='piggy-bank' %}
- </form>
-{% endblock %}