chore: adopt namespace pattern for accommodation booking controllers
This commit is contained in:
Björn Fromme
@@ -1,5 +1,5 @@
|
||||
{#- Prices only — travel dates and group size belong to _stay_details.html.twig and the
|
||||
PDF's own data block. Mirrors groups/booking/_offer_summary.html.twig, but with inline
|
||||
PDF's own data block. Mirrors groups/offer/_summary.html.twig, but with inline
|
||||
styles: neither the email layout nor dompdf ships table styling or Tailwind.
|
||||
Context: booking, priceBreakdown, currency (set in AccommodationBookingService and
|
||||
AccommodationBookingPdfGenerator). -#}
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
<div class="border border-primary-bg mb-4">
|
||||
<div class="p-2 bg-primary-bg uppercase font-semibold">Persönliche Daten</div>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-2 p-2 text-sm">
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Gruppenname:</span>
|
||||
{{ dto.groupName }}
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Name:</span>
|
||||
{{ dto.salutation }} {{ dto.firstName }} {{ dto.lastName }}
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">E-Mail:</span>
|
||||
{{ dto.email }}
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Telefon:</span>
|
||||
{{ dto.phone }}
|
||||
</div>
|
||||
<div class="md:col-span-2">
|
||||
<span class="text-gray-600 font-semibold">Adresse:</span>
|
||||
{{ dto.street }}, {{ dto.zip }} {{ dto.city }}
|
||||
</div>
|
||||
{% if dto.remarks %}
|
||||
<div class="md:col-span-2">
|
||||
<span class="text-gray-600 font-semibold">Anmerkungen:</span>
|
||||
{{ dto.remarks }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,42 +0,0 @@
|
||||
{% set selectedBoardService = null %}
|
||||
{% for service in ctx.boardServices %}
|
||||
{% if service.id == dto.selectedBoardServiceId %}
|
||||
{% set selectedBoardService = service %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{% set selectedAdditionalServices = ctx.additionalServices|filter(service => service.id in dto.selectedAdditionalServiceIds) %}
|
||||
|
||||
<div class="border border-primary-bg mb-4">
|
||||
<div class="p-2 bg-primary-bg uppercase font-semibold">Ausgewählte Leistungen</div>
|
||||
<div class="p-2 text-sm">
|
||||
<div class="mb-2">
|
||||
<span class="text-gray-600 font-semibold">Verpflegung:</span>
|
||||
{% if selectedBoardService %}
|
||||
{{ selectedBoardService.label }}
|
||||
{% if selectedBoardService.price > 0 %}
|
||||
— {{ (selectedBoardService.price / 100)|format_currency(ctx.accommodation.currency) }} pro Person und Nacht
|
||||
{% endif %}
|
||||
{% if selectedBoardService.description %}
|
||||
<div class="text-xs text-gray-500">{{ selectedBoardService.description|nl2br }}</div>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
Selbstversorgung
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if selectedAdditionalServices is not empty %}
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Zusatzleistungen:</span>
|
||||
<ul class="list-disc list-inside">
|
||||
{% for service in selectedAdditionalServices %}
|
||||
<li>
|
||||
{{ service.label }}
|
||||
— {{ (service.price / 100)|format_currency(ctx.accommodation.currency) }} {{ service.type.label|trans }}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -40,8 +40,80 @@
|
||||
} %}
|
||||
{% endif %}
|
||||
|
||||
{% include 'groups/booking/_step4_services_recap.html.twig' with { 'dto': dto, 'ctx': ctx } %}
|
||||
{% include 'groups/booking/_step4_personal_data_recap.html.twig' with { 'dto': dto } %}
|
||||
{% set selectedBoardService = null %}
|
||||
{% for service in ctx.boardServices %}
|
||||
{% if service.id == dto.selectedBoardServiceId %}
|
||||
{% set selectedBoardService = service %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{% set selectedAdditionalServices = ctx.additionalServices|filter(service => service.id in dto.selectedAdditionalServiceIds) %}
|
||||
|
||||
<div class="border border-primary-bg mb-4">
|
||||
<div class="p-2 bg-primary-bg uppercase font-semibold">Ausgewählte Leistungen</div>
|
||||
<div class="p-2 text-sm">
|
||||
<div class="mb-2">
|
||||
<span class="text-gray-600 font-semibold">Verpflegung:</span>
|
||||
{% if selectedBoardService %}
|
||||
{{ selectedBoardService.label }}
|
||||
{% if selectedBoardService.price > 0 %}
|
||||
— {{ (selectedBoardService.price / 100)|format_currency(ctx.accommodation.currency) }} pro Person und Nacht
|
||||
{% endif %}
|
||||
{% if selectedBoardService.description %}
|
||||
<div class="text-xs text-gray-500">{{ selectedBoardService.description|nl2br }}</div>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
Selbstversorgung
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if selectedAdditionalServices is not empty %}
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Zusatzleistungen:</span>
|
||||
<ul class="list-disc list-inside">
|
||||
{% for service in selectedAdditionalServices %}
|
||||
<li>
|
||||
{{ service.label }}
|
||||
— {{ (service.price / 100)|format_currency(ctx.accommodation.currency) }} {{ service.type.label|trans }}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="border border-primary-bg mb-4">
|
||||
<div class="p-2 bg-primary-bg uppercase font-semibold">Persönliche Daten</div>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-2 p-2 text-sm">
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Gruppenname:</span>
|
||||
{{ dto.groupName }}
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Name:</span>
|
||||
{{ dto.salutation }} {{ dto.firstName }} {{ dto.lastName }}
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">E-Mail:</span>
|
||||
{{ dto.email }}
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-gray-600 font-semibold">Telefon:</span>
|
||||
{{ dto.phone }}
|
||||
</div>
|
||||
<div class="md:col-span-2">
|
||||
<span class="text-gray-600 font-semibold">Adresse:</span>
|
||||
{{ dto.street }}, {{ dto.zip }} {{ dto.city }}
|
||||
</div>
|
||||
{% if dto.remarks %}
|
||||
<div class="md:col-span-2">
|
||||
<span class="text-gray-600 font-semibold">Anmerkungen:</span>
|
||||
{{ dto.remarks }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
</p>
|
||||
|
||||
{{ form_start(confirmationForm, {
|
||||
'action': path('app_groups_booking_offer_confirm', { uuid: booking.uuid }),
|
||||
'action': path('app_groups_offer_confirm', { uuid: booking.uuid }),
|
||||
'attr': {
|
||||
'hx-target': '#htmx-modal',
|
||||
'hx-swap': 'outerHTML',
|
||||
@@ -37,7 +37,7 @@
|
||||
<div id="booking-summary-wrapper"
|
||||
class="order-1 lg:order-2 lg:flex-1 lg:min-h-0 lg:col-span-2"
|
||||
{{ stimulus_controller('toggle', { 'open': false }, { 'closed': 'hidden', 'open': 'absolute inset-0 z-20', 'iconOpen': 'rotate-180' }) }}>
|
||||
{% include 'groups/booking/_offer_summary.html.twig' with {
|
||||
{% include 'groups/offer/_summary.html.twig' with {
|
||||
booking: booking,
|
||||
ctx: ctx,
|
||||
currency: currency,
|
||||
@@ -78,7 +78,7 @@
|
||||
<div>
|
||||
<button type="button"
|
||||
class="button button--primary w-full"
|
||||
hx-get="{{ path('app_groups_booking_offer_confirm', { uuid: booking.uuid }) }}"
|
||||
hx-get="{{ path('app_groups_offer_confirm', { uuid: booking.uuid }) }}"
|
||||
hx-target="body"
|
||||
hx-swap="beforeend">
|
||||
Angebot verbindlich buchen
|
||||
Reference in New Issue
Block a user