add questions and yellow borders

contenu à relire, et front à amélirer

CHANGELOG.md

@@ -5,23 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.3.0 (2024-11-02)
-
-This is a small release, with a few features and bugfixes. The code is now
-hosted on https://framagit.org rather than https://gitlab.com.
-
-### Added
-
-- Changed hour and date format in the generated CSV files
-- Added the date in the grouped order dashboard
-- Changed the display of the last possible date and hour to place an order
-- Added the total number of ordered items in the grouped orders overview
-- Removed header line and column for grouped order name in the CSV export for emails
-
-### Fixed
-
-- The "reset password" form is now fixed, it was broken since the last release.
-
 ## 1.2.0 (2024-07-12)
 
 A small release, with a few features, a new footer and a `/stats` endpoint.

docs/development/architecture.md

@@ -22,21 +22,22 @@ classDiagram
       name
       deadline : DateTime
       delivery_date : Date
-      delivery_slot
       place
       description
       orga : CustomUser
+      total_price
     }
     class Item{
       name
       grouped_order : GroupedOrder
       ordered_nb
-      price
+      total_price
       max_limit
     }
     class Order{
         grouped_order : GroupedOrder
         author : OrderAuthor
+        price
         created_date
         note
     }

la_chariotte/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.0"
+__version__ = "1.2.0"

la_chariotte/accounts/templates/registration/password_reset_complete.html

@@ -8,6 +8,6 @@
 </p>
 <div class="box">
     <p>Votre mot de passe a été correctement réinitialisé. Vous pouvez maintenant vous connecter.</p>
-    <a class="button is-primary" href="{% url 'accounts:login' %}">Se connecter</a>
+    <button class="button is-primary" href="{% url 'accounts:login'%}">Se connecter</button>
 </div>
 {% endblock %}

la_chariotte/accounts/templates/registration/password_reset_confirm.html

@@ -9,8 +9,8 @@
         {% if validlink %}
             <form method="POST">
                 <p>Veuillez entrer un nouveau mot de passe tout neuf.</p>
-                {{ form | crispy }}
                 {% csrf_token %}
+                {% crispy form %}
                 <input class="button is-primary"
                        type="submit"
                        value="Changer le mot de passe">

la_chariotte/accounts/templates/registration/password_reset_form.html

@@ -8,8 +8,7 @@
     <div class="box">
         <form method="POST">
             <p>Entrez votre mail pour recevoir les instructions pour le réinitialiser.</p>
-            {{ form | crispy }}
+            {% crispy form %}
-            {% csrf_token %}
             <div class="buttons">
                 <input class="button is-primary" type="submit" value="Envoyer">
             </div>

la_chariotte/order/forms.py

@@ -18,10 +18,6 @@ class GroupedOrderForm(forms.ModelForm):
         widget=forms.TimeInput(attrs={"type": "time"}),
         initial=datetime.time(hour=23, minute=59, second=59),
     )
-    is_phone_mandatory = forms.BooleanField(
-        label="Numéro de téléphone obligatoire pour les participants",
-        required=False,
-    )
 
     class Meta:
         model = GroupedOrder
@@ -33,7 +29,6 @@ class GroupedOrderForm(forms.ModelForm):
             "delivery_slot",
             "place",
             "description",
-            "is_phone_mandatory",
         ]
         widgets = {
             "name": forms.TextInput(

la_chariotte/order/migrations/0027_remove_groupedorder_total_price_and_more.py

@@ -1,36 +0,0 @@
-# Generated by Django 4.2.16 on 2024-10-31 21:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("order", "0026_groupedorder_delivery_slot"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="groupedorder",
-            name="total_price",
-        ),
-        migrations.RemoveField(
-            model_name="item",
-            name="ordered_nb",
-        ),
-        migrations.RemoveField(
-            model_name="order",
-            name="articles_nb",
-        ),
-        migrations.RemoveField(
-            model_name="order",
-            name="price",
-        ),
-        migrations.AlterField(
-            model_name="order",
-            name="created_date",
-            field=models.DateTimeField(
-                auto_now_add=True, verbose_name="Date et heure de commande"
-            ),
-        ),
-    ]

la_chariotte/order/migrations/0028_groupedorder_is_phone_mandatory.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.16 on 2024-12-08 15:15
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("order", "0027_remove_groupedorder_total_price_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="groupedorder",
-            name="is_phone_mandatory",
-            field=models.BooleanField(
-                default=False, verbose_name="Numéro de téléphone obligatoire"
-            ),
-        ),
-    ]

la_chariotte/order/migrations/0029_set_phone_mandatory_for_existing_orders.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.16 on 2024-12-08 15:41
-
-from django.db import migrations
-
-def set_phone_mandatory(apps, schema_editor):
-    """For continuity, force mandatory phone for the orders that were created so far."""
-    GroupedOrder = apps.get_model("order", "GroupedOrder")
-    for grouped_order in GroupedOrder.objects.all():
-        grouped_order.is_phone_mandatory = True
-        grouped_order.save()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("order", "0028_groupedorder_is_phone_mandatory"),
-    ]
-
-    operations = [
-        migrations.RunPython(set_phone_mandatory),
-    ]

la_chariotte/order/models.py

@@ -25,10 +25,8 @@ class GroupedOrder(models.Model):
         max_length=100, null=True, blank=True, verbose_name="Lieu de livraison"
     )
     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)
-    is_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
@@ -54,18 +52,16 @@ class GroupedOrder(models.Model):
         )
         self.code = f"{base_36_pk}{random_string}"[:code_length]
 
-    @property
+    def compute_total_price(self):
-    def total_price(self):
         price = 0
         for order in self.order_set.all():
             price += order.price
-        return price
+        self.total_price = price
+        self.save()
 
-    def get_total_ordered_items(self):
+    def compute_items_ordered_nb(self):
-        total_nb = 0
         for item in self.item_set.all():
-            total_nb += item.ordered_nb
+            item.compute_ordered_nb()
-        return total_nb
 
     def is_open(self):
         return self.deadline >= timezone.now()
@@ -121,24 +117,26 @@ class Order(models.Model):
         GroupedOrder, on_delete=models.CASCADE, related_name="order_set"
     )
     author = models.ForeignKey(OrderAuthor, on_delete=models.CASCADE)
-    created_date = models.DateTimeField("Date et heure de commande", auto_now_add=True)
+    articles_nb = models.PositiveIntegerField(default=0)
+    price = models.DecimalField(max_digits=10, decimal_places=2, default=0)
+    created_date = models.DateTimeField("Date de la commande", auto_now_add=True)
     note = models.TextField(max_length=200, null=True, blank=True)
 
-    @property
+    def compute_order_articles_nb(self):
-    def articles_nb(self):
         """Computes the number of articles in this order"""
         articles_nb = 0
         for ord_item in self.ordered_items.all():
             articles_nb += ord_item.nb
-        return articles_nb
+        self.articles_nb = articles_nb
+        self.save()
 
-    @property
+    def compute_order_price(self):
-    def price(self):
         """Computes the total price of the order"""
         price = 0
         for ord_item in self.ordered_items.all():
             price += ord_item.get_price()
-        return price
+        self.price = price
+        self.save()
 
     def __str__(self):  # pragma: no cover
         return (
@@ -153,13 +151,15 @@ class Item(models.Model):
     price = models.DecimalField(max_digits=10, decimal_places=2)
     max_limit = models.PositiveSmallIntegerField(null=True, blank=True)
 
-    @property
+    ordered_nb = models.IntegerField(default=0)
-    def ordered_nb(self):
+
+    def compute_ordered_nb(self):
         """Computes the number of times this item has been ordered"""
         ordered_nb = 0
         for order in self.orders.all():
             ordered_nb += order.nb
-        return ordered_nb
+        self.ordered_nb = ordered_nb
+        self.save()
 
     def get_total_price(self):
         """Returns the total price of all orders on this item"""

la_chariotte/order/templates/order/grouped_order_create.html

@@ -1,7 +1,5 @@
 {% extends 'base.html' %}
 
-{% load crispy_forms_tags %}
-
 {% block title %}Nouvelle commande groupée{% endblock %}
 
 {% block content %}
@@ -12,9 +10,8 @@
         <p class="title">Nouvelle commande groupée</p>
         <div class="columns">
             <div class="column is-8">
-                <form method="post" onsubmit="deadlinePassedCheck(event)">
+                <form method="post" onsubmit="deadlinePassedCheck(event)">{% csrf_token %}
-                    {% csrf_token %}
+                    {{ form.as_p }}
-                    {{ form | crispy }}
                     <div class="buttons">
                         <a class="button is-light" href="{% url 'order:index' %}">Annuler</a>
                         <input class="button is-primary" type="submit" value="Suivant">

la_chariotte/order/templates/order/grouped_order_detail.html

@@ -33,7 +33,7 @@
                 {% endif %}
                 <p><i class="fa fa-calendar-check-o mr-3" aria-label="Date limite de commande"
                       title="Date limite de commande" aria-hidden="true"></i>
-                    Commandes avant le {{ grouped_order.deadline|date:'d M Y' }} à {{ grouped_order.deadline|date:'H:i' }}
+                    Commandes avant le {{ grouped_order.deadline }}
                 </p>
                 <p><i class="fa fa-truck mr-3" aria-label="Date de livraison" title="Date de livraison"
                       aria-hidden="true"></i>
@@ -158,18 +158,16 @@
                                        value="{{ order_author.last_name }}" required></p>
                         </div>
                         <div class="column">
-                            <p><label for="phone">Numéro de téléphone {% if not is_phone_mandatory %}<em>(facultatif)</em> {% endif %}:</label>
+                            <p><label for="phone">Numéro de téléphone :</label>
-                                <input id="phone" type="tel" pattern="[0-9]{10}" 
+                                <input id="phone" type="tel" pattern="[0-9]{10}" placeholder="0601020304" name="phone"
-                                placeholder="0601020304" name="phone"
+                                       value="{{ order_author.phone }}" required></p>
-                                       value="{{ order_author.phone }}"
-                                       {% if is_phone_mandatory %}required{% endif %}></p>
                             <p><label for="email">Adresse mail : </label>
                                 <input id="email" type="email" placeholder="exemple@mail.fr" name="email"
                                        value="{{ order_author.email }}" required></p>
                         </div>
                     </div>
-                    <p><label for="note">Note à l'organisateur·ice<em> (facultatif)</em> :</label>
+                    <p><label for="note">Note à l'organisateur·ice</label>
-                        <textarea id="note" rows=3 name="note">{{ note }}</textarea></p>
+                        <textarea id="note" rows=3 placeholder="(facultatif)" name="note">{{ note }}</textarea></p>
 
                     <div class="buttons">
                         <button id="submit" type="submit" value="Order" class="button is-primary">
@@ -188,6 +186,7 @@
         // 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;
 

la_chariotte/order/templates/order/grouped_order_overview.html

@@ -25,7 +25,7 @@
         <p><i class="fa fa-map-pin mr-3" aria-label="Lieu" title="Lieu" aria-hidden="true"></i>{{ grouped_order.place }}</p>
         {% endif %}
         <p><i class="fa fa-calendar-check-o mr-3" aria-label="Date limite de commande" title="Date limite de commande" aria-hidden="true"></i>
-          Commandes avant le {{ grouped_order.deadline|date:'d M Y' }} à {{ grouped_order.deadline|date:'H:i' }}
+          Commandes avant le {{ grouped_order.deadline }}
         </p>
         <p><i class="fa fa-truck mr-3" aria-label="Date de livraison" title="Date de livraison" aria-hidden="true"></i>
           Livraison le {{ grouped_order.delivery_date }}{% if grouped_order.delivery_slot %}, {{ grouped_order.delivery_slot }}{% endif %}
@@ -90,10 +90,10 @@
       <div class="column">
         <p>Pour vous aider à distribuer les produits le jour J, vous pouvez télécharger la liste des commandes 
           au format PDF pour l'<strong>imprimer</strong>, ou au format CSV pour l'<strong>afficher dans un tableur</strong> :</p>
-        <a class="button is-info" href="{% url 'order:grouped_order_sheet' grouped_order.code %}">
+        <a class="button is-info" href="{% url 'order:grouped_order_sheet' grouped_order.code %}" target="_blank">
           <i class="fa fa-file-pdf-o mr-3" aria-hidden="true"></i>Commandes en PDF
         </a>
-        <a class="button is-info" href="{% url 'order:grouped_order_csv_export' grouped_order.code %}">
+        <a class="button is-info" href="{% url 'order:grouped_order_csv_export' grouped_order.code %}" target="_blank">
           <i class="fa fa-file-excel-o mr-3" aria-hidden="true"></i>Commandes en CSV
         </a>
       </div>
@@ -126,7 +126,7 @@
       <tfoot>
         <th>Total</th>
         <th></th>
-        <th>{{ total_ordered_items }}</th>
+        <th></th>
         <th>{{ grouped_order.total_price }} €</th>
       </tfoot>
     </table>
@@ -137,11 +137,11 @@
 
   <div id="commandes" class="box tabcontent">
     <div class="buttons is-pulled-right">
-      <a class="button is-info" href="{% url 'order:email_list' grouped_order.code %}?format=csv">
+      <a class="button is-info" href="{% url 'order:email_list' grouped_order.code %}?format=csv" target="_blank">
         <i class="fa fa-file-excel-o mr-3" aria-hidden="true"></i>Emails en CSV
       </a>
       <input id="email_list" name="email_list" hidden="true" value="{{ emails_list|join:';' }}" />
-      <a class="button is-info" onclick="copyText('email_list')">
+      <a class="button is-info" onclick="copyText('email_list')" target="_blank">
         <i class="fa fa-files-o mr-3" aria-hidden="true"></i>Copier les emails
       </a>
     </div>
@@ -161,7 +161,7 @@
         <tr>
           <td>{{ order.author }}</td>
           <td>{{ order.price }} €</td>
-          <td><a href="mailto:{{ order.author.email }}">{{ order.author.email }}</a>{% if order.author.phone %} / {{ order.author.phone }}{% endif %}</td>
+          <td><a href="mailto:{{ order.author.email }}">{{ order.author.email }}</a></td>
           <td>
             <button class="button is-info is-small js-modal-trigger" data-target="order-detail-{{ order.id }}">
             Voir
@@ -180,33 +180,40 @@
         <!-- Order detail modal -->
         <div id="order-detail-{{ order.id }}" class="modal">
           <div class="modal-background"></div>
-          <div class="modal-card ">
+          <div class="modal-card">
             <header class="modal-card-head has-background-info">
               <div class="modal-card-title-container">
-                <p class="modal-card-title mb-2">Commande de {{ order.author }}</p>
+                <p class="modal-card-title">Commande de {{ order.author }}</p>
-                <p class="has-text-grey-dark">Le {{ order.created_date|date:'d M Y' }} à {{ order.created_date|date:'H:i' }}</p>
               </div>
               <button class="delete" aria-label="close"></button>
             </header>
             <section class="modal-card-body">
-              <div class="columns">
+              <div class="columns is-multiline">
-                <div class="column">
+                <div class="column is-full">
                   {% for item in order.ordered_items.all %}
                   {{ item.nb }} × {{ item.item.name }}
-                  <hr class="mb-0 mt-1">
+                  <hr class="mb-1 mt-1">
                   {% endfor %}
                 </div>
                 {% if order.note %}
-                <div class="column is-4">
+                <div class="column is-full">
                   <p class="mini-title">Note à l'organisateur·ice</p>
                   <p>{{ order.note }}</p>
                 </div>
-              </div>
                 {% endif %}
+                <div class="column is-full">
+                  <p class="mini-title">Numéro de téléphone</p>
+                  <p>{{ order.author.phone }}</p>
+                </div>
+              </div>
             </section>
             <footer class="modal-card-foot">
+              <div class="columns">
+                <div class="column is-half">
                   <p class="mini-title">Total à payer</p>
                   <p>{{ order.price }} €</p>
+                </div>
+              </div>
             </footer>
           </div>
         </div>        

la_chariotte/order/templates/order/grouped_order_sheet.html

@@ -21,22 +21,26 @@
       }
       {% if items|length > 10 %} 
         .item_name {
+          text-align:center;
+          white-space:nowrap;
           -webkit-transform: rotate(-90deg);
           -moz-transform: rotate(-90deg);
           -ms-transform: rotate(-90deg);
           -o-transform: rotate(-90deg);
           transform: rotate(-90deg);
           font-size: 8pt;
-          height:220px;
         }
 
         .item_name div {
-          width:200px;
+          margin:-10px -120% ;
-          -webkit-transform: translateX(-40%);
+          display:inline-block;
-          -moz-transform: translateX(-40%);
+        }
-          -ms-transform: translateX(-40%);
+        .item_name div:before{
-          -o-transform: translateX(-40%);
+            content:'';
-          transform: translateX(-40%);
+            width:0;
+            padding-top:110%;
+            display:inline-block;
+            vertical-align:middle;
         }
       {% endif %}
 
@@ -49,19 +53,20 @@
         border: 1px black solid;
         border-collapse: collapse;
         width: 100%;
-        table-layout: fixed
       }
 
       th, td {
+        vertical-align: center;
         padding: 3px 2px 2px 2px;
         border: 1px black solid;
         font-weight: normal;
         text-align: center;
-        word-wrap: break-word;
       }
 
       th {
         page-break-inside: avoid;
+        word-break: break-all;
+        word-wrap: break-word;
         font-weight: bold;
       }
 
@@ -80,7 +85,7 @@
       <thead>
         <tr> 
           <th style="font-size: 0.5em; width: 2em">OK</th>
-          <th style="text-align: center; width: 20%">Nom</th>
+          <th style="text-align: center">Nom</th>
           {% for item in items %}
           <th class="item_name" style="font-weight: normal;">
             <div>{{ item.name }}</div>

la_chariotte/order/templates/order/grouped_order_update.html

@@ -1,7 +1,5 @@
 {% extends 'base.html' %}
 
-{% load crispy_forms_tags %}
-
 {% block title %}Modifier la commande groupée{% endblock %}
 
 {% block content %}
@@ -11,14 +9,13 @@
 <div class="box">
     <p class="title">{{ grouped_order.name }} - modifier</p>
     <form method="post" onsubmit="deadlinePassedCheck(event)">{% csrf_token %}
-        {{ form | crispy }}
+        {{ form.as_p }}
         <div class="buttons">
             <a class="button is-light" href="{% url 'order:index' %}">Annuler</a>
             <input class="button is-primary" type="submit" value="Suivant">
         </div>
     </form>
 </div>
-
 {% endblock %}
 
 {% block extra_js %}

la_chariotte/order/views/grouped_order.py

@@ -112,18 +112,18 @@ class GroupedOrderDetailView(generic.DetailView):
         return get_object_or_404(GroupedOrder, code=self.kwargs.get("code"))
 
     def get_context_data(self, **kwargs):
-        grouped_order = self.get_object()
+        items = self.get_object().item_set.all()
-        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}
 
         if self.request.user.is_authenticated:
-            order_author = OrderAuthor(
+            order_author = OrderAuthor.objects.create(
                 first_name=self.request.user.first_name,
                 last_name=self.request.user.last_name,
                 email=self.request.user.username,
             )
+            order_author.save()
         else:
             order_author = None
 
@@ -134,8 +134,6 @@ 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
-                "is_phone_mandatory": grouped_order.is_phone_mandatory,
             }
         )
         return context
@@ -153,6 +151,12 @@ class GroupedOrderOverview(UserIsOrgaMixin, generic.DetailView):
         # Staff can see but not edit grouped orders
         return super().test_func() or self.request.user.is_staff
 
+    def get(self, request, *args, **kwargs):
+        # Compute grouped order total price before display
+        self.get_object().compute_total_price()
+        self.get_object().compute_items_ordered_nb()
+        return super().get(self, request, *args, **kwargs)
+
     def get_context_data(self, **kwargs):
         context = super(GroupedOrderOverview, self).get_context_data(**kwargs)
         # Add share link to context
@@ -163,7 +167,6 @@ class GroupedOrderOverview(UserIsOrgaMixin, generic.DetailView):
             order__in=self.get_object().order_set.all()
         )
         context["emails_list"] = set(participant.email for participant in participants)
-        context["total_ordered_items"] = self.get_object().get_total_ordered_items()
         return context
 
 
@@ -225,6 +228,7 @@ class GroupedOrderDuplicateView(UserIsOrgaMixin, generic.RedirectView):
         # duplicate each item and add it to new_grouped_order
         for item in initial_grouped_order.item_set.all():
             item.pk = None
+            item.ordered_nb = 0
             item.save()
             new_grouped_order.item_set.add(item)
 
@@ -296,11 +300,7 @@ class GroupedOrderExportView(UserIsOrgaMixin, generic.DetailView):
         context = super(GroupedOrderExportView, self).get_context_data(**kwargs)
         grouped_order = self.get_object()
 
-        items = [
+        items = grouped_order.item_set.filter(ordered_nb__gt=0).order_by("name")
-            item
-            for item in grouped_order.item_set.all().order_by("name")
-            if item.ordered_nb > 0
-        ]
         orders = grouped_order.order_set.all().order_by(
             "author__last_name", "author__first_name"
         )
@@ -344,9 +344,10 @@ class ExportGroupOrderEmailAdressesToDownloadView(UserPassesTestMixin, generic.V
             response = http.HttpResponse(content_type="text/csv")
             filename = f"commande _{grouped_order.name.replace(' ', '_')}"
             response["Content-Disposition"] = f'attachment; filename="{filename}.csv"'
-            writer = csv.writer(response, delimiter=";")
+            writer = csv.writer(response)
+            writer.writerow(["order_name", "email"])
             for email in email_list:
-                writer.writerow([email])
+                writer.writerow([grouped_order.name, email])
             return response
         else:
             email_list = ";\n".join(email_list)
@@ -361,10 +362,10 @@ 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, delimiter=";")
+        writer = csv.writer(response)
 
         # write headers rows
         row = ["", ""]
@@ -373,9 +374,6 @@ class ExportGroupedOrderToCSVView(GroupedOrderExportView):
         row.append("Prix de la commande")
         row.append("Mail")
         row.append("Téléphone")
-        row.append("Note")
-        row.append("Date")
-        row.append("Heure")
         writer.writerow(row)
 
         row = ["", "Prix unitaire TTC (€)"]
@@ -395,9 +393,6 @@ class ExportGroupedOrderToCSVView(GroupedOrderExportView):
             row.append(str(order.price).replace(".", ","))
             row.append(order.author.email)
             row.append(f"'{order.author.phone}")
-            row.append(order.note)
-            row.append(order.created_date.strftime("%d/%m/%Y"))
-            row.append(order.created_date.strftime("%H:%M"))
             writer.writerow(row)
 
         # write total row

la_chariotte/order/views/order.py

@@ -2,7 +2,6 @@ from django import http
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse, reverse_lazy
-from django.utils import timezone
 from django.views import generic
 
 from la_chariotte.mail.utils import send_order_confirmation_mail
@@ -49,12 +48,7 @@ def place_order(request, code):
     author = OrderAuthor.objects.create(
         first_name=first_name, last_name=last_name, email=email, phone=phone
     )
-    order = Order.objects.create(
+    order = Order.objects.create(author=author, grouped_order=grouped_order, note=note)
-        author=author,
-        grouped_order=grouped_order,
-        note=note,
-        created_date=timezone.now(),
-    )
 
     # add items to the order
     error_message = None
@@ -72,6 +66,7 @@ def place_order(request, code):
     if error_message:
         order.delete()
         author.delete()
+        grouped_order.compute_items_ordered_nb()
         return render(
             request,
             "order/grouped_order_detail.html",
@@ -102,6 +97,8 @@ def place_order(request, code):
         )
 
     # Send confirmation mail and redirect to confirmation page
+    order.compute_order_price()
+    grouped_order.compute_items_ordered_nb()
     send_order_confirmation_mail(order)
 
     # Redirect to prevent data from being posted twice when the user hits the Back
@@ -120,6 +117,7 @@ def validate_item_ordered_nb(item, ordered_nb):
 
 def validate_articles_ordered_nb(order):
     """Return an error if no items are ordered"""
+    order.compute_order_articles_nb()
     if order.articles_nb == 0:
         return "Veuillez commander au moins un produit"
     return None

la_chariotte/settings.py

@@ -7,7 +7,7 @@ from sentry_sdk.integrations.django import DjangoIntegration
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_URL = os.getenv("BASE_URL", "http://127.0.0.1:8000")
 PROJECT_NAME = os.getenv("PROJECT_NAME", "La Chariotte")
-GITLAB_LINK = "https://gitlab.com/la-chariotte/la_chariotte"
+GITLAB_LINK = "https://gitlab.com/hashbangfr/la_chariotte"
 CONTACT_MAIL = "contact@chariotte.fr"
 HELLOASSO_LINK = "https://www.helloasso.com/associations/la-chariotte/"
 FEEDBACK_LINK = "https://framaforms.org/votre-avis-sur-la-chariotte-1709742328"

la_chariotte/static/sass/base/_content.sass

@@ -13,4 +13,3 @@
 
 img.notice-img
 	border: $info 3px solid
-	margin-bottom: 1em

la_chariotte/templates/base.html

@@ -131,7 +131,7 @@
               <div class="logo mb-4">
                 <p>
                   {% settings_value "PROJECT_NAME" %}
-                  | <a href='{% settings_value "GITLAB_LINK" %}'>version {{ version }}</a>
+                  | <a href="https://gitlab.com/la-chariotte/">version {{ version }}</a>
                 </p>
               </div>
               <ul class="list-unstyled footer-menu lh-35">
@@ -175,8 +175,10 @@
           </ul>
         </div>
     </div>
-    </footer>
+  </div>
-  </body>
+</div>
+</footer>
+</body>
 </html>
 <script>
   // For responsive menu

la_chariotte/templates/help/about_chariotte.html

@@ -31,7 +31,7 @@
 	<p>
 		La Chariotte est développée sous licence libre Affero GPL. 
 		Cela signifie que vous pouvez 
-		<a href="{{ gitlab }}" rel="noopener">aller voir le code</a> si vous êtes curieux, et y contribuer si vous êtes motivé·e !
+		<a href="{{ gitlab }}" rel="noopener" target="_blank">aller voir le code</a> si vous êtes curieux, et y contribuer si vous êtes motivé·e !
 	</p>
 	
 </div>
@@ -45,7 +45,7 @@
 		Nous sommes très, très preneurs de vos suggestions, critiques constructives et demandes, et ouvert·e·s à toute question !
 	</p>
 	<p>
-		Faites des retours sur la version actuelle <a href="https://framaforms.org/vos-retours-sur-la-chariotte-1692345453" rel="noopener">ici</a>, ou par mail à <a href="mailto:{{ mail }}">{{ mail }}</a>.
+		Faites des retours sur la version actuelle <a href="https://framaforms.org/vos-retours-sur-la-chariotte-1692345453" rel="noopener" target="_blank">ici</a>, ou par mail à <a href="mailto:{{ mail }}">{{ mail }}</a>.
 	</p>
 </div>
 

la_chariotte/templates/help/legal_notice.html

@@ -34,7 +34,7 @@
     <p class="title">Licence</p>
     <p>
         La Chariotte est développée sous licence libre <strong>Affero GPL</strong>. Le code source est 
-        consultable <a href="{{ gitlab }}" rel="noopener">sur Gitlab</a> et ouvert à toute contribution ou suggestion.
+        consultable <a href="{{ gitlab }}" rel="noopener" target="_blank">sur Gitlab</a> et ouvert à toute contribution ou suggestion.
     </p>
     <p class="title">Conditions d'utilisation</p>
     <p>

la_chariotte/templates/help/notice.html

@@ -9,11 +9,11 @@
     {% block content_title %}La Chariotte - mode d'emploi{% endblock %}
   </p>
 <div class="box">
-    <p>Comment marche la Chariotte et qu'est-ce qu'on peut y faire ? Voilà comment vous pouvez :</p>
+    <p>Comment marche la Chariotte et qu'est-ce qu'on peut y faire ? Voilà commment vous pouvez :</p>
     <ul>
         <li><a href="#join_grouped_order">Rejoindre une commande et commander des produits</a></li>
         <li><a href="#pay">Payer (pas encore !)</a></li>
-        <li><a href="#create_account">Créer un compte (nécessaire seulement pour organiser une commande groupée)</a></li>
+        <li><a href="#create_account">Créer un compte</a></li>
         <li><a href="#create_grouped_order">Créer une commande groupée</a></li>
         <li><a href="#add_item">Ajouter des produits à une commande groupée</a></li>
         <li><a href="#go_to_overview">Accéder à la page de gestion de ma commande groupée</a></li>
@@ -33,7 +33,6 @@
     <img class="notice-img" src="{% static 'img/notice/join_grouped_order.png' %}"/>
     <p>Sinon, cliquez sur le lien que l'organisateur.ice vous a envoyé. Vous arriverez sur la page de commande.</p>
     <img class="notice-img" src="{% static 'img/notice/order_form.png' %}"/>
-    <p>Une fois la commande validée, vous recevrez un mail de confirmation.</p>
 </div>
 
 <div class="box" id="pay">
@@ -43,7 +42,7 @@
 </div>
 
 <div class="box" id="create_account">
-    <p class="title">Créer un compte (nécessaire seulement pour organiser une commande groupée)</p>
+    <p class="title">Créer un compte</p>
     <p>1. Cliquez sur “Créer un compte”.</p>
     <img class="notice-img" src="{% static 'img/notice/create_account.jpg' %}"/>
     <p>2. Remplissez toutes les informations du formulaire, puis cliquez sur valider.</p>
@@ -108,7 +107,7 @@
 <div class="box" id="share_grouped_order">
     <p class="title">Partager une commande à des participants</p>
     <p>Une fois votre commande bien préparée (quantité et prix des produits corrects, informations de la commande justes, …),
-         il faut maintenant la partager à des participants pour qu’ils puissent commander.</p>
+         il faut maintenant la partager à des participants pour qu’il puissent commander.</p>
     <p>1. Depuis la page de <a href="#go_to_overview">gestion de la commande</a>, 
         allez dans l’onglet “partager et exporter”.</p>
     <img class="notice-img" src="{% static 'img/notice/share_grouped_order.png' %}"/>

la_chariotte/tests/test_order_views_grouped_order.py

@@ -662,36 +662,6 @@ 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.is_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 <em>(facultatif)</em>" not in response.content.decode()
-        )
-        grouped_order.is_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 <em>(facultatif)</em>" in response.content.decode()
-
 
 class TestGroupedOrderOverview:
     def test_get_overview(self, client_log):
@@ -736,7 +706,6 @@ class TestGroupedOrderOverview:
         assert response.status_code == 200
         assert "test item" in response.content.decode()
         assert {"test@mail.fr"} == response.context["emails_list"]
-        assert 4 == response.context["total_ordered_items"]
         assert "gr order test" in response.content.decode()
         item.refresh_from_db()
         assert item.get_total_price() == 8
@@ -1426,7 +1395,7 @@ class TestGroupedOrderSheetView:
         response = client_log.get(generate_sheet_url)
         assert response.status_code == 200
         assert response.context["grouped_order"] == grouped_order
-        assert len(response.context["items"]) == 0
+        assert response.context["items"].count() == 0
         assert len(response.context["orders_dict"]) == 0
 
         # we order some items in the grouped order
@@ -1434,7 +1403,7 @@ class TestGroupedOrderSheetView:
         response = client_log.get(generate_sheet_url)
         assert response.status_code == 200
         assert response.context["grouped_order"] == grouped_order
-        assert len(response.context["items"]) == 2
+        assert response.context["items"].count() == 2
         assert response.context["orders_dict"][order] == [3, 2]
         assert response.context["grouped_order"].total_price == 35
 
@@ -1552,7 +1521,8 @@ class TestExportGroupOrderEmailAdressesToDownloadView:
         assert response.status_code == 200
         assert response["Content-Type"] == "text/csv"
         content = response.content.decode()
-        assert "test@mail.fr\r\n" in content
+        assert "order_name,email" in content
+        assert "order_name,email\r\ngr order test,test@mail.fr\r\n" in content
 
     def test_export_format_default(self, client_log):
         grouped_order = create_grouped_order(
@@ -1659,10 +1629,8 @@ class TestExportGroupedOrderToCSVView:
         assert response.status_code == 200
 
         content = response.content.decode("utf-8")
-        csv_reader = csv.reader(StringIO(content), delimiter=";")
+        csv_reader = csv.reader(StringIO(content))
         body = list(csv_reader)
-        created_date = f"{timezone.now().strftime('%d/%m/%Y')}"
-        created_time = f"{timezone.now().strftime('%H:%M')}"
         assert body == [
             [
                 "",
@@ -1672,47 +1640,11 @@ class TestExportGroupedOrderToCSVView:
                 "Prix de la commande",
                 "Mail",
                 "Téléphone",
-                "Note",
-                "Date",
-                "Heure",
             ],
             ["", "Prix unitaire TTC (€)", "2,00", "9,00"],
             ["Nom", "Prénom"],
-            [
+            ["alescargot", "bob", "1", "0", "2,00", "bob2@escargot.fr", "'000"],
-                "alescargot",
+            ["alescargot", "bobby", "0", "1", "9,00", "bob3@escargot.fr", "'000"],
-                "bob",
+            ["lescargot", "bob", "3", "2", "24,00", "bob@escargot.fr", "'000"],
-                "1",
-                "0",
-                "2,00",
-                "bob2@escargot.fr",
-                "'000",
-                "",
-                created_date,
-                created_time,
-            ],
-            [
-                "alescargot",
-                "bobby",
-                "0",
-                "1",
-                "9,00",
-                "bob3@escargot.fr",
-                "'000",
-                "",
-                created_date,
-                created_time,
-            ],
-            [
-                "lescargot",
-                "bob",
-                "3",
-                "2",
-                "24,00",
-                "bob@escargot.fr",
-                "'000",
-                "",
-                created_date,
-                created_time,
-            ],
             ["", "TOTAL", "4", "3", "35,00"],
         ]

la_chariotte/tests/utils.py

@@ -9,20 +9,12 @@ pytestmark = pytest.mark.django_db
 
 
 def create_grouped_order(
-    days_before_delivery_date,
+    days_before_delivery_date, days_before_deadline, name, orga_user
-    days_before_deadline,
-    name,
-    orga_user,
-    is_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,
+        name=name, orga=orga_user, delivery_date=date, deadline=deadline
-        orga=orga_user,
-        delivery_date=date,
-        deadline=deadline,
-        is_phone_mandatory=is_phone_mandatory,
     )
     grouped_order.create_code_from_pk()
     grouped_order.save()
@@ -52,4 +44,11 @@ def order_items_in_grouped_order(grouped_order):
     models.OrderedItem.objects.create(order=order, item=item_2, nb=2)
     models.OrderedItem.objects.create(order=order_2, item=item_1, nb=1)
     models.OrderedItem.objects.create(order=order_3, item=item_2, nb=1)
+    item_1.compute_ordered_nb()
+    item_2.compute_ordered_nb()
+    order.compute_order_price()
+    order_2.compute_order_price()
+    order_3.compute_order_price()
+    grouped_order.compute_total_price()
+    grouped_order.save()
     return order

static/sass/style.css

@@ -7875,8 +7875,7 @@ a.navbar-item:hover {
   white-space: pre-wrap; }
 
 img.notice-img {
-  border: #e9b049 3px solid;
+  border: #e9b049 3px solid; }
-  margin-bottom: 1em; }
 
 .button {
   white-space: normal;