From 76311065d99cc18389cf368b6a5dd0ed20f760b7 Mon Sep 17 00:00:00 2001 From: Bastien Roy Date: Mon, 15 Apr 2024 09:22:36 +0200 Subject: [PATCH 1/7] =?UTF-8?q?166=20t=C3=A9l=C3=A9phone=20obligatoire=20(?= =?UTF-8?q?manque=20css)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- la_chariotte/order/forms.py | 6 ++++++ .../0027_groupedorder_phone_mandatory.py | 20 +++++++++++++++++++ la_chariotte/order/models.py | 1 + .../templates/order/grouped_order_create.html | 7 +++++-- .../templates/order/grouped_order_detail.html | 7 ++++++- .../templates/order/grouped_order_update.html | 10 +++++++++- la_chariotte/order/views/grouped_order.py | 13 +++++++----- 7 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 la_chariotte/order/migrations/0027_groupedorder_phone_mandatory.py diff --git a/la_chariotte/order/forms.py b/la_chariotte/order/forms.py index 8e28d5a..334339c 100644 --- a/la_chariotte/order/forms.py +++ b/la_chariotte/order/forms.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth import get_user_model from django.forms.utils import to_current_timezone from django.utils import timezone +from pygments.lexer import default from la_chariotte.order.models import GroupedOrder, Item @@ -18,6 +19,10 @@ class GroupedOrderForm(forms.ModelForm): widget=forms.TimeInput(attrs={"type": "time"}), initial=datetime.time(hour=23, minute=59, second=59), ) + phone_mandatory = forms.BooleanField( + label="Numéro de téléphone obligatoire pour les participants", + required=False, + ) class Meta: model = GroupedOrder @@ -29,6 +34,7 @@ class GroupedOrderForm(forms.ModelForm): "delivery_slot", "place", "description", + "phone_mandatory" ] widgets = { "name": forms.TextInput( diff --git a/la_chariotte/order/migrations/0027_groupedorder_phone_mandatory.py b/la_chariotte/order/migrations/0027_groupedorder_phone_mandatory.py new file mode 100644 index 0000000..273749b --- /dev/null +++ b/la_chariotte/order/migrations/0027_groupedorder_phone_mandatory.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.11 on 2024-04-14 08:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("order", "0026_groupedorder_delivery_slot"), + ] + + operations = [ + migrations.AddField( + model_name="groupedorder", + name="phone_mandatory", + field=models.BooleanField( + default=False, verbose_name="Numéro de téléphone obligatoire" + ), + ), + ] diff --git a/la_chariotte/order/models.py b/la_chariotte/order/models.py index 55dd867..84d601f 100644 --- a/la_chariotte/order/models.py +++ b/la_chariotte/order/models.py @@ -27,6 +27,7 @@ class GroupedOrder(models.Model): description = models.TextField("Description", null=True, blank=True) total_price = models.DecimalField(max_digits=10, decimal_places=2, default=0) code = models.CharField(auto_created=True) + phone_mandatory = models.BooleanField(default=False, verbose_name="Numéro de téléphone obligatoire") def create_code_from_pk(self): """When a grouped order is created, a unique code is generated, to be used to diff --git a/la_chariotte/order/templates/order/grouped_order_create.html b/la_chariotte/order/templates/order/grouped_order_create.html index 3accfb1..01c8858 100644 --- a/la_chariotte/order/templates/order/grouped_order_create.html +++ b/la_chariotte/order/templates/order/grouped_order_create.html @@ -1,5 +1,7 @@ {% extends 'base.html' %} +{% load crispy_forms_tags %} + {% block title %}Nouvelle commande groupée{% endblock %} {% block content %} @@ -10,8 +12,9 @@

Nouvelle commande groupée

-
{% csrf_token %} - {{ form.as_p }} + + {% csrf_token %} + {{ form | crispy }}
Annuler diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html index b80aed5..b8472dd 100644 --- a/la_chariotte/order/templates/order/grouped_order_detail.html +++ b/la_chariotte/order/templates/order/grouped_order_detail.html @@ -186,7 +186,6 @@ // Compute total price whenever a value in input is modified document.getElementById("inputs-parent").addEventListener("change", function () { inputs = [...document.getElementsByTagName("input")].filter(input => input.getAttribute("name").indexOf("quantity_") === 0); //filter the inputs to get the quantity inputs only - prices = {{ prices_dict | safe }}; let total_price = 0; @@ -200,5 +199,11 @@ el.innerHTML = total_price; }) }); + + + if( '{{ phone_required }}' === 'True') { + document.getElementById('phone').required = true + } + {% endblock %} diff --git a/la_chariotte/order/templates/order/grouped_order_update.html b/la_chariotte/order/templates/order/grouped_order_update.html index e6ad3b4..d8d0695 100644 --- a/la_chariotte/order/templates/order/grouped_order_update.html +++ b/la_chariotte/order/templates/order/grouped_order_update.html @@ -1,5 +1,7 @@ {% extends 'base.html' %} +{% load crispy_forms_tags %} + {% block title %}Modifier la commande groupée{% endblock %} {% block content %} @@ -9,13 +11,19 @@

{{ grouped_order.name }} - modifier

{% csrf_token %} - {{ form.as_p }} + {{ form | crispy }}
Annuler
+ + +
+

Lorem ipsum...

+
+ {% endblock %} {% block extra_js %} diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py index f2c454b..ff77335 100644 --- a/la_chariotte/order/views/grouped_order.py +++ b/la_chariotte/order/views/grouped_order.py @@ -30,8 +30,8 @@ class IndexView(LoginRequiredMixin, generic.ListView): # Get the 5 most recent old grouped orders old = grouped_orders.filter(delivery_date__lt=today).order_by("-delivery_date")[ - :5 - ] + :5 + ] # Get grouped orders that have crossed their ordering deadline # but the delivery date is still to come. @@ -82,7 +82,7 @@ class GroupedOrderEventView(generic.DetailView): description += "Heure de livraison : " + self.object.delivery_slot + "\n" if self.object.description: description += ( - "Note de l'organisateur.ice : " + "\n" + self.object.description + "Note de l'organisateur.ice : " + "\n" + self.object.description ) event.add("description", vText(description)) @@ -112,7 +112,8 @@ class GroupedOrderDetailView(generic.DetailView): return get_object_or_404(GroupedOrder, code=self.kwargs.get("code")) def get_context_data(self, **kwargs): - items = self.get_object().item_set.all() + grouped_order = self.get_object() + items = grouped_order.item_set.all() remaining_qty = {item.id: item.get_remaining_nb() for item in items} prices_dict = {item.id: item.price for item in items} @@ -134,6 +135,8 @@ class GroupedOrderDetailView(generic.DetailView): "prices_dict": json.dumps(prices_dict, cls=DjangoJSONEncoder), "remaining_qty": remaining_qty, "order_author": order_author, + # Used to set if the phone is required in the form + "phone_required": grouped_order.phone_mandatory, } ) return context @@ -362,7 +365,7 @@ class ExportGroupedOrderToCSVView(GroupedOrderExportView): response = http.HttpResponse( content_type="text/csv", headers={ - "Content-Disposition": f'attachment; filename="{ context["object"].name }-commandes"' + "Content-Disposition": f'attachment; filename="{context["object"].name}-commandes"' }, ) writer = csv.writer(response) From 6a82102ef0bf1452fdfdba7c7621397af1f9d370 Mon Sep 17 00:00:00 2001 From: Bhorah Date: Sun, 21 Apr 2024 11:29:56 +0200 Subject: [PATCH 2/7] =?UTF-8?q?166=20suppression=20d'un=20truc=20qui=20ava?= =?UTF-8?q?it=20pas=20sa=20place=20l=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- la_chariotte/order/templates/order/grouped_order_update.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/la_chariotte/order/templates/order/grouped_order_update.html b/la_chariotte/order/templates/order/grouped_order_update.html index d8d0695..eaad0cd 100644 --- a/la_chariotte/order/templates/order/grouped_order_update.html +++ b/la_chariotte/order/templates/order/grouped_order_update.html @@ -19,11 +19,6 @@
- -
-

Lorem ipsum...

-
- {% endblock %} {% block extra_js %} From 8adc700005379f4ce997bff22303a84abdd9d995 Mon Sep 17 00:00:00 2001 From: Laetitia Date: Sun, 20 Oct 2024 15:57:41 +0200 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20le=20tel=20n'est=20plus=20obligatoi?= =?UTF-8?q?re=20quand=20l'organisateur=20a=20choisi=20=C3=A7a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Affichage de "faciltatif" dans le formulaire de commande --- la_chariotte/order/forms.py | 2 +- .../0028_alter_order_created_date.py | 19 ++++++++++++ la_chariotte/order/models.py | 4 ++- .../templates/order/grouped_order_detail.html | 14 ++++----- la_chariotte/order/views/grouped_order.py | 6 ++-- .../tests/test_order_views_grouped_order.py | 30 +++++++++++++++++++ la_chariotte/tests/utils.py | 12 ++++++-- 7 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 la_chariotte/order/migrations/0028_alter_order_created_date.py diff --git a/la_chariotte/order/forms.py b/la_chariotte/order/forms.py index 334339c..cfc91f2 100644 --- a/la_chariotte/order/forms.py +++ b/la_chariotte/order/forms.py @@ -34,7 +34,7 @@ class GroupedOrderForm(forms.ModelForm): "delivery_slot", "place", "description", - "phone_mandatory" + "phone_mandatory", ] widgets = { "name": forms.TextInput( diff --git a/la_chariotte/order/migrations/0028_alter_order_created_date.py b/la_chariotte/order/migrations/0028_alter_order_created_date.py new file mode 100644 index 0000000..e763250 --- /dev/null +++ b/la_chariotte/order/migrations/0028_alter_order_created_date.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2 on 2024-10-20 13:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("order", "0027_groupedorder_phone_mandatory"), + ] + + operations = [ + migrations.AlterField( + model_name="order", + name="created_date", + field=models.DateTimeField( + auto_now_add=True, verbose_name="Date et heure de commande" + ), + ), + ] diff --git a/la_chariotte/order/models.py b/la_chariotte/order/models.py index 84d601f..dc5257e 100644 --- a/la_chariotte/order/models.py +++ b/la_chariotte/order/models.py @@ -27,7 +27,9 @@ class GroupedOrder(models.Model): description = models.TextField("Description", null=True, blank=True) total_price = models.DecimalField(max_digits=10, decimal_places=2, default=0) code = models.CharField(auto_created=True) - phone_mandatory = models.BooleanField(default=False, verbose_name="Numéro de téléphone obligatoire") + phone_mandatory = models.BooleanField( + default=False, verbose_name="Numéro de téléphone obligatoire" + ) def create_code_from_pk(self): """When a grouped order is created, a unique code is generated, to be used to diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html index b8472dd..282a32a 100644 --- a/la_chariotte/order/templates/order/grouped_order_detail.html +++ b/la_chariotte/order/templates/order/grouped_order_detail.html @@ -158,9 +158,11 @@ value="{{ order_author.last_name }}" required>

-

-

+

+

@@ -199,11 +201,5 @@ el.innerHTML = total_price; }) }); - - - if( '{{ phone_required }}' === 'True') { - document.getElementById('phone').required = true - } - {% endblock %} diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py index ff77335..1ec6e29 100644 --- a/la_chariotte/order/views/grouped_order.py +++ b/la_chariotte/order/views/grouped_order.py @@ -30,8 +30,8 @@ class IndexView(LoginRequiredMixin, generic.ListView): # Get the 5 most recent old grouped orders old = grouped_orders.filter(delivery_date__lt=today).order_by("-delivery_date")[ - :5 - ] + :5 + ] # Get grouped orders that have crossed their ordering deadline # but the delivery date is still to come. @@ -82,7 +82,7 @@ class GroupedOrderEventView(generic.DetailView): description += "Heure de livraison : " + self.object.delivery_slot + "\n" if self.object.description: description += ( - "Note de l'organisateur.ice : " + "\n" + self.object.description + "Note de l'organisateur.ice : " + "\n" + self.object.description ) event.add("description", vText(description)) diff --git a/la_chariotte/tests/test_order_views_grouped_order.py b/la_chariotte/tests/test_order_views_grouped_order.py index cfce0c4..3d04f38 100644 --- a/la_chariotte/tests/test_order_views_grouped_order.py +++ b/la_chariotte/tests/test_order_views_grouped_order.py @@ -662,6 +662,36 @@ class TestGroupedOrderDetailView: assert order.price == 4 assert item.get_remaining_nb() == 16 + def test_phone_not_required_display(self, client, other_user): + """a user orders something without entering phone when it is required""" + grouped_order = create_grouped_order( + days_before_delivery_date=5, + days_before_deadline=2, + name="gr order test", + orga_user=other_user, + ) + assert grouped_order.phone_mandatory == True + item = models.Item.objects.create( + name="test item 1", grouped_order=grouped_order, price=1, max_limit=2 + ) + detail_url = reverse( + "order:grouped_order_detail", + kwargs={ + "code": grouped_order.code, + }, + ) + response = client.get(detail_url) + assert response.status_code == 200 + assert "gr order test" in response.content.decode() + assert ( + "Numéro de téléphone (facultatif)" not in response.content.decode() + ) + grouped_order.phone_mandatory = False + grouped_order.save() + response = client.get(detail_url) + assert "gr order test" in response.content.decode() + assert "Numéro de téléphone (facultatif)" in response.content.decode() + class TestGroupedOrderOverview: def test_get_overview(self, client_log): diff --git a/la_chariotte/tests/utils.py b/la_chariotte/tests/utils.py index b7cc913..7308c0f 100644 --- a/la_chariotte/tests/utils.py +++ b/la_chariotte/tests/utils.py @@ -9,12 +9,20 @@ pytestmark = pytest.mark.django_db def create_grouped_order( - days_before_delivery_date, days_before_deadline, name, orga_user + days_before_delivery_date, + days_before_deadline, + name, + orga_user, + phone_mandatory=True, ): date = timezone.now().date() + datetime.timedelta(days=days_before_delivery_date) deadline = timezone.now() + datetime.timedelta(days=days_before_deadline) grouped_order = models.GroupedOrder.objects.create( - name=name, orga=orga_user, delivery_date=date, deadline=deadline + name=name, + orga=orga_user, + delivery_date=date, + deadline=deadline, + phone_mandatory=phone_mandatory, ) grouped_order.create_code_from_pk() grouped_order.save() From b05eeb5a82cd5ca63528d1e0cc3d59b23a83baea Mon Sep 17 00:00:00 2001 From: Laetitia Date: Sun, 20 Oct 2024 16:15:51 +0200 Subject: [PATCH 4/7] feat: affichage telephone dans la liste des commandes sur la page de gestion --- la_chariotte/order/templates/order/grouped_order_overview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/la_chariotte/order/templates/order/grouped_order_overview.html b/la_chariotte/order/templates/order/grouped_order_overview.html index 87ebaf0..67f9ca5 100644 --- a/la_chariotte/order/templates/order/grouped_order_overview.html +++ b/la_chariotte/order/templates/order/grouped_order_overview.html @@ -161,7 +161,7 @@ {{ order.author }} {{ order.price }} € - {{ order.author.email }} + {{ order.author.email }}{% if order.author.phone %} / {{ order.author.phone }}{% endif %}
-

-

+

+

-

+

+ {% if is_phone_mandatory %}required{% endif %}>

diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py index 1ec6e29..b24d8c1 100644 --- a/la_chariotte/order/views/grouped_order.py +++ b/la_chariotte/order/views/grouped_order.py @@ -136,7 +136,7 @@ class GroupedOrderDetailView(generic.DetailView): "remaining_qty": remaining_qty, "order_author": order_author, # Used to set if the phone is required in the form - "phone_required": grouped_order.phone_mandatory, + "is_phone_mandatory": grouped_order.is_phone_mandatory, } ) return context diff --git a/la_chariotte/tests/test_order_views_grouped_order.py b/la_chariotte/tests/test_order_views_grouped_order.py index 3d04f38..5aefcc4 100644 --- a/la_chariotte/tests/test_order_views_grouped_order.py +++ b/la_chariotte/tests/test_order_views_grouped_order.py @@ -670,7 +670,7 @@ class TestGroupedOrderDetailView: name="gr order test", orga_user=other_user, ) - assert grouped_order.phone_mandatory == True + assert grouped_order.is_phone_mandatory == True item = models.Item.objects.create( name="test item 1", grouped_order=grouped_order, price=1, max_limit=2 ) @@ -686,7 +686,7 @@ class TestGroupedOrderDetailView: assert ( "Numéro de téléphone (facultatif)" not in response.content.decode() ) - grouped_order.phone_mandatory = False + grouped_order.is_phone_mandatory = False grouped_order.save() response = client.get(detail_url) assert "gr order test" in response.content.decode() diff --git a/la_chariotte/tests/utils.py b/la_chariotte/tests/utils.py index 7308c0f..a404d5b 100644 --- a/la_chariotte/tests/utils.py +++ b/la_chariotte/tests/utils.py @@ -13,7 +13,7 @@ def create_grouped_order( days_before_deadline, name, orga_user, - phone_mandatory=True, + is_phone_mandatory=True, ): date = timezone.now().date() + datetime.timedelta(days=days_before_delivery_date) deadline = timezone.now() + datetime.timedelta(days=days_before_deadline) @@ -22,7 +22,7 @@ def create_grouped_order( orga=orga_user, delivery_date=date, deadline=deadline, - phone_mandatory=phone_mandatory, + is_phone_mandatory=is_phone_mandatory, ) grouped_order.create_code_from_pk() grouped_order.save()