mirror of
https://github.com/ae-utbm/sith.git
synced 2025-10-09 16:24:39 +00:00
Merge pull request #1189 from ae-utbm/deleted_barman_user_fix
Deleted barman user fix
This commit is contained in:
@@ -30,7 +30,11 @@
|
|||||||
- {{ purchase.date|localtime|time(DATETIME_FORMAT) }}
|
- {{ purchase.date|localtime|time(DATETIME_FORMAT) }}
|
||||||
</td>
|
</td>
|
||||||
<td>{{ purchase.counter }}</td>
|
<td>{{ purchase.counter }}</td>
|
||||||
|
{% if not purchase.seller %}
|
||||||
|
<td>{% trans %}Deleted user{% endtrans %}</td>
|
||||||
|
{% else %}
|
||||||
<td><a href="{{ purchase.seller.get_absolute_url() }}">{{ purchase.seller.get_display_name() }}</a></td>
|
<td><a href="{{ purchase.seller.get_absolute_url() }}">{{ purchase.seller.get_display_name() }}</a></td>
|
||||||
|
{% endif %}
|
||||||
<td>{{ purchase.label }}</td>
|
<td>{{ purchase.label }}</td>
|
||||||
<td>{{ purchase.quantity }}</td>
|
<td>{{ purchase.quantity }}</td>
|
||||||
<td>{{ purchase.quantity * purchase.unit_price }} €</td>
|
<td>{{ purchase.quantity * purchase.unit_price }} €</td>
|
||||||
|
@@ -20,7 +20,8 @@ from core.baker_recipes import (
|
|||||||
)
|
)
|
||||||
from core.models import Group, User
|
from core.models import Group, User
|
||||||
from core.views import UserTabsMixin
|
from core.views import UserTabsMixin
|
||||||
from counter.models import Counter, Refilling, Selling
|
from counter.baker_recipes import sale_recipe
|
||||||
|
from counter.models import Counter, Customer, Refilling, Selling
|
||||||
from eboutic.models import Invoice, InvoiceItem
|
from eboutic.models import Invoice, InvoiceItem
|
||||||
|
|
||||||
|
|
||||||
@@ -129,6 +130,31 @@ def test_user_account_not_found(client: Client):
|
|||||||
assert res.status_code == 404
|
assert res.status_code == 404
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_is_deleted_barman_shown_as_deleted(client: Client):
|
||||||
|
customer = baker.make(Customer)
|
||||||
|
date = now()
|
||||||
|
sale_recipe.make(
|
||||||
|
seller=iter([None, baker.make(User)]),
|
||||||
|
customer=customer,
|
||||||
|
date=date,
|
||||||
|
_quantity=2,
|
||||||
|
_bulk_create=True,
|
||||||
|
)
|
||||||
|
client.force_login(customer.user)
|
||||||
|
res = client.get(
|
||||||
|
reverse(
|
||||||
|
"core:user_account_detail",
|
||||||
|
kwargs={
|
||||||
|
"user_id": customer.user.id,
|
||||||
|
"year": date.year,
|
||||||
|
"month": date.month,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
assert res.status_code == 200
|
||||||
|
|
||||||
|
|
||||||
class TestFilterInactive(TestCase):
|
class TestFilterInactive(TestCase):
|
||||||
@classmethod
|
@classmethod
|
||||||
def setUpTestData(cls):
|
def setUpTestData(cls):
|
||||||
|
@@ -2344,6 +2344,10 @@ msgstr "Etickets"
|
|||||||
msgid "User has no account"
|
msgid "User has no account"
|
||||||
msgstr "L'utilisateur n'a pas de compte"
|
msgstr "L'utilisateur n'a pas de compte"
|
||||||
|
|
||||||
|
#: core/templates/core/user_account_detail.jinja
|
||||||
|
msgid "Deleted user"
|
||||||
|
msgstr "Utilisateur supprimé"
|
||||||
|
|
||||||
#: core/templates/core/user_account_detail.jinja
|
#: core/templates/core/user_account_detail.jinja
|
||||||
#: counter/templates/counter/last_ops.jinja
|
#: counter/templates/counter/last_ops.jinja
|
||||||
#: counter/templates/counter/refilling_list.jinja
|
#: counter/templates/counter/refilling_list.jinja
|
||||||
|
Reference in New Issue
Block a user