From 208d703d95732f75915b2069476c634ea326cba6 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 14 Jan 2018 20:15:21 +0100
Subject: [PATCH] Montant minimal de rechargement + refactor de la fonction
 payment + self adhesion

---
 cotisations/views.py                                       | 5 -----
 preferences/templates/preferences/display_preferences.html | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/cotisations/views.py b/cotisations/views.py
index 35748765..16d25295 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -711,11 +711,6 @@ def recharge(request):
             number=1,
         )
         v.save()
-<<<<<<< HEAD
         content = payment.PAYMENT_SYSTEM[options.payment](facture, request)
-=======
-        options, _created = AssoOption.objects.get_or_create()
-        content = payment.PAYMENT_SYSTEM[options.payment](facture, request.get_host())
->>>>>>> Rechargement via comnpay du solde.
         return render(request, 'cotisations/payment.html', content)
     return form({'rechargeform':f}, 'cotisations/recharge.html', request)
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 53b4ca05..e46564a3 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -56,10 +56,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ useroptions.all_can_create }}</td>
             <th>Auto inscription</th>
             <td>{{ useroptions.self_adhesion }}</td>
-        {% if useroptions.user_solde %}
-        <th>Solde maximum</th>
-        <td>{{ useroptions.max_solde }}</td>
-        {% endif %}
         </tr>
 	{% if useroptions.user_solde %}
 	<tr>