mirror of
https://github.com/almet/copanier.git
synced 2025-04-28 11:32:38 +02:00
Make other's orders edition more explicit
This commit is contained in:
parent
906c42cb25
commit
c6cd843ea5
4 changed files with 22 additions and 8 deletions
8
TODO
8
TODO
|
@ -15,15 +15,13 @@ x Ajouter une info « prix mis à jour » pour les référent⋅e⋅s
|
|||
x Gérer les frais de livraison
|
||||
x Ajouter une note explicative pour la répartition des chèques
|
||||
x Permettre la supression des produits (terminer)
|
||||
x Gérer le souci d'URL pour l'édition d'Apiluly
|
||||
x Rendre plus visible l'action de modifier une commande
|
||||
|
||||
Gérer le souci d'URL pour l'édition d'Apiluly
|
||||
Rendre le formulaire d'édition producteur plus compact
|
||||
Ajouter la trame (agenda d’une distribution) dans la boite à outil du coordinateur
|
||||
|
||||
Faire un refactoring des modèles
|
||||
Repasser sur les tests
|
||||
|
||||
Rendre plus visible l'action de modifier une commande
|
||||
Ajouter la trame (agenda d’une distribution) dans la boite à outil du coordinateur
|
||||
|
||||
Explorer la possibilité de faire des ajustements automatiques
|
||||
Éditer directement depuis la vue « distribution »
|
|
@ -680,4 +680,9 @@ ul.actions > li {
|
|||
padding-left: 0.5em;
|
||||
padding-top: 0.5em;
|
||||
padding-bottom: -0.5em;
|
||||
}
|
||||
|
||||
.underline {
|
||||
text-decoration: underline;
|
||||
text-decoration-style: dotted;
|
||||
}
|
|
@ -31,7 +31,7 @@
|
|||
{% set orderer_name = request.groups.groups[orderer].name %}
|
||||
<th class="person">
|
||||
{% if request.user and (request.user.is_staff or request.user.is_referent(delivery)) %}
|
||||
<a href="/distribution/{{ delivery.id }}/commander?orderer={{ orderer }}" title="{{ orderer }}">{{ orderer_name }}</a>
|
||||
<a class="underline" href="/distribution/{{ delivery.id }}/commander?orderer={{ orderer }}" title="{{ orderer }}">{{ orderer_name }} <i class="icon-pencil"></i></a>
|
||||
{% else %}
|
||||
<span title="{{ orderer }}">{{ orderer_name }}</span>
|
||||
{% endif %}
|
||||
|
|
|
@ -26,7 +26,7 @@ async def test_home_should_redirect_to_login_if_not_logged(client):
|
|||
client.logout()
|
||||
resp = await client.get("/")
|
||||
assert resp.status == 302
|
||||
assert resp.headers["Location"] == "/sésame?next=/"
|
||||
assert resp.headers["Location"] == "/connexion?next=/"
|
||||
|
||||
|
||||
async def test_create_delivery(client):
|
||||
|
@ -88,6 +88,7 @@ async def test_place_order_with_empty_string(client, delivery):
|
|||
delivery = Delivery.load(id=delivery.id)
|
||||
assert not delivery.orders
|
||||
|
||||
|
||||
async def test_get_place_order_with_closed_delivery(client, delivery, monkeypatch):
|
||||
monkeypatch.setattr("copanier.config.STAFF", ["someone@else.org"])
|
||||
delivery.order_before = datetime.now() - timedelta(days=1)
|
||||
|
@ -219,6 +220,16 @@ async def test_export_products(client, delivery):
|
|||
resp = await client.get(f"/distribution/{delivery.id}/exporter")
|
||||
wb = load_workbook(filename=BytesIO(resp.body))
|
||||
assert list(wb.active.values) == [
|
||||
("name", "ref", "price", "unit", "description", "url", "img", "packing", "producer"),
|
||||
(
|
||||
"name",
|
||||
"ref",
|
||||
"price",
|
||||
"unit",
|
||||
"description",
|
||||
"url",
|
||||
"img",
|
||||
"packing",
|
||||
"producer",
|
||||
),
|
||||
("Lait", "123", 1.5, None, None, None, None, None, None),
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue