klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 06:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix eboutic

Browse Source
This commit is contained in:
Skia 2016-07-26 19:58:36 +02:00
parent 45f5a58b4a
commit 4e6b592911
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/core/user_base.jinja
View File

@ -10,7 +10,7 @@
{% if can_edit_prop(profile, request.user) %} {% if can_edit_prop(profile, request.user) %}
<a href="{{ url('core:user_groups', user_id=profile.id) }}">{% trans %}Groups{% endtrans %}</a> <a href="{{ url('core:user_groups', user_id=profile.id) }}">{% trans %}Groups{% endtrans %}</a>
{% endif %} {% endif %}
{% if (profile == request.user {% if profile.customer and (profile == request.user
or request.user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name']) or request.user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name'])
or request.user.is_in_group(settings.SITH_GROUPS['root']['name'])) %} or request.user.is_in_group(settings.SITH_GROUPS['root']['name'])) %}
<a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Account{% endtrans %}</a> <a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Account{% endtrans %}</a>

5
eboutic/models.py
View File

@ -2,7 +2,7 @@ from django.db import models, DataError
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from accounting.models import CurrencyField from accounting.models import CurrencyField
from counter.models import Counter, Product from counter.models import Counter, Product, Customer
from core.models import User from core.models import User
class Basket(models.Model): class Basket(models.Model):
@ -57,6 +57,9 @@ class Invoice(models.Model):
def validate(self, *args, **kwargs): def validate(self, *args, **kwargs):
if self.validated: if self.validated:
raise DataError(_("Invoice already validated")) raise DataError(_("Invoice already validated"))
from counter.models import Customer
if not Customer.objects.filter(user=self.user).exists():
Customer(user=self.user, account_id=Customer.generate_account_id(), amount=0).save()
if self.payment_method == "SITH_ACCOUNT": if self.payment_method == "SITH_ACCOUNT":
self.user.customer.amount -= self.get_total() self.user.customer.amount -= self.get_total()
self.user.customer.save() self.user.customer.save()