EP/myep
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: unify pickup selection

Browse Source
This commit is contained in:
Björn Fromme
2026-03-16 11:59:10 +01:00
parent 0f4b16c194
commit e330626b03
19 changed files with 119 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/booking/create_step_2.html.twig
+34 -47
View File
@@ -103,15 +103,12 @@
{{ form_row(participant.mobile) }}
</div>
{% if participant.address is defined %}
<fieldset class="border border-gray-300 rounded p-4 mb-4">
<legend class="font-semibold px-2">{{ participant.address.vars.label }}</legend>
<div class="grid grid-cols-2 gap-4">
{{ form_row(participant.address.street) }}
{{ form_row(participant.address.postCode) }}
{{ form_row(participant.address.city) }}
{{ form_row(participant.address.country) }}
</div>
</fieldset>
<div class="grid grid-cols-2 gap-4">
{{ form_row(participant.address.street) }}
{{ form_row(participant.address.postCode) }}
{{ form_row(participant.address.city) }}
{{ form_row(participant.address.country) }}
</div>
{% endif %}
{% if participant.bodyDimensions is defined %}
<div class="grid grid-cols-2 gap-4">
@@ -268,34 +265,35 @@
}
}) }}
{% endif %}
{% if participant.pickupOutbound is defined %}
<div class="mt-4">
{{ form_row(participant.pickupOutbound, {
'attr': {
'hx-trigger': 'change',
'hx-post': path('app_booking_create_step_2_refresh'),
'hx-swap': 'none'
}
}) }}
</div>
{% if participant.pickup is defined or participant.parking is defined or participant.licensePlate is defined %}
{% if participant.pickup is defined %}
<div class="mt-4">
{{ form_row(participant.pickup, {
'attr': {
'hx-trigger': 'change',
'hx-post': path('app_booking_create_step_2_refresh'),
'hx-swap': 'none'
}
}) }}
</div>
{% endif %}
{% if participant.parking is defined %}
<div class="mt-4">
{{ form_row(participant.parking, {
'attr': {
'hx-trigger': 'change',
'hx-post': path('app_booking_create_step_2_refresh'),
'hx-swap': 'none'
}
}) }}
</div>
{% endif %}
{% if participant.licensePlate is defined %}
<div class="mt-4">
{{ form_row(participant.licensePlate) }}
</div>
{% endif %}
{% endif %}
{% if participant.parking is defined %}
<div class="mt-4">
{{ form_row(participant.parking, {
'attr': {
'hx-trigger': 'change',
'hx-post': path('app_booking_create_step_2_refresh'),
'hx-swap': 'none'
}
}) }}
</div>
{% endif %}
{% if participant.licensePlate is defined %}
<div class="mt-4">
{{ form_row(participant.licensePlate) }}
</div>
{% endif %}
</div>
<div>
{% if participant.transportationInbound is defined %}
@@ -307,17 +305,6 @@
}
}) }}
{% endif %}
{% if participant.pickupInbound is defined %}
<div class="mt-4">
{{ form_row(participant.pickupInbound, {
'attr': {
'hx-trigger': 'change',
'hx-post': path('app_booking_create_step_2_refresh'),
'hx-swap': 'none'
}
}) }}
</div>
{% endif %}
</div>
</div>
</div>
templates/booking/create_step_4.html.twig
+4 -10
View File
@@ -128,17 +128,11 @@
</div>
{% endif %}
{# Pickup Locations #}
{% if participant.pickupOutbound %}
{# Pickup Location #}
{% if participant.pickup %}
<div>
<dt class="text-gray-600 font-semibold">Zustieg Hinfahrt</dt>
<dd>{{ participant.pickupOutbound.label }}</dd>
</div>
{% endif %}
{% if participant.pickupInbound %}
<div>
<dt class="text-gray-600 font-semibold">Zustieg Rückfahrt</dt>
<dd>{{ participant.pickupInbound.label }}</dd>
<dt class="text-gray-600 font-semibold">Zu- und Ausstieg</dt>
<dd>{{ participant.pickup.label }}</dd>
</div>
{% endif %}
templates/booking/edit.html.twig
+3 -13
View File
@@ -336,9 +336,9 @@
}
}) }}
{% endif %}
{% if participant.pickupOutbound is defined %}
{% if participant.pickup is defined %}
<div class="mt-4">
{{ form_row(participant.pickupOutbound, {
{{ form_row(participant.pickup, {
'attr': {
'hx-trigger': 'change',
'hx-post': path('app_booking_edit_refresh', {'id': bookingData.id}),
@@ -381,17 +381,7 @@
}
}) }}
{% endif %}
{% if participant.pickupInbound is defined %}
<div class="mt-4">
{{ form_row(participant.pickupInbound, {
'attr': {
'hx-trigger': 'change',
'hx-post': path('app_booking_edit_refresh', {'id': bookingData.id}),
'hx-swap': 'none'
}
}) }}
</div>
{% endif %}
{# Pickup inbound removed - now unified with pickup field #}
</div>
</div>
</div>