Ce serveur Gitlab sera éteint le 30 juin 2020, pensez à migrer vos projets vers les serveurs gitlab-research.centralesupelec.fr et gitlab-student.centralesupelec.fr !

Commit 208d703d authored by Gabriel Detraz's avatar Gabriel Detraz Committed by root

Montant minimal de rechargement + refactor de la fonction payment + self adhesion

parent a5a96727
......@@ -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)
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment