Rechargement via comnpay du solde.

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)

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(

preferences/templates/preferences/display_preferences.html

@@ -57,8 +57,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <th>Auto inscription</th>
             <td>{{ useroptions.self_adhesion }}</td>
         {% if useroptions.user_solde %}
-        <th>Rechargement max</th>
-        <td>{{ useroptions.max_recharge }}</td>
+        <th>Solde maximum</th>
+        <td>{{ useroptions.max_solde }}</td>
         {% endif %}
         </tr>
 	{% if useroptions.user_solde %}