almet/la-chariotte
1
0
Fork 0
mirror of https://framagit.org/la-chariotte/la-chariotte.git synced 2025-05-03 12:21:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace any instance of is_ongoing by is_open

Browse source
This commit is contained in:
SimGetti 2023-08-11 16:42:21 +02:00 committed by Alexis Metaireau
parent 49c3a3f615
commit 59f3870c41
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
la_chariotte/order/models.py
View file

@ -58,7 +58,7 @@ class GroupedOrder(models.Model):
for item in self.item_set.all():
item.compute_ordered_nb()
def is_ongoing(self):
def is_open(self):
"""Returns True if the grouped order is open for new Orders - False if it's too late"""
return self.deadline >= timezone.now()

4
la_chariotte/order/templates/order/grouped_order_detail.html
View file

@ -54,7 +54,7 @@
<p>
<strong>Cette commande groupée est terminée</strong>, la livraison a eu lieu le {{ grouped_order.deadline }}.
</p>
{% elif not grouped_order.is_ongoing %}
{% elif not grouped_order.is_open %}
<p>
<strong>La période de commande est terminée</strong> depuis le {{ grouped_order.deadline }}.
{% if user == grouped_order.orga %}
@ -64,7 +64,7 @@
{% endif %}
</p>
{% endif %}
{% if grouped_order.is_ongoing or user == grouped_order.orga and grouped_order.is_to_be_delivered %}
{% if grouped_order.is_open or user == grouped_order.orga and grouped_order.is_to_be_delivered %}
{% if not grouped_order.item_set.first %}
<p>Il n'y a pas de produits disponibles dans cette commande !</p>
{% else %}

2
la_chariotte/order/templates/order/grouped_order_overview.html
View file

@ -73,7 +73,7 @@
<p>
<strong>Cette commande groupée est terminée</strong>, la livraison a eu lieu le {{ grouped_order.deadline }}.
</p>
{% elif not grouped_order.is_ongoing %}
{% elif not grouped_order.is_open %}
<p>
<strong>La période de commande est terminée</strong> depuis le {{ grouped_order.deadline }}.
Vous pouvez préparer la livraison, qui aura lieu le {{ grouped_order.delivery_date }} !

4
la_chariotte/order/views/order.py
View file

@ -16,9 +16,9 @@ def place_order(request, code):
# check if the grouped order is ongoing or if the user is allowed to order
user_is_orga = request.user == grouped_order.orga
is_to_be_delivered = grouped_order.is_to_be_delivered()
is_ongoing = grouped_order.is_ongoing()
is_open = grouped_order.is_open()
access_allowed = is_ongoing or (user_is_orga and is_to_be_delivered)
access_allowed = is_open or (user_is_orga and is_to_be_delivered)
if not access_allowed:
return http.HttpResponseForbidden()

3
la_chariotte/static/css/app.css
View file

@ -214,7 +214,8 @@ fieldset[disabled] .file-name, fieldset[disabled] .select select, .select fields
padding: 0;
}
/* Bulma Base */ /*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */
/* Bulma Base */
/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */
html,
body,
p,