rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-29 08:02:24 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Gabriel Detraz 2018-01-14 20:15:21 +01:00 committed by root
parent 5b5e9b997c
commit 2ebe6e1958
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cotisations/views.py
View file

@ -711,11 +711,6 @@ def recharge(request):
number=1, number=1,
) )
v.save() v.save()
<<<<<<< HEAD
content = payment.PAYMENT_SYSTEM[options.payment](facture, request) 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 render(request, 'cotisations/payment.html', content)
return form({'rechargeform':f}, 'cotisations/recharge.html', request) return form({'rechargeform':f}, 'cotisations/recharge.html', request)

4
preferences/templates/preferences/display_preferences.html
View file

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