diff --git a/cotisations/views.py b/cotisations/views.py index 16d25295..35748765 100644 --- a/cotisations/views.py +++ b/cotisations/views.py @@ -711,6 +711,11 @@ 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/models.py b/preferences/models.py index d49a074f..4d2a29dd 100644 --- a/preferences/models.py +++ b/preferences/models.py @@ -55,7 +55,7 @@ class OptionalUser(models.Model): max_recharge = models.DecimalField( max_digits=5, decimal_places=2, - default=100 + default=50 ) gpg_fingerprint = models.BooleanField(default=True) all_can_create = models.BooleanField( diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index 9f958d72..53b4ca05 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -57,8 +57,8 @@ with this program; if not, write to the Free Software Foundation, Inc., Auto inscription {{ useroptions.self_adhesion }} {% if useroptions.user_solde %} - Rechargement max - {{ useroptions.max_recharge }} + Solde maximum + {{ useroptions.max_solde }} {% endif %} {% if useroptions.user_solde %}