From 5da27bb26657a1012822579373beaea4065b82c4 Mon Sep 17 00:00:00 2001
From: imperosol <thgirod@hotmail.com>
Date: Wed, 18 Dec 2024 12:16:24 +0100
Subject: [PATCH] rename `producttype` to `product_type`

---
 core/templates/core/user_tools.jinja             |  2 +-
 counter/models.py                                |  2 +-
 counter/schemas.py                               |  2 +-
 ...cttype_list.jinja => product_type_list.jinja} | 16 ++++++++++------
 counter/urls.py                                  | 12 ++++++------
 counter/views/admin.py                           |  3 ++-
 counter/views/mixins.py                          |  2 +-
 locale/fr/LC_MESSAGES/django.po                  | 14 +++++++-------
 8 files changed, 29 insertions(+), 24 deletions(-)
 rename counter/templates/counter/{producttype_list.jinja => product_type_list.jinja} (77%)

diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
index e00b24da..d9a6c0c7 100644
--- a/core/templates/core/user_tools.jinja
+++ b/core/templates/core/user_tools.jinja
@@ -52,7 +52,7 @@
           %}
           <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
           <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
-          <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
+          <li><a href="{{ url('counter:product_type_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
           <li><a href="{{ url('counter:cash_summary_list') }}">{% trans %}Cash register summaries{% endtrans %}</a></li>
           <li><a href="{{ url('counter:invoices_call') }}">{% trans %}Invoices call{% endtrans %}</a></li>
           <li><a href="{{ url('counter:eticket_list') }}">{% trans %}Etickets{% endtrans %}</a></li>
diff --git a/counter/models.py b/counter/models.py
index b55207fb..48bb841f 100644
--- a/counter/models.py
+++ b/counter/models.py
@@ -315,7 +315,7 @@ class ProductType(OrderedModel):
         return self.name
 
     def get_absolute_url(self):
-        return reverse("counter:producttype_list")
+        return reverse("counter:product_type_list")
 
     def is_owned_by(self, user):
         """Method to see if that object can be edited by the given user."""
diff --git a/counter/schemas.py b/counter/schemas.py
index 1b770a3d..adc8094b 100644
--- a/counter/schemas.py
+++ b/counter/schemas.py
@@ -38,7 +38,7 @@ class ProductTypeSchema(ModelSchema):
 
     @staticmethod
     def resolve_url(obj: ProductType) -> str:
-        return reverse("counter:producttype_edit", kwargs={"type_id": obj.id})
+        return reverse("counter:product_type_edit", kwargs={"type_id": obj.id})
 
 
 class SimpleProductTypeSchema(ModelSchema):
diff --git a/counter/templates/counter/producttype_list.jinja b/counter/templates/counter/product_type_list.jinja
similarity index 77%
rename from counter/templates/counter/producttype_list.jinja
rename to counter/templates/counter/product_type_list.jinja
index 042925df..68548829 100644
--- a/counter/templates/counter/producttype_list.jinja
+++ b/counter/templates/counter/product_type_list.jinja
@@ -14,12 +14,12 @@
 
 {% block content %}
   <p>
-    <a href="{{ url('counter:new_producttype') }}" class="btn btn-blue">
+    <a href="{{ url('counter:new_product_type') }}" class="btn btn-blue">
       {% trans %}New product type{% endtrans %}
       <i class="fa fa-plus"></i>
     </a>
   </p>
-  {% if producttype_list %}
+  {% if product_types %}
     <aside>
       <p>
         {% trans %}Product types are in the same order on this page and on the eboutic.{% endtrans %}
@@ -46,15 +46,19 @@
         class="product-type-list"
         :aria-busy="loading"
       >
-        {%- for t in producttype_list -%}
-          <li x-sort:item="{{ t.id }}">
+        {%- for product_type in product_types -%}
+          <li x-sort:item="{{ product_type.id }}">
             <i class="fa fa-grip-vertical"></i>
-            <a href="{{ url('counter:producttype_edit', type_id=t.id) }}">{{ t }}</a>
+            <a href="{{ url('counter:product_type_edit', type_id=product_type.id) }}">
+              {{ product_type.name }}
+            </a>
           </li>
         {%- endfor -%}
       </ul>
     </div>
   {% else %}
-    {% trans %}There is no product types in this website.{% endtrans %}
+    <p>
+      {% trans %}There are no product types in this website.{% endtrans %}
+    </p>
   {% endif %}
 {% endblock %}
diff --git a/counter/urls.py b/counter/urls.py
index 0ca77f73..91564a8b 100644
--- a/counter/urls.py
+++ b/counter/urls.py
@@ -121,19 +121,19 @@ urlpatterns = [
         name="product_edit",
     ),
     path(
-        "admin/producttype/list/",
+        "admin/product-type/list/",
         ProductTypeListView.as_view(),
-        name="producttype_list",
+        name="product_type_list",
     ),
     path(
-        "admin/producttype/create/",
+        "admin/product-type/create/",
         ProductTypeCreateView.as_view(),
-        name="new_producttype",
+        name="new_product_type",
     ),
     path(
-        "admin/producttype/<int:type_id>/",
+        "admin/product-type/<int:type_id>/",
         ProductTypeEditView.as_view(),
-        name="producttype_edit",
+        name="product_type_edit",
     ),
     path("admin/eticket/list/", EticketListView.as_view(), name="eticket_list"),
     path("admin/eticket/new/", EticketCreateView.as_view(), name="new_eticket"),
diff --git a/counter/views/admin.py b/counter/views/admin.py
index c1f5c63b..aa7e2c50 100644
--- a/counter/views/admin.py
+++ b/counter/views/admin.py
@@ -101,8 +101,9 @@ class ProductTypeListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
     """A list view for the admins."""
 
     model = ProductType
-    template_name = "counter/producttype_list.jinja"
+    template_name = "counter/product_type_list.jinja"
     current_tab = "product_types"
+    context_object_name = "product_types"
 
 
 class ProductTypeCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
diff --git a/counter/views/mixins.py b/counter/views/mixins.py
index 4a07d848..2e88f54c 100644
--- a/counter/views/mixins.py
+++ b/counter/views/mixins.py
@@ -99,7 +99,7 @@ class CounterAdminTabsMixin(TabedViewMixin):
             "name": _("Archived products"),
         },
         {
-            "url": reverse_lazy("counter:producttype_list"),
+            "url": reverse_lazy("counter:product_type_list"),
             "slug": "product_types",
             "name": _("Product types"),
         },
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 98b4fbd7..8ef1ade5 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -4197,20 +4197,20 @@ msgstr "Sans catégorie"
 msgid "There is no products in this website."
 msgstr "Il n'y a pas de produits dans ce site web."
 
-#: counter/templates/counter/producttype_list.jinja:4
-#: counter/templates/counter/producttype_list.jinja:42
+#: counter/templates/counter/product_type_list.jinja:4
+#: counter/templates/counter/product_type_list.jinja:42
 msgid "Product type list"
 msgstr "Liste des types de produit"
 
-#: counter/templates/counter/producttype_list.jinja:18
+#: counter/templates/counter/product_type_list.jinja:18
 msgid "New product type"
 msgstr "Nouveau type de produit"
 
-#: counter/templates/counter/producttype_list.jinja:25
+#: counter/templates/counter/product_type_list.jinja:25
 msgid "Product types are in the same order on this page and on the eboutic."
 msgstr "Les types de produit sont dans le même ordre sur cette page et sur l'eboutic."
 
-#: counter/templates/counter/producttype_list.jinja:28
+#: counter/templates/counter/product_type_list.jinja:28
 msgid ""
 "You can reorder them here by drag-and-drop. The changes will then be applied "
 "globally immediately."
@@ -4218,8 +4218,8 @@ msgstr ""
 "Vous pouvez les réorganiser ici. Les changements seront alors immédiatement "
 "appliqués globalement."
 
-#: counter/templates/counter/producttype_list.jinja:58
-msgid "There is no product types in this website."
+#: counter/templates/counter/product_type_list.jinja:58
+msgid "There are no product types in this website."
 msgstr "Il n'y a pas de types de produit dans ce site web."
 
 #: counter/templates/counter/refilling_list.jinja:15