rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 19:33:11 +00:00
Code Issues Releases Wiki Activity

Rechargement via comnpay du solde.

Browse source
This commit is contained in:
Hugo LEVY-FALK 2018-01-12 01:07:25 +01:00 committed by root
parent 60696dbba1
commit 5b5e9b997c
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cotisations/views.py
View file

@ -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)

2
preferences/models.py
View file

@ -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(

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

@ -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 %}