Commit 328c030c authored by Hugo LEVY-FALK's avatar Hugo LEVY-FALK

Supprime la vue 'recharge' qui faisait doublon avec 'credit_solde'

parent ebe5633f
...@@ -31,7 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -31,7 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
{% bootstrap_form_errors factureform %} {% bootstrap_form_errors factureform %}
{% if title %}
<h3>{{title}}</h3>
{% endif %}
{% if balance %}
<h4>{% trans "Current balance :" %}{{balance}}€</h4>
{% endif %}
<form class="form" method="post"> <form class="form" method="post">
{% csrf_token %} {% csrf_token %}
{% if articlesformset %} {% if articlesformset %}
......
...@@ -138,11 +138,6 @@ urlpatterns = [ ...@@ -138,11 +138,6 @@ urlpatterns = [
views.new_facture_solde, views.new_facture_solde,
name='new_facture_solde' name='new_facture_solde'
), ),
url(
r'^recharge/$',
views.recharge,
name='recharge'
),
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
] + payment_methods.urls.urlpatterns ] + payment_methods.urls.urlpatterns
...@@ -326,39 +326,6 @@ def del_facture(request, facture, **_kwargs): ...@@ -326,39 +326,6 @@ def del_facture(request, facture, **_kwargs):
}, 'cotisations/delete.html', request) }, 'cotisations/delete.html', request)
# TODO : change solde to balance
@login_required
@can_create(Facture)
@can_edit(User)
def credit_solde(request, user, **_kwargs):
"""
View used to edit the balance of a user.
Can be use either to increase or decrease a user's balance.
"""
# TODO : change facture to invoice
invoice = CreditSoldeForm(request.POST or None)
if invoice.is_valid():
invoice_instance = invoice.save(commit=False)
invoice_instance.user = user
invoice_instance.save()
new_purchase = Vente.objects.create(
facture=invoice_instance,
name="solde",
prix=invoice.cleaned_data['montant'],
number=1
)
new_purchase.save()
messages.success(
request,
_("Balance successfully updated.")
)
return redirect(reverse('cotisations:index'))
return form({
'factureform': invoice,
'action_name': _("Edit")
}, 'cotisations/facture.html', request)
@login_required @login_required
@can_create(Article) @can_create(Article)
def add_article(request): def add_article(request):
...@@ -815,11 +782,14 @@ def new_facture_solde(request, userid): ...@@ -815,11 +782,14 @@ def new_facture_solde(request, userid):
}, 'cotisations/new_facture_solde.html', request) }, 'cotisations/new_facture_solde.html', request)
# TODO : change recharge to refill # TODO : change solde to balance
@login_required @login_required
def recharge(request): @can_create(Facture)
@can_edit(User)
def credit_solde(request, user, **_kwargs):
""" """
View used to refill the balance by using online payment. View used to edit the balance of a user.
Can be use either to increase or decrease a user's balance.
""" """
refill_form = RechargeForm(request.POST or None, user=request.user) refill_form = RechargeForm(request.POST or None, user=request.user)
if refill_form.is_valid(): if refill_form.is_valid():
...@@ -835,6 +805,8 @@ def recharge(request): ...@@ -835,6 +805,8 @@ def recharge(request):
) )
return invoice.paiement.end_payment(invoice, request) return invoice.paiement.end_payment(invoice, request)
return form({ return form({
'rechargeform': refill_form, 'factureform': refill_form,
'solde': request.user.solde 'balance': request.user.solde,
}, 'cotisations/recharge.html', request) 'title': _("Refill your balance"),
'action_name': _("Pay")
}, 'cotisations/facture.html', request)
...@@ -34,7 +34,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %} ...@@ -34,7 +34,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<span class="label label-success">active</span>{% else %}<span class="label label-danger">désactivée</span>{% endif %}.</p> <span class="label label-success">active</span>{% else %}<span class="label label-danger">désactivée</span>{% endif %}.</p>
{% if user_solde %} {% if user_solde %}
<p>Votre solde est de <span class="badge">{{ users.solde }}€</span>. <p>Votre solde est de <span class="badge">{{ users.solde }}€</span>.
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:recharge' %}"> <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.pk%}">
<i class="fa fa-euro-sign"></i> <i class="fa fa-euro-sign"></i>
Recharger Recharger
</a> </a>
...@@ -165,7 +165,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %} ...@@ -165,7 +165,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<th>Solde</th> <th>Solde</th>
<td>{{ users.solde }} € <td>{{ users.solde }} €
{% if user_solde %} {% if user_solde %}
<a class="btn btn-primary btn-sm" style='float:right' role="button" href="{% url 'cotisations:recharge' %}"> <a class="btn btn-primary btn-sm" style='float:right' role="button" href="{% url 'cotisations:credit-solde' users.pk%}">
<i class="fa fa-euro-sign"></i> <i class="fa fa-euro-sign"></i>
Recharger Recharger
</a> </a>
......
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