Merge branch 'main' into manager_dates_restrictions

RedTurtle · Aug 28, 2024 · 9e9fc29 · 9e9fc29
2 parents 8e90e17 + e392f85
commit 9e9fc29
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,7 +2,7 @@ Changelog
 =========
 
 
-2.7.7 (unreleased)
+2.7.8 (unreleased)
 ------------------
 
 - Apply validity dates restrictions for the Bookings Manger if selected flag 'apply_date_restrictions_to_manager'.
@@ -12,6 +12,13 @@ Changelog
   [folix-01]
 
 
+2.7.7 (2024-08-22)
+------------------
+
+- Bookings details help text in `Tipologia prenotazione`.
+  [folix-01]
+
+
 2.7.6 (2024-06-27)
 ------------------
 

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="redturtle.prenotazioni",
-    version="2.7.7.dev0",
+    version="2.7.8.dev0",
     description="An add-on for Plone",
     long_description=long_description,
     # Get more from https://pypi.python.org/pypi?%3Aaction=list_classifiers

diff --git a/src/redturtle/prenotazioni/content/prenotazione_type.py b/src/redturtle/prenotazioni/content/prenotazione_type.py
@@ -36,6 +36,15 @@ class IPrenotazioneType(model.Schema):
     #     default=[],
     # )
 
+    booking_details_help_text = RichText(
+        required=False,
+        title=_("booking_details_help_text_label", default="Bookign detail help text"),
+        description=_(
+            "booking_details_help_text_label_help",
+            default='This field will be visualized as "Details" helptext during the booking steps',
+        ),
+    )
+
 
 @implementer(IPrenotazioneType)
 class PrenotazioneType(Item):

diff --git a/src/redturtle/prenotazioni/locales/en/LC_MESSAGES/redturtle.prenotazioni.po b/src/redturtle/prenotazioni/locales/en/LC_MESSAGES/redturtle.prenotazioni.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-08-19 10:07+0000\n"
+"POT-Creation-Date: 2024-08-19 14:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -647,6 +647,16 @@ msgstr ""
 msgid "booking_deleted_success"
 msgstr ""
 
+#. Default: "Bookign detail help text"
+#: redturtle/prenotazioni/content/prenotazione_type.py:41
+msgid "booking_details_help_text_label"
+msgstr ""
+
+#. Default: "This field will be visualized as \"Details\" helptext during the booking steps"
+#: redturtle/prenotazioni/content/prenotazione_type.py:42
+msgid "booking_details_help_text_label_help"
+msgstr ""
+
 #. Default: "Booking fields"
 #: redturtle/prenotazioni/content/prenotazioni_folder.py:548
 msgid "booking_fields_label"

diff --git a/src/redturtle/prenotazioni/locales/it/LC_MESSAGES/redturtle.prenotazioni.po b/src/redturtle/prenotazioni/locales/it/LC_MESSAGES/redturtle.prenotazioni.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2024-08-19 10:07+0000\n"
+"POT-Creation-Date: 2024-08-19 14:54+0000\n"
 "PO-Revision-Date: 2014-05-27 17:36+0200\n"
 "Last-Translator: Alessandro Pisa <[email protected]>\n"
 "Language-Team: American English <[email protected]>\n"
@@ -650,6 +650,16 @@ msgstr "Prenotazione creata"
 msgid "booking_deleted_success"
 msgstr "La tua prenotazione è stata cancellata."
 
+#. Default: "Bookign detail help text"
+#: redturtle/prenotazioni/content/prenotazione_type.py:41
+msgid "booking_details_help_text_label"
+msgstr "Istruzioni per campo dettaglio nella prenotazione"
+
+#. Default: "This field will be visualized as \"Details\" helptext during the booking steps"
+#: redturtle/prenotazioni/content/prenotazione_type.py:42
+msgid "booking_details_help_text_label_help"
+msgstr "Il testo verra visualizzato come testo d'aiuto per la compilazione del campo \"Dettagli\" da parte del cittadino nella form della prenotazione"
+
 #. Default: "Booking fields"
 #: redturtle/prenotazioni/content/prenotazioni_folder.py:548
 msgid "booking_fields_label"

diff --git a/src/redturtle/prenotazioni/locales/redturtle.prenotazioni.pot b/src/redturtle/prenotazioni/locales/redturtle.prenotazioni.pot
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-08-19 10:07+0000\n"
+"POT-Creation-Date: 2024-08-19 14:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -650,6 +650,16 @@ msgstr ""
 msgid "booking_deleted_success"
 msgstr ""
 
+#. Default: "Bookign detail help text"
+#: redturtle/prenotazioni/content/prenotazione_type.py:41
+msgid "booking_details_help_text_label"
+msgstr ""
+
+#. Default: "This field will be visualized as \"Details\" helptext during the booking steps"
+#: redturtle/prenotazioni/content/prenotazione_type.py:42
+msgid "booking_details_help_text_label_help"
+msgstr ""
+
 #. Default: "Booking fields"
 #: redturtle/prenotazioni/content/prenotazioni_folder.py:548
 msgid "booking_fields_label"

diff --git a/src/redturtle/prenotazioni/restapi/serializers/adapters/prenotazione_type.py b/src/redturtle/prenotazioni/restapi/serializers/adapters/prenotazione_type.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from plone import api
+from plone.restapi.serializer.converters import json_compatible
 from zope.component import adapter
 from zope.interface import implementer
 
@@ -23,4 +24,7 @@ def __call__(self, *args, **kwargs):
             "name": self.context.title,
             "duration": str(self.context.duration),
             "hidden": hidden,
+            "booking_details_help_text": json_compatible(
+                self.context.booking_details_help_text, self.context
+            ),
         }
diff --git a/src/redturtle/prenotazioni/tests/test_booking_schema.py b/src/redturtle/prenotazioni/tests/test_booking_schema.py
@@ -143,7 +143,14 @@ def test_booking_schema_no_bookable_available(
         expected = {
             "booking_types": {
                 "bookable": [],
-                "unbookable": [{"duration": "30", "name": "Type A", "hidden": True}],
+                "unbookable": [
+                    {
+                        "duration": "30",
+                        "name": "Type A",
+                        "hidden": True,
+                        "booking_details_help_text": None,
+                    }
+                ],
             },
             "fields": [
                 {
@@ -217,7 +224,14 @@ def test_booking_schema_bookable_available(
 
         expected = {
             "booking_types": {
-                "bookable": [{"duration": "30", "name": "Type A", "hidden": True}],
+                "bookable": [
+                    {
+                        "duration": "30",
+                        "name": "Type A",
+                        "hidden": True,
+                        "booking_details_help_text": None,
+                    }
+                ],
                 "unbookable": [],
             },
             "fields": [