feat: consistent display of included services and prices

templates/booking/_form_theme.html.twig

@@ -67,8 +67,8 @@
                 </td>
                 {% if choiceData %}
                     <td class="border border-primary-bg p-2 align-top w-24 text-right whitespace-nowrap">
-                        {% if choiceData.price is defined and choiceData.price is not null %}
-                            {{ choiceData.price | format_currency('EUR') }}
+                        {% if choiceData.price is defined %}
+                            {{ choiceData.price | format_service_price }}
                         {% endif %}
                     </td>
                 {% endif %}

templates/booking/_participant_form.html.twig

@@ -51,9 +51,7 @@
             {%- endif -%}
         </td>
         <td class="border border-primary-bg p-2 align-top w-24 text-right whitespace-nowrap">
-            {% if price is not null %}
-                {{ price | format_currency('EUR') }}
-            {% endif %}
+            {{ price | format_service_price }}
         </td>
         <td class="border border-primary-bg p-2 align-top w-12 text-center">
             {% set childTooltip = child.vars.attr['data-tooltip']|default(null) %}
@@ -84,9 +82,7 @@
             {%- endif -%}
         </td>
         <td class="border border-primary-bg p-2 align-top w-24 text-right whitespace-nowrap">
-            {% if price is not null %}
-                {{ price | format_currency('EUR') }}
-            {% endif %}
+            {{ price | format_service_price }}
         </td>
         <td class="border border-primary-bg p-2 align-top w-12 text-center">
             {% set fieldTooltip = checkboxField.vars.attr['data-tooltip']|default(null) %}
@@ -124,9 +120,7 @@
             {%- endif -%}
         </td>
         <td class="border border-primary-bg p-2 align-top w-24 text-right whitespace-nowrap">
-            {% if price is not null %}
-                {{ price | format_currency('EUR') }}
-            {% endif %}
+            {{ price | format_service_price }}
         </td>
         <td class="border border-primary-bg p-2 align-top w-12 text-center">
             {% set childTooltip = child.vars.attr['data-tooltip']|default(null) %}
@@ -364,11 +358,11 @@
                                 ) }}
                             {% endif %}
                         </table>
-                    {% elseif form.skiPass is defined %}
-                        {# Skipass field exists but no rentals yet - user needs to select skipass first #}
+                    {% elseif form.skiPass is defined and not form.vars.data.participant.skiPass %}
+                        {# Skipass field exists but no skipass selected yet #}
                         <div class="p-2 text-sm text-gray-500">Bitte zuerst den Skipass auswählen</div>
                     {% else %}
-                        {# No skipass field (e.g., baby participant) - rentals not available #}
+                        {# No skipass field or skipass selected but no matching rentals #}
                         <div class="p-2 text-sm text-gray-500">Nicht wählbar</div>
                     {% endif %}
                 </fieldset>

templates/booking/_summary.html.twig

@@ -146,7 +146,7 @@
                                     {{ servicePricing.participantCount }}x {{ servicePricing.label }}
                                 </td>
                                 <td class="px-2 pb-2 align-top w-24 text-right whitespace-nowrap">
-                                    {{ servicePricing.totalPrice | format_currency('EUR') }}
+                                    {{ servicePricing.totalPrice | format_service_price }}
                                 </td>
                             </tr>
                         {% endfor %}