Compare commits

..
16 Commits
8 changed files with 34 additions and 92 deletions

No files matched your search

-1
View File
@@ -74,7 +74,6 @@ APP_CMS_API_BASE_URL="https://www.ep-reisen.de/"
APP_WEBSITE_BASE_URL="https://www.ep-reisen.de/" APP_WEBSITE_BASE_URL="https://www.ep-reisen.de/"
APP_BASE_URL="https://my.ep-reisen.de" APP_BASE_URL="https://my.ep-reisen.de"
APP_CUSTOMER_SERVICE_EMAIL="[email protected]" APP_CUSTOMER_SERVICE_EMAIL="[email protected]"
APP_INSURANCE_REVOCATION_URL="https://www.hmrv.de/daten-aendern/vertrag-beenden/widerruf"
# Travel Data Service Configuration # Travel Data Service Configuration
APP_TRAVEL_PREFER_REMOTE=false APP_TRAVEL_PREFER_REMOTE=false
-6
View File
@@ -117,12 +117,6 @@
<symbol id="icon-unlocked" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"> <symbol id="icon-unlocked" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M13.5 10.5V6.75a4.5 4.5 0 119 0v3.75M3.75 21.75h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H3.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 10.5V6.75a4.5 4.5 0 119 0v3.75M3.75 21.75h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H3.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z" />
</symbol> </symbol>
<symbol id="icon-external-link" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
<path d="M10 6V8H5V19H16V14H18V20C18 20.5523 17.5523 21 17 21H4C3.44772 21 3 20.5523 3 20V7C3 6.44772 3.44772 6 4 6H10ZM21 3V11H19L18.9999 6.413L11.2071 14.2071L9.79289 12.7929L17.5849 5H13V3H21Z"/>
</symbol>
<symbol id="icon-cookie" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
<path d="M21.1634 10.9711C21.5132 10.8204 21.9579 11.0073 21.9811 11.3875C22.1494 14.1467 21.1794 16.9625 19.071 19.0709C15.1657 22.976 8.83405 22.9761 4.92886 19.0709C1.02367 15.1657 1.02377 8.83405 4.92885 4.9288C7.03704 2.82061 9.8525 1.85015 12.6115 2.01806C12.9916 2.04119 13.1787 2.48598 13.028 2.83576C12.4774 4.11367 12.7239 5.65275 13.7677 6.69657C14.3307 7.25963 15.038 7.58971 15.7706 7.68848C16.0483 7.72594 16.2738 7.95144 16.3113 8.2292C16.4101 8.96178 16.7402 9.66905 17.3032 10.2321C18.347 11.2759 19.8857 11.5218 21.1634 10.9711ZM19.7845 13.8397C19.8558 13.5362 19.6123 13.2603 19.3017 13.2337C18.0569 13.1271 16.8417 12.599 15.889 11.6463C15.3166 11.0739 14.8979 10.4061 14.6309 9.69455C14.5744 9.54422 14.4556 9.42534 14.3052 9.36892C13.5936 9.10186 12.9259 8.68322 12.3535 8.11078C11.4005 7.15778 10.8715 5.94208 10.7648 4.69683C10.7381 4.38618 10.4621 4.14264 10.1586 4.2141C8.76039 4.54327 7.43341 5.25267 6.34306 6.34301C3.21903 9.46721 3.21893 14.5326 6.34307 17.6567C9.46721 20.7809 14.5326 20.7808 17.6568 17.6567C18.7474 16.566 19.4557 15.2384 19.7845 13.8397ZM9.8786 14.1212C10.4644 14.707 10.4644 15.6567 9.8786 16.2425C9.29281 16.8283 8.34307 16.8283 7.75728 16.2425C7.17149 15.6567 7.17149 14.707 7.75728 14.1212C8.34306 13.5354 9.29281 13.5354 9.8786 14.1212ZM10.2321 8.11078C10.8179 8.69657 10.8179 9.64631 10.2321 10.2321C9.64636 10.8179 8.69661 10.8179 8.11083 10.2321C7.52504 9.64631 7.52504 8.69656 8.11083 8.11078C8.69661 7.52499 9.64636 7.52499 10.2321 8.11078ZM15.889 13.7676C16.4748 14.3534 16.4748 15.3032 15.889 15.889C15.3032 16.4747 14.3535 16.4747 13.7677 15.889C13.1819 15.3032 13.1819 14.3534 13.7677 13.7676C14.3535 13.1818 15.3032 13.1818 15.889 13.7676Z"/>
</symbol>
<symbol id="icon-mask" fill="currentColor" stroke="none" viewBox="0 0 576 512"> <symbol id="icon-mask" fill="currentColor" stroke="none" viewBox="0 0 576 512">
<!--! Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --> <!--! Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. -->
<path d="M288 64C39.52 64 0 182.1 0 273.5C0 379.5 78.8 448 176 448c27.33 0 51.21-6.516 66.11-36.79l19.93-40.5C268.3 358.6 278.1 352.4 288 352.1c9.9 .3711 19.7 6.501 25.97 18.63l19.93 40.5C348.8 441.5 372.7 448 400 448c97.2 0 176-68.51 176-174.5C576 182.1 536.5 64 288 64zM400 400c-18.12 0-19.56-2.924-23.04-9.986l-20.35-41.33c-13.87-26.86-38.85-43.53-66.82-44.57L288 304L286.2 304.1c-27.96 1.049-52.94 17.71-67.24 45.41l-19.93 40.49C195.6 397.1 194.1 400 176 400c-75.36 0-128-52.04-128-126.5C48 229.3 48 112 288 112s240 117.3 240 161.5C528 347.1 475.4 400 400 400zM160 192C124.7 192 96 220.7 96 256s28.65 64 64 64c35.35 0 64-28.65 64-64S195.3 192 160 192zM416 192c-35.35 0-64 28.65-64 64s28.65 64 64 64c35.35 0 64-28.65 64-64S451.3 192 416 192z"/> <path d="M288 64C39.52 64 0 182.1 0 273.5C0 379.5 78.8 448 176 448c27.33 0 51.21-6.516 66.11-36.79l19.93-40.5C268.3 358.6 278.1 352.4 288 352.1c9.9 .3711 19.7 6.501 25.97 18.63l19.93 40.5C348.8 441.5 372.7 448 400 448c97.2 0 176-68.51 176-174.5C576 182.1 536.5 64 288 64zM400 400c-18.12 0-19.56-2.924-23.04-9.986l-20.35-41.33c-13.87-26.86-38.85-43.53-66.82-44.57L288 304L286.2 304.1c-27.96 1.049-52.94 17.71-67.24 45.41l-19.93 40.49C195.6 397.1 194.1 400 176 400c-75.36 0-128-52.04-128-126.5C48 229.3 48 112 288 112s240 117.3 240 161.5C528 347.1 475.4 400 400 400zM160 192C124.7 192 96 220.7 96 256s28.65 64 64 64c35.35 0 64-28.65 64-64S195.3 192 160 192zM416 192c-35.35 0-64 28.65-64 64s28.65 64 64 64c35.35 0 64-28.65 64-64S451.3 192 416 192z"/>

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 40 KiB

-1
View File
@@ -10,7 +10,6 @@ twig:
legal_notice_url: '%env(APP_LEGAL_NOTICE_URL)%' legal_notice_url: '%env(APP_LEGAL_NOTICE_URL)%'
terms_and_conditions_url: '%env(APP_TERMS_AND_CONDITIONS_URL)%' terms_and_conditions_url: '%env(APP_TERMS_AND_CONDITIONS_URL)%'
privacy_policy_url: '%env(APP_PRIVACY_POLICY_URL)%' privacy_policy_url: '%env(APP_PRIVACY_POLICY_URL)%'
insurance_revocation_url: '%env(APP_INSURANCE_REVOCATION_URL)%'
when@test: when@test:
twig: twig:
+1 -1
View File
@@ -2,7 +2,7 @@ const {defineConfig} = require("cypress");
module.exports = defineConfig({ module.exports = defineConfig({
e2e: { e2e: {
baseUrl: 'https://myep.ddev.site', baseUrl: 'https://myep-next-booking.ddev.site',
supportFile: false, supportFile: false,
}, },
}); });
-2
View File
@@ -1,7 +1,5 @@
# Body Dimensions Transition Plan (Stakeholder Draft) # Body Dimensions Transition Plan (Stakeholder Draft)
> **STATUS (verified 2026-07-15): NOT IMPLEMENTED.** `src/Form/BodyDimensionsType.php` still declares `height`, `shoeSize`, and `weight` as `IntegerType` fields, and `src/Validator/Constraints/ParticipantValidator.php` has no regex/legacy-format handling — only numeric range checks. This plan has not been acted on.
## Goal ## Goal
Prevent edit-form failures for existing bookings while we transition from legacy body-dimension values to a better long-term field model. Prevent edit-form failures for existing bookings while we transition from legacy body-dimension values to a better long-term field model.
+3 -3
View File
@@ -1,6 +1,6 @@
# Booking Flow Reference # Booking Flow Reference
Last updated: 2026-07-15 Last updated: 2026-04-16
This document traces the booking create and edit flows from controller entry point through to session/DTO state. It is intended as orientation for developers unfamiliar with the flow, not as a substitute for reading the code. This document traces the booking create and edit flows from controller entry point through to session/DTO state. It is intended as orientation for developers unfamiliar with the flow, not as a substitute for reading the code.
@@ -35,7 +35,7 @@ Step 1 (room selection)
### Entry / Bootstrap ### Entry / Bootstrap
`AbstractBookingCreateController::loadBookingCreateDto()` is called by every step controller and delegates to `BookingSessionManager::getOrCreateBookingCreateDto()`. If no DTO exists in session, `BookingConfigurator::startFreshBooking()` loads travel data and initialises a fresh `BookingDto`. `BookingExceptionHandlerTrait::getOrCreateBookingCreateDto()` is called by every step controller. If no DTO exists in session, it calls `BookingConfigurator::startFreshBooking()` which loads travel data and initialises a fresh `BookingDto`.
### Step 1 — Room Selection ### Step 1 — Room Selection
@@ -62,7 +62,7 @@ HTMX refresh (`/bookings/create/refresh`): processes the form without validation
1. Load DTO from session (or redirect to Step 1 if missing) 1. Load DTO from session (or redirect to Step 1 if missing)
2. `TravelDataProvider::enrichWithFreshAvailabilities()` — refreshes room availability 2. `TravelDataProvider::enrichWithFreshAvailabilities()` — refreshes room availability
3. `ensureCorrectNumberOfParticipants()` — syncs the `BookingDto::participants` array length with the room selections (e.g., 2× double room → 4 participants). Preserves existing participant data for slots that still exist. 3. `ensureCorrectNumberOfParticipants()` — syncs the `BookingDto::participants` array length with the room selections (e.g., 2× double room → 4 participants). Preserves existing participant data for slots that still exist.
4. `ParticipantDataPrefiller::shouldPrefillApplicant()` + `prefillApplicantFromUser()` — prefills participant[0] from user profile on first visit 4. `ParticipantDataPrefiller::shouldPrepopulateApplicant()` + `prepopulateApplicantFromUser()` — prefills participant[0] from user profile on first visit
5. `RoomAssigner::validateAndResetInvalidAssignments()` — clears any room assignments that no longer match the current room selection (handles back-navigation from Step 2 → Step 1 → Step 2) 5. `RoomAssigner::validateAndResetInvalidAssignments()` — clears any room assignments that no longer match the current room selection (handles back-navigation from Step 2 → Step 1 → Step 2)
6. `RoomAssigner::assignRoomsIfNeeded()` — auto-assigns participants to rooms 6. `RoomAssigner::assignRoomsIfNeeded()` — auto-assigns participants to rooms
7. `BookingConfigurator::preselectDefaultServices()` — selects mandatory and auto-book services for all participants 7. `BookingConfigurator::preselectDefaultServices()` — selects mandatory and auto-book services for all participants
+11 -49
View File
@@ -125,6 +125,8 @@ Delete Draft on Success
``` ```
src/ src/
├── Admin/ # EasyAdmin custom fields
│ └── Field/JsonDataField.php
├── BusProNet/ # BusProNet API integration layer ├── BusProNet/ # BusProNet API integration layer
│ ├── ApiClient.php # Main API client │ ├── ApiClient.php # Main API client
│ ├── Constants.php # Service tokens and constants │ ├── Constants.php # Service tokens and constants
@@ -132,12 +134,12 @@ src/
│ ├── DataProvider/ # Data providers (countries) │ ├── DataProvider/ # Data providers (countries)
│ ├── Exception/ # API-specific exceptions │ ├── Exception/ # API-specific exceptions
│ ├── Form/ # Form choice loaders │ ├── Form/ # Form choice loaders
│ ├── Model/ # Data models (41 classes) │ ├── Model/ # Data models (39 classes)
│ ├── Traits/ # Shared traits │ ├── Traits/ # Shared traits
│ ├── Utility/ # Helper utilities │ ├── Utility/ # Helper utilities
│ ├── XmlLoader/ # Cached XML file loaders │ ├── XmlLoader/ # Cached XML file loaders
│ └── XmlParser/ # XML response parsers (29 classes) │ └── XmlParser/ # XML response parsers (28 classes)
├── Command/ # CLI commands (15 commands) ├── Command/ # CLI commands (9 commands)
├── Controller/ # HTTP controllers ├── Controller/ # HTTP controllers
│ ├── Account/ # Account management │ ├── Account/ # Account management
│ ├── Admin/ # EasyAdmin controllers │ ├── Admin/ # EasyAdmin controllers
@@ -149,7 +151,6 @@ src/
│ ├── RegistrationController.php │ ├── RegistrationController.php
│ ├── ResetPasswordController.php │ ├── ResetPasswordController.php
│ └── SecurityController.php │ └── SecurityController.php
├── Email/ # Transactional email builders
├── Entity/ # Doctrine entities ├── Entity/ # Doctrine entities
│ ├── User.php │ ├── User.php
│ ├── LogEntry.php │ ├── LogEntry.php
@@ -159,19 +160,16 @@ src/
├── Form/ # Form system ├── Form/ # Form system
│ ├── Model/ # DTOs (BookingDto, ParticipantDto, etc.) │ ├── Model/ # DTOs (BookingDto, ParticipantDto, etc.)
│ ├── Service/ # Field handlers & conditions │ ├── Service/ # Field handlers & conditions
│ │ └── Condition/ # 25 condition classes │ │ └── Condition/ # 22+ condition classes
│ ├── DataTransformer/ # Form data transformers │ ├── DataTransformer/ # Form data transformers
│ └── Extension/ # Form extensions (XSS protection) │ └── Extension/ # Form extensions (XSS protection)
├── Htmx/ # HTMX utilities ├── Htmx/ # HTMX utilities
├── Logger/ # Custom Monolog handlers/processors ├── Logger/ # Custom Monolog handlers/processors
├── Menu/ # Navigation menu builders
├── Message/ # Messenger message classes
├── MessageHandler/ # Messenger message handlers
├── Model/ # Application models ├── Model/ # Application models
├── Repository/ # Doctrine repositories ├── Repository/ # Doctrine repositories
├── Security/ # Authentication & authorization ├── Security/ # Authentication & authorization
│ └── Voter/ # Custom voters │ └── Voter/ # Custom voters
├── Service/ # Business logic services (43 services) ├── Service/ # Business logic services (21 services)
├── Twig/ # Template extensions ├── Twig/ # Template extensions
└── Validator/ # Custom validation constraints └── Validator/ # Custom validation constraints
└── Constraints/ # Constraint classes └── Constraints/ # Constraint classes
@@ -198,7 +196,7 @@ assets/
├── app.js # Main entry point ├── app.js # Main entry point
├── bootstrap.js # Stimulus initialization ├── bootstrap.js # Stimulus initialization
├── loading.js # HTMX loading indicator ├── loading.js # HTMX loading indicator
├── controllers/ # Stimulus controllers (14) ├── controllers/ # Stimulus controllers (10)
├── styles/ # TailwindCSS styles ├── styles/ # TailwindCSS styles
│ ├── app.css # Main stylesheet │ ├── app.css # Main stylesheet
│ └── components/ # Component styles │ └── components/ # Component styles
@@ -1003,10 +1001,6 @@ public function deleteExpiredDrafts(): int;
| `toast_controller` | Toast notifications via Toastify | | `toast_controller` | Toast notifications via Toastify |
| `tooltip_controller` | Tooltips via Tippy.js | | `tooltip_controller` | Tooltips via Tippy.js |
| `backbutton_controller` | Browser back navigation | | `backbutton_controller` | Browser back navigation |
| `data_layer_controller` | Pushes analytics events to the data layer |
| `mobilenav_controller` | Mobile navigation menu |
| `password_reveal_controller` | Show/hide password input |
| `sidebar_menu_controller` | Sidebar menu state |
### 9.2 HTMX Integration ### 9.2 HTMX Integration
@@ -1127,22 +1121,6 @@ php bin/console app:bpn:xml-sync [--force|-f] [--dry-run]
Synchronizes XML export files from remote SFTP. Invalidates caches on completion. Synchronizes XML export files from remote SFTP. Invalidates caches on completion.
#### app:bpn:refresh-travel-snapshot
```bash
php bin/console app:bpn:refresh-travel-snapshot
```
Refreshes active travel snapshots using extended availability data.
#### app:bpn:xml-cache-invalidate
```bash
php bin/console app:bpn:xml-cache-invalidate
```
Invalidates BPN XML caches when local `uebertragung.info` changes.
### 10.2 Maintenance Commands ### 10.2 Maintenance Commands
#### app:draft:cleanup #### app:draft:cleanup
@@ -1207,22 +1185,6 @@ Creates or deletes the Mailjet `unsub` callback for `POST /webhooks/mailjet/news
- `register` prints the API response payload so you can note the callback ID. - `register` prints the API response payload so you can note the callback ID.
- `remove` and `deactivate` require the callback ID returned by Mailjet. - `remove` and `deactivate` require the callback ID returned by Mailjet.
#### app:db:anonymize
```bash
php bin/console app:db:anonymize
```
Anonymizes personal data in the local database.
#### app:log-entry:backfill-error-codes
```bash
php bin/console app:log-entry:backfill-error-codes
```
Backfills the `error_code` column from extra data in existing log entries.
### 10.3 Setup Commands ### 10.3 Setup Commands
#### app:crypto:generate-keys #### app:crypto:generate-keys
@@ -1326,7 +1288,7 @@ This section documents known API behaviors and the solutions implemented.
**Solution:** Automatic retry with configurable attempts (default: 3) and delay (default: 1s). **Solution:** Automatic retry with configurable attempts (default: 3) and delay (default: 1s).
**Location:** `src/BusProNet/ApiClient.php:646` (`executeWithRetry`) **Location:** `src/BusProNet/ApiClient.php:625-659`
```php ```php
private function executeWithRetry(callable $operation, ?string $type = null): mixed private function executeWithRetry(callable $operation, ?string $type = null): mixed
@@ -1385,7 +1347,7 @@ public function shouldProcess(...): bool
**Solution:** Exclude `personId` and `addressId` from create mode payload. **Solution:** Exclude `personId` and `addressId` from create mode payload.
**Location:** `src/BusProNet/DataProcessor/BookingPayloadBuilder.php:275,313` **Location:** `src/BusProNet/DataProcessor/BookingPayloadBuilder.php:247-249`
### 13.6 Personal Data Mutability Flag ### 13.6 Personal Data Mutability Flag
@@ -1403,7 +1365,7 @@ public function shouldProcess(...): bool
**Solution:** Inject synthetic option with ID '0' that satisfies validation but is excluded from API transmission. **Solution:** Inject synthetic option with ID '0' that satisfies validation but is excluded from API transmission.
**Location:** `src/BusProNet/Model/Insurance.php:26` (constant), `:201` (`isNoInsurance()`) **Location:** `src/BusProNet/Model/Insurance.php:19-26`
```php ```php
public const NO_INSURANCE_ID = '0'; public const NO_INSURANCE_ID = '0';
+19 -29
View File
@@ -8,37 +8,27 @@
{% include '_partials/_header.html.twig' %} {% include '_partials/_header.html.twig' %}
{% endblock %} {% endblock %}
</div> </div>
<div class="flex-1 flex flex-col min-h-0 overflow-y-auto md:overflow-hidden relative z-10"> <div class="flex-1 flex flex-col min-h-0 relative z-10">
<div class="flex-none flex flex-col md:flex-1 md:min-h-0"> <div class="flex-1 overflow-y-auto">
<div class="md:flex-1 md:overflow-y-auto"> {% block content %}{% endblock %}
{% block content %}{% endblock %}
</div>
</div> </div>
{% block footer %}
<div class="p-4 flex flex-col items-center space-y-2 md:flex-row md:space-x-4 md:space-y-0 text-white md:text-sm">
<a href="{{ legal_notice_url }}" class="flex items-center space-x-1" target="_blank">
{{ icon('external-link', 'w-3 h-3') }}
<span>Impressum</span>
</a>
<a href="{{ terms_and_conditions_url }}" class="flex items-center space-x-1" target="_blank">
{{ icon('external-link', 'w-3 h-3') }}
<span>AGB</span>
</a>
<a href="{{ privacy_policy_url }}" class="flex items-center space-x-1" target="_blank">
{{ icon('external-link', 'w-3 h-3') }}
<span>Datenschutz</span>
</a>
<a href="{{ insurance_revocation_url }}" class="flex items-center space-x-1" target="_blank">
{{ icon('external-link', 'w-3 h-3') }}
<span>Widerruf RRV</span>
</a>
<button type="button" class="flex items-center space-x-1 bg-transparent border-0 p-0 cursor-pointer" onclick="cookiefirst_show_settings(); return false">
{{ icon('cookie', 'w-3 h-3') }}
<span>Cookie-Einstellungen</span>
</button>
</div>
{% endblock %}
</div> </div>
{% block footer %}
<div class="p-4 flex items-center space-x-4 text-white text-sm underline">
<a href="{{ legal_notice_url }}" target="_blank">
Impressum
</a>
<a href="{{ terms_and_conditions_url }}" target="_blank">
AGB
</a>
<a href="{{ privacy_policy_url }}" target="_blank">
Datenschutz
</a>
<button type="button" class="bg-transparent border-0 p-0 cursor-pointer" onclick="cookiefirst_show_settings(); return false">
Cookie-Einstellungen
</button>
</div>
{% endblock %}
</div> </div>
{% include '_partials/_loading_indicator.html.twig' %} {% include '_partials/_loading_indicator.html.twig' %}
</div> </div>