chore: update project dependencies

addresses #869ckkwh7

.ddev/addon-metadata/opencode/manifest.yaml

@@ -1,11 +0,0 @@
-name: opencode
-repository: /Users/fromme/Development/Misc/ddev-opencode
-version: ""
-install_date: "2026-01-05T17:21:57+01:00"
-project_files:
-    - web-build/Dockerfile.opencode
-    - commands/web/opencode
-    - config.opencode.yaml
-    - opencode/.gitignore
-global_files: []
-removal_actions: []

.ddev/commands/web/opencode

@@ -1,11 +0,0 @@
-#!/bin/bash
-#ddev-generated
-
-## Description: OpenCode AI coding assistant
-## Usage: opencode
-## Example: ddev opencode [...]
-
-set -e
-
-opencode $@
-

.ddev/config.opencode.yaml

@@ -1,6 +0,0 @@
-#ddev-generated
-webimage_extra_packages:
-  - xdg-utils
-hooks:
-  post-start:
-    - exec: "mkdir -p /var/www/html/.ddev/opencode/.opencode && ln -sf /var/www/html/.ddev/opencode/.opencode ~/.opencode"

.ddev/config.yaml

@@ -1,44 +1,51 @@
 type: php
 docroot: public
-php_version: "8.2"
+php_version: "8.3"
 webserver_type: apache-fpm
 xdebug_enabled: false
-additional_hostnames: []
+additional_hostnames:
+    - mysnz
+    - mysbw
+    - myser
 additional_fqdns: []
 database:
-    type: mariadb
-    version: "10.11"
+    type: mysql
+    version: "8.4"
 use_dns_when_possible: true
 composer_version: "2"
 web_environment: []
 corepack_enable: false
+nodejs_version: "22"
 
 # Key features of DDEV's config.yaml:
 
 # name: <projectname> # Name of the project, automatically provides
 #   http://projectname.ddev.site and https://projectname.ddev.site
+# If the name is omitted, the project will take the name of the enclosing directory,
+# which is useful if you want to have a copy of the project side by side with this one.
 
-# type: <projecttype>  # backdrop, craftcms, django4, drupal, drupal6, drupal7, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
-# See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more
+# type: <projecttype>  # backdrop, cakephp, craftcms, drupal, drupal6, drupal7, drupal8, drupal9, drupal10, drupal11, generic, laravel, magento, magento2, php, shopware6, silverstripe, symfony, typo3, wordpress
+# See https://docs.ddev.com/en/stable/users/quickstart/ for more
 # information on the different project types
-# "drupal" covers recent Drupal 8+
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "8.2"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"
+# php_version: "8.3"  # PHP version to use, "5.6" through "8.5"
 
 # You can explicitly specify the webimage but this
 # is not recommended, as the images are often closely tied to DDEV's' behavior,
 # so this can break upgrades.
 
-# webimage: <docker_image>  # nginx/php docker image.
+# webimage: <docker_image>
+# It’s unusual to change this option, and we don’t recommend it without Docker experience and a good reason.
+# Typically, this means additions to the existing web image using a .ddev/web-build/Dockerfile.*
 
 # database:
 #   type: <dbtype> # mysql, mariadb, postgres
 #   version: <version> # database version, like "10.11" or "8.0"
-#   MariaDB versions can be 5.5-10.8, 10.11, and 11.4.
-#   MySQL versions can be 5.5-8.0.
-#   PostgreSQL versions can be 9-17.
+#   MariaDB versions can be 5.5-10.8, 10.11, 11.4, 11.8
+#   MySQL versions can be 5.5-8.0, 8.4
+#   PostgreSQL versions can be 9-18
 
 # router_http_port: <port>  # Port to be used for http (defaults to global configuration, usually 80)
 # router_https_port: <port> # Port for https (defaults to global configuration, usually 443)
@@ -48,12 +55,21 @@ corepack_enable: false
 # "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,
 # as leaving Xdebug enabled all the time is a big performance hit.
 
-# xhprof_enabled: false  # Set to true to enable Xhprof and "ddev start" or "ddev restart"
-# Note that for most people the commands
-# "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
-# as leaving Xhprof enabled all the time is a big performance hit.
+# xhgui_http_port: "8143"
+# xhgui_https_port: "8142"
+# The XHGui ports can be changed from the default 8143 and 8142
+# Very rarely used
 
-# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn
+# host_xhgui_port: "8142"
+# Can be used to change the host binding port of the XHGui
+# application. Rarely used; only when port conflict and
+# bind_all_ports is used (normally with router disabled)
+
+# xhprof_mode: [prepend|xhgui|global]
+# Set to "xhgui" to enable XHGui features
+# "xhgui" will become default in a future major release
+
+# webserver_type: nginx-fpm, apache-fpm, generic
 
 # timezone: Europe/Berlin
 # If timezone is unset, DDEV will attempt to derive it from the host system timezone
@@ -79,9 +95,9 @@ corepack_enable: false
 # Alternatively, an explicit Composer version may be specified, for example "2.2.18".
 # To reinstall Composer after the image was built, run "ddev debug rebuild".
 
-# nodejs_version: "20"
+# nodejs_version: "22"
 # change from the default system Node.js version to any other version.
-# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
+# See https://docs.ddev.com/en/stable/users/configuration/config/#nodejs_version for more information
 # and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
 # Note that using of 'ddev nvm' is discouraged because "nodejs_version" is much easier to use,
 # can specify any version, and is more robust than using 'nvm'.
@@ -117,7 +133,7 @@ corepack_enable: false
 
 # ddev_version_constraint: ""
 # Example:
-# ddev_version_constraint: ">= 1.22.4"
+# ddev_version_constraint: ">= 1.24.8"
 # This will enforce that the running ddev version is within this constraint.
 # See https://github.com/Masterminds/semver#checking-version-constraints for
 # supported constraint formats
@@ -146,8 +162,8 @@ corepack_enable: false
 #   - "mutagen": enables Mutagen for this project.
 #   - "nfs":     enables NFS for this project.
 #
-# See https://ddev.readthedocs.io/en/stable/users/install/performance/#nfs
-# See https://ddev.readthedocs.io/en/stable/users/install/performance/#mutagen
+# See https://docs.ddev.com/en/stable/users/install/performance/#nfs
+# See https://docs.ddev.com/en/stable/users/install/performance/#mutagen
 
 # fail_on_hook_fail: False
 # Decide whether 'ddev start' should be interrupted by a failing hook
@@ -196,7 +212,7 @@ corepack_enable: false
 
 # ngrok_args: --basic-auth username:pass1234
 # Provide extra flags to the "ngrok http" command, see
-# https://ngrok.com/docs/ngrok-agent/config or run "ngrok http -h"
+# https://ngrok.com/docs/agent/config/v3/#agent-configuration or run "ngrok http -h"
 
 # disable_settings_management: false
 # If true, DDEV will not create CMS-specific settings files like
@@ -274,7 +290,7 @@ corepack_enable: false
 # Many DDEV commands can be extended to run tasks before or after the
 # DDEV command is executed, for example "post-start", "post-import-db",
 # "pre-composer", "post-composer"
-# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
+# See https://docs.ddev.com/en/stable/users/extend/custom-commands/ for more
 # information on the commands that can be extended and the tasks you can define
 # for them. Example:
 #hooks:

.ddev/opencode/.gitignore

@@ -1,5 +0,0 @@
-#ddev-generated
-
-# OpenCode internal config
-/.opencode/
-

.ddev/web-build/Dockerfile.opencode

@@ -1,4 +0,0 @@
-#ddev-generated
-
-RUN npm install -g opencode-ai
-

.env

@@ -25,7 +25,7 @@ APP_SECRET=642ead390b8a38f0a017ec84d5362129
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
-DATABASE_URL="mysql://db:db@db:3306/db?serverVersion=10.11.11-MariaDB&charset=utf8mb4"
+DATABASE_URL="mysql://db:db@db:3306/db?serverVersion=8.4.0&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
@@ -40,22 +40,45 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 MAILER_DSN=null://null
 ###< symfony/mailer ###
 
+MAILJET_API_KEY=
+MAILJET_API_SECRET=
+MAILJET_API_BASE_URL=https://api.mailjet.com/v3/REST
+MAILJET_NEWSLETTER_LIST_ID=
+APP_NEWSLETTER_CONFIRMATION_TTL_HOURS=1
+
 APP_BPN_USER=
 APP_BPN_PASSWORD=
 APP_BPN_IP=
-APP_BPN_PORT=
+APP_BPN_PORTS=
 APP_BPN_DEBUG=false
 APP_BPN_CONNECTION_TIMEOUT=5
 APP_BPN_STREAM_TIMEOUT=30
 APP_BPN_TOTAL_TIMEOUT=45
 
 APP_TRAVEL_INFO_BASE_URL="https://www.ep-reisen.de/reiseinformationen/"
+APP_LEGAL_NOTICE_URL="https://www.ep-reisen.de/unternehmen/impressum-skireiseveranstalter/"
+APP_TERMS_AND_CONDITIONS_URL="https://www.ep-reisen.de/skireisen/infos/allgemeine-infos/agb/"
+APP_PRIVACY_POLICY_URL="https://www.ep-reisen.de/unternehmen/impressum-skireiseveranstalter/datenschutz-winterreisen/"
 APP_CMS_API_BASE_URL="https://www.ep-reisen.de/"
 APP_WEBSITE_BASE_URL="https://www.ep-reisen.de/"
+APP_CUSTOMER_SERVICE_EMAIL="[email protected]"
 
 # Travel Data Service Configuration
 APP_TRAVEL_PREFER_REMOTE=false
 APP_TRAVEL_ENABLE_FALLBACK=true
+APP_TRAVEL_SNAPSHOT_RETENTION_BUFFER_DAYS=14
+
+# Feature Flags
+FEATURE_TRAVEL_SNAPSHOT=true
+
+# Emails
+APP_DEFAULT_EMAIL_FROM=[email protected]
+APP_DEFAULT_EMAIL_TO=[email protected]
+
+# Booking Configuration
+# Status for new bookings: 'F' (Fixed/Final), 'O' (Option - requires agency confirmation)
+# Use 'O' during beta phase, switch to 'F' for production
+DEFAULT_BOOKING_STATUS=F
 
 API_KEYS=
 

.gitignore

@@ -31,3 +31,9 @@ yarn-error.log
 /.php-cs-fixer.php
 /.php-cs-fixer.cache
 ###< friendsofphp/php-cs-fixer ###
+
+/ray.php
+
+###> phpstan/phpstan ###
+phpstan.neon
+###< phpstan/phpstan ###

api.http

@@ -60,7 +60,7 @@ Authorization: Bearer {{$auth.token("oauth2_api")}}
 
 ### API travel
 # @no-cookie-jar
-GET {{base_url}}/api/travels/SBW131225
+GET {{base_url}}/api/travels/DPWMP140326
 Accept: application/json
 Authorization: Bearer {{$auth.token("oauth2_api")}}
 
@@ -72,7 +72,7 @@ Authorization: Bearer {{$auth.token("oauth2_api")}}
 
 ### API hotel availability remote
 # @no-cookie-jar
-GET {{base_url}}/api/travels/11603/152546/2026-01-03/availability
+GET {{base_url}}/api/travels/11606/152546/2026-01-24/availability
 Accept: application/json
 Authorization: Bearer {{$auth.token("oauth2_api")}}
 
@@ -90,14 +90,14 @@ Content-Type: application/json
 Authorization: Bearer {{$auth.token("oauth2_api")}}
 
 {
-  "lastName": "Duschen",
-  "firstName": "Isolde",
-  "gender": "f",
-  "street": "Fooroad 1",
-  "zipCode": "12345",
-  "city": "Bartown",
-  "email": "[email protected]",
-  "phone": "12345"
+  "lastName": "{{$random.name.lastName}}",
+  "firstName": "{{$random.name.firstName}}",
+  "gender": "d",
+  "street": "{{$random.address.streetAddress}}",
+  "zipCode": "{{$random.address.zipCode}}",
+  "city": "{{$random.address.city}}",
+  "email": "{{$random.email}}",
+  "phone": "{{$random.phoneNumber.cellPhone}}"
 }
 
 ### API pickups planning webhook

assets/controllers/birthday_controller.js

@@ -0,0 +1,59 @@
+import { Controller } from '@hotwired/stimulus'
+
+/**
+ * Monitors birthday input fields (day, month, year) and dispatches a custom event
+ * only when all three fields are filled with valid values.
+ *
+ * This prevents premature HTMX refreshes when users are still entering the date,
+ * improving UX by waiting until the complete date is entered.
+ */
+export default class extends Controller {
+    static targets = ['day', 'month', 'year']
+
+    /**
+     * Checks if all birthday fields are filled and dispatches a completion event.
+     *
+     * Called on input/change events from the day, month, and year fields.
+     * Only dispatches the 'birthday:complete' event when all three fields
+     * contain valid values that could form a complete date.
+     */
+    check() {
+        const day = this.dayTarget.value.trim()
+        const month = this.monthTarget.value.trim()
+        const year = this.yearTarget.value.trim()
+
+        if (false === this.isComplete(day, month, year)) {
+            return
+        }
+
+        this.element.dispatchEvent(new CustomEvent('birthday:complete', { bubbles: true }))
+    }
+
+    /**
+     * Validates that all date components are filled with plausible values.
+     *
+     * @param {string} day   The day value
+     * @param {string} month The month value
+     * @param {string} year  The year value
+     *
+     * @returns {boolean} True if all fields contain complete values
+     */
+    isComplete(day, month, year) {
+        // Day: 1-2 digits
+        if (0 === day.length || day.length > 2) {
+            return false
+        }
+
+        // Month: 1-2 digits
+        if (0 === month.length || month.length > 2) {
+            return false
+        }
+
+        // Year: exactly 4 digits for a complete year
+        if (4 !== year.length) {
+            return false
+        }
+
+        return true
+    }
+}

assets/controllers/data_layer_controller.js

@@ -0,0 +1,13 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+    static values = {
+        payload: Object
+    };
+
+    connect() {
+        if (typeof window.dataLayer !== 'undefined') {
+            window.dataLayer.push(this.payloadValue);
+        }
+    }
+}

assets/controllers/toast_controller.js

@@ -24,24 +24,15 @@ export default class extends Controller {
     }
 
     handleNotifications(event) {
-        console.log('[VOUCHER DEBUG] showNotifications event received:', event)
-        console.log('[VOUCHER DEBUG] event.detail:', event.detail)
-
         // HTMX wraps the trigger value in an object with 'value' and 'elt' properties
         // event.detail.value contains the actual array from the HX-Trigger header
         const notifications = event.detail?.value || event.detail || []
 
-        console.log('[VOUCHER DEBUG] notifications array:', notifications)
-        console.log('[VOUCHER DEBUG] notifications count:', Array.isArray(notifications) ? notifications.length : 'not an array')
-
         if (Array.isArray(notifications)) {
             notifications.forEach((notification, index) => {
-                console.log(`[VOUCHER DEBUG] Processing notification ${index}:`, notification)
                 const className = this.getClassForType(notification.type)
                 this.showToast(notification.message, className)
             })
-        } else {
-            console.error('[VOUCHER DEBUG] Notifications is not an array:', notifications)
         }
     }
 
@@ -66,4 +57,4 @@ export default class extends Controller {
 
         return typeMap[type] || 'toastify--info'
     }
-}
+}

assets/favicon/icon.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 130 130" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(3, 28)">
+    <path d="M107,0.3c-36.4,5.5 -81.6,19.1 -81.6,38.2c0,17.7 41.8,13.2 41.8,13.2c0,0 -67,22.3 -67,-7c0,-33.2 84.5,-44.4 106.8,-44.4Z" fill="#0084d4"/>
+    <path d="M17,73.5c36.4,-5.4 81.6,-19.1 81.6,-38.2c0,-17.7 -41.8,-13.2 -41.8,-13.2c0,0 67,-22.3 67,7c0,33.3 -84.5,44.4 -106.8,44.4Z" fill="#f8c62f"/>
+    <path d="M60.7,34.3l-12.8,4l12.2,0.8l-0.4,-2.4l1,-2.4Z" fill="#0084d4"/>
+    <path d="M75.9,35.2l-9.2,2.9l-3.5,9.7l-1.7,-11.3l4,-10.7l1.7,7.9l8.7,1.5Z" fill="#f8c62f"/>
+  </g>
+</svg>

assets/loading.js

@@ -5,6 +5,8 @@ const DEBOUNCE_MS = 200
 
 let debounceTimeout = null
 let historyRestoreGracePeriod = false
+let savedScrollPosition = null
+let activeRequests = 0
 
 function getIndicator() {
     return document.getElementById(INDICATOR_ID)
@@ -28,12 +30,20 @@ function hide() {
     }
 }
 
-function handleBeforeRequest() {
+function handleBeforeRequest(event) {
     // Ignore requests triggered during history restore grace period
     if (true === historyRestoreGracePeriod) {
         return
     }
 
+    activeRequests++
+
+    // Save scroll position of the target container before HTMX request
+    const target = event.detail?.target || document.getElementById('main-content')
+    if (target && typeof target.scrollTop === 'number') {
+        savedScrollPosition = { element: target, top: target.scrollTop }
+    }
+
     // Don't start a new debounce if already pending
     if (debounceTimeout) {
         return
@@ -45,7 +55,29 @@ function handleBeforeRequest() {
     }, DEBOUNCE_MS)
 }
 
+function handleRequestEnd() {
+    // Counter may already be 0 if a force-reset (history save, page show) fired
+    // before this afterRequest — ignore the stale completion in that case
+    if (0 === activeRequests) {
+        return
+    }
+
+    activeRequests--
+    if (0 === activeRequests) {
+        hide()
+    }
+}
+
+function handleAfterSwap() {
+    // Restore scroll position after HTMX swaps content
+    if (savedScrollPosition !== null && savedScrollPosition.element) {
+        savedScrollPosition.element.scrollTop = savedScrollPosition.top
+        savedScrollPosition = null
+    }
+}
+
 function handleHistoryRestore() {
+    activeRequests = 0
     hide()
 
     // Set grace period to ignore change events triggered by history restore
@@ -56,23 +88,29 @@ function handleHistoryRestore() {
 }
 
 function handleTimeout() {
-    hide()
+    // Don't decrement here — htmx:afterRequest always fires alongside htmx:timeout
+    // and handles the counter. This handler only shows the alert.
     alert('Die Anfrage hat zu lange gedauert. Bitte versuchen Sie es erneut. Falls das Problem weiterhin besteht, kontaktieren Sie bitte unseren Support.')
 }
 
 function handleBeforeHistorySave() {
     // Hide indicator before HTMX saves the page to history cache
+    activeRequests = 0
+    hide()
+}
+
+function handlePageShow() {
+    activeRequests = 0
     hide()
 }
 
 // Initialize event listeners
 document.body.addEventListener('htmx:beforeRequest', handleBeforeRequest)
-document.body.addEventListener('htmx:afterRequest', hide)
+document.body.addEventListener('htmx:afterRequest', handleRequestEnd)
+document.body.addEventListener('htmx:afterSwap', handleAfterSwap)
 document.body.addEventListener('htmx:timeout', handleTimeout)
 document.body.addEventListener('htmx:historyRestore', handleHistoryRestore)
-document.body.addEventListener('htmx:sendError', hide)
-document.body.addEventListener('htmx:responseError', hide)
 document.body.addEventListener('htmx:beforeHistorySave', handleBeforeHistorySave)
 
-window.addEventListener('pageshow', hide)
-window.addEventListener('popstate', handleHistoryRestore)
+window.addEventListener('pageshow', handlePageShow)
+window.addEventListener('popstate', handleHistoryRestore)

assets/styles/components/button.css

@@ -1,7 +1,7 @@
 .button {
-    @apply inline-flex items-center justify-center space-x-2 h-10 leading-10 px-4 md:px-8 cursor-pointer;
-    @apply uppercase leading-none text-center;
-    @apply transition-colors outline-none focus:outline-2 focus:outline-offset-2 focus:outline-primary-light;
+    @apply inline-flex items-center justify-center space-x-2 h-8 leading-8 md:h-10 md:leading-10 px-4 md:px-8 cursor-pointer;
+    @apply uppercase leading-none text-center text-sm md:text-base;
+    @apply transition-colors outline-none focus:outline-2 focus:outline-offset-2 focus:outline-primary-dark;
     @apply rounded-md;
 }
 
@@ -20,42 +20,47 @@
 }
 
 .button--secondary {
-    @apply bg-none bg-primary-dark text-white;
-    @apply hover:bg-primary-light/80;
+    @apply bg-none bg-primary-light text-white;
+    @apply hover:bg-primary-light/50;
+}
+
+.button--neutral {
+    @apply bg-none bg-gray-200;
+    @apply hover:bg-gray-200/50;
 }
 
 .sbw {
     .button--primary {
         @apply bg-none bg-sbw-secondary text-white;
-        @apply hover:bg-none hover:bg-sbw-primary/80;
+        @apply hover:bg-none hover:bg-sbw-primary/50;
     }
 
     .button--secondary {
         @apply bg-none bg-sbw-primary-dark text-white;
-        @apply hover:bg-none hover:bg-sbw-primary/80;
+        @apply hover:bg-none hover:bg-sbw-primary/50;
     }
 }
 
 .snz {
     .button--primary {
         @apply bg-none bg-snz-secondary text-white;
-        @apply hover:bg-none hover:bg-snz-primary/80;
+        @apply hover:bg-none hover:bg-snz-primary/50;
     }
 
     .button--secondary {
         @apply bg-none bg-snz-primary-dark text-white;
-        @apply hover:bg-none hover:bg-snz-primary/80;
+        @apply hover:bg-none hover:bg-snz-primary/50;
     }
 }
 
 .ser {
     .button--primary {
         @apply bg-none bg-ser-secondary text-white;
-        @apply hover:bg-none hover:bg-ser-primary/80;
+        @apply hover:bg-none hover:bg-ser-primary/50;
     }
 
     .button--secondary {
         @apply bg-none bg-ser-primary text-white;
-        @apply hover:bg-none hover:bg-ser-primary/80;
+        @apply hover:bg-none hover:bg-ser-primary/50;
     }
 }

composer.json

@@ -14,12 +14,16 @@
     "doctrine/doctrine-bundle": "^2.13",
     "doctrine/doctrine-migrations-bundle": "^3.3",
     "doctrine/orm": "^3.3",
+    "easycorp/easyadmin-bundle": "^4.27",
+    "fakerphp/faker": "^1.24",
+    "flagception/flagception-bundle": "^6.1",
     "league/flysystem-bundle": "^3.4",
     "league/flysystem-sftp-v3": "^3.29",
     "league/oauth2-server-bundle": "^1.0",
     "nelexa/zip": "^4.0",
     "nesbot/carbon": "^3.8",
     "phpdocumentor/reflection-docblock": "^5.6",
+    "phpoffice/phpspreadsheet": "^5.4",
     "phpstan/phpdoc-parser": "^2.0",
     "spatie/crypto": "^2.1",
     "symfony/apache-pack": "^1.0",
@@ -69,7 +73,7 @@
     },
     "sort-packages": true,
     "platform": {
-      "php": "8.2.28"
+      "php": "8.3.30"
     }
   },
   "autoload": {
@@ -116,6 +120,9 @@
   "require-dev": {
     "deployer/deployer": "^7.5",
     "friendsofphp/php-cs-fixer": "^3.75",
+    "phpstan/phpstan": "^2.1",
+    "phpstan/phpstan-doctrine": "^2.0",
+    "phpstan/phpstan-symfony": "^2.0",
     "phpunit/phpunit": "^9.5",
     "spatie/ray": "^1.43",
     "spatie/x-ray": "^1.2",

config/bundles.php

@@ -16,4 +16,7 @@ return [
     League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
     League\Bundle\OAuth2ServerBundle\LeagueOAuth2ServerBundle::class => ['all' => true],
     Zenstruck\ScheduleBundle\ZenstruckScheduleBundle::class => ['all' => true],
+    Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
+    EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle::class => ['all' => true],
+    Flagception\Bundle\FlagceptionBundle\FlagceptionBundle::class => ['all' => true],
 ];

config/packages/cache.yaml

@@ -15,5 +15,7 @@ framework:
         #app: cache.adapter.apcu
 
         # Namespaced pools use the above "app" backend by default
-        #pools:
-            #my.dedicated.cache: null
+        pools:
+            bpn.cache:
+                adapter: cache.adapter.filesystem
+                tags: true

config/packages/flagception.yaml

@@ -0,0 +1,2 @@
+flagception:
+    features: {}

config/packages/messenger.yaml

@@ -13,7 +13,7 @@ framework:
                     max_retries: 3
                     multiplier: 2
             failed: 'doctrine://default?queue_name=failed'
-            # sync: 'sync://'
+            sync: 'sync://'
 
         default_bus: messenger.bus.default
 
@@ -21,7 +21,7 @@ framework:
             messenger.bus.default: []
 
         routing:
-            Symfony\Component\Mailer\Messenger\SendEmailMessage: async
+            Symfony\Component\Mailer\Messenger\SendEmailMessage: sync
             Symfony\Component\Notifier\Message\ChatMessage: async
             Symfony\Component\Notifier\Message\SmsMessage: async
 

config/packages/monolog.yaml

@@ -59,7 +59,7 @@ when@test:
                 path: "%kernel.logs_dir%/%kernel.environment%.log"
                 level: debug
 
-when@prod:
+when@prod: &prod_config
     monolog:
         handlers:
             database:
@@ -105,3 +105,5 @@ when@prod:
                 channels: [deprecation]
                 path: php://stderr
                 formatter: monolog.formatter.json
+
+when@staging: *prod_config

config/packages/security.yaml

@@ -33,7 +33,8 @@ security:
     # Note: Only the *first* access control that matches will be used
     access_control:
         - { path: ^/authorize, roles: IS_AUTHENTICATED_REMEMBERED, requires_channel: https }
-        - { path: '^/', roles: PUBLIC_ACCESS, requires_channel: https }
+        - { path: ^/admin, roles: ROLE_ADMIN, requires_channel: https }
+        - { path: ^/, roles: PUBLIC_ACCESS, requires_channel: https }
 
 when@test:
     security:

config/packages/twig.yaml

@@ -1,9 +1,15 @@
 twig:
     file_name_pattern: '*.twig'
     form_themes: ['forms.html.twig']
+    paths:
+        '%kernel.project_dir%/assets/images': images
     globals:
         htmx_change_trigger: 'change delay:100ms'
         website_base_url: '%env(APP_WEBSITE_BASE_URL)%'
+        customer_service_email: '%env(APP_CUSTOMER_SERVICE_EMAIL)%'
+        legal_notice_url: '%env(APP_LEGAL_NOTICE_URL)%'
+        terms_and_conditions_url: '%env(APP_TERMS_AND_CONDITIONS_URL)%'
+        privacy_policy_url: '%env(APP_PRIVACY_POLICY_URL)%'
 
 when@test:
     twig:

config/packages/twig_component.yaml

@@ -0,0 +1,5 @@
+twig_component:
+    anonymous_template_directory: 'components/'
+    defaults:
+        # Namespace & directory for components
+        App\Twig\Components\: 'components/'

config/packages/zenstruck_schedule.yaml

@@ -9,21 +9,52 @@ zenstruck_schedule:
 
   schedule_extensions:
     email_on_failure:
-      to: [email protected]
+      enabled: true
 
   tasks:
     - task: app:cleanup:xml-dumps
       frequency: "0 1 * * *"
       description: "Removes outdated XML dumps of requests/responses to BPN API for debugging"
 
-    - task: app:bpn:xml-sync
-      frequency: "*/15 8-19 * * *"
-      description: "Sync BusPro XML data every 15 min. during peak hours"
-
-    - task: app:bpn:xml-sync
-      frequency: "0 20-23,0-7 * * *"
-      description: "Sync BusPro XML data hourly outside peak hours"
-
     - task: app:cleanup:log-entries
-      frequency: "30 1 * * *"
+      frequency: "15 1 * * *"
       description: "Removes outdated log entries with a retention period of 6 months"
+
+    - task: app:draft:cleanup
+      frequency: "30 1 * * *"
+      description: "Removes expired drafts"
+
+    - task: app:cleanup:newsletter-opt-in-requests
+      frequency: "45 1 * * *"
+      description: "Removes expired pending newsletter double opt-in requests"
+
+    - task: league:oauth2-server:clear-expired-tokens
+      frequency: "0 * * * *"
+      description: "Removes expired oauth2 tokens hourly"
+
+    - task: app:bpn:refresh-travel-snapshot --refresh-after 60
+      frequency: "10 8-19 * * *"
+      description: "Syncs travel data snapshots with BusPro XML data hourly during peak hours"
+
+    - task: app:bpn:refresh-travel-snapshot --refresh-after 180
+      frequency: "10 20-23,0-7 * * *"
+      description: "Syncs travel data snapshots with BusPro XML data every 3 hours outside peak hours"
+
+when@staging:
+  zenstruck_schedule:
+    mailer:
+      subject_prefix: "[MyE&P STAGING]"
+
+when@prod:
+  zenstruck_schedule:
+    mailer:
+      subject_prefix: "[MyE&P PROD]"
+
+    tasks:
+      - task: app:bpn:xml-sync
+        frequency: "*/15 8-19 * * *"
+        description: "Syncs BusPro XML data every 15 min. during peak hours"
+
+      - task: app:bpn:xml-sync
+        frequency: "0 20-23,0-7 * * *"
+        description: "Syncs BusPro XML data hourly outside peak hours"

config/routes/easyadmin.yaml

@@ -0,0 +1,3 @@
+easyadmin:
+    resource: .
+    type: easyadmin.routes

config/services.yaml

@@ -5,8 +5,14 @@
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
     travel_info_base_url: '%env(APP_TRAVEL_INFO_BASE_URL)%'
+    terms_and_conditions_url: '%env(APP_TERMS_AND_CONDITIONS_URL)%'
     path_to_keys: '%kernel.project_dir%/config/secret'
     bpn_debug: '%env(APP_BPN_DEBUG)%'
+    default_booking_status: '%env(DEFAULT_BOOKING_STATUS)%'
+    newsletter_confirmation_ttl_hours: '%env(int:APP_NEWSLETTER_CONFIRMATION_TTL_HOURS)%'
+    travel_snapshot_retention_buffer_days: '%env(int:APP_TRAVEL_SNAPSHOT_RETENTION_BUFFER_DAYS)%'
+    default_email_from: '%env(APP_DEFAULT_EMAIL_FROM)%'
+    default_email_to: '%env(APP_DEFAULT_EMAIL_TO)%'
 
     # Body dimensions choices for BodyDimensionsType
     body_dimensions.height_choices:
@@ -16,7 +22,7 @@ parameters:
         '167 - 178cm': '167-178'
         '179 - 185cm': '179-185'
         '186 - 194cm': '186-194'
-        '195cm oder mehr': '195cm+'
+        '195cm oder mehr': '195+'
     body_dimensions.shoe_size_min: 36
     body_dimensions.shoe_size_max: 48
     body_dimensions.weight_choices:
@@ -26,7 +32,26 @@ parameters:
         '67 - 78kg': '67-78'
         '79 - 85kg': '79-85'
         '86 - 94kg': '86-94'
-        '95kg oder mehr': '95k+'
+        '95kg oder mehr': '95+'
+
+    # domain mapping for theme, gtm id and cmp url
+    domain_config:
+        ep-reisen.de:
+            theme: base
+            gtm_id: GTM-56LWRF
+            cmp_url: https://consent.cookiefirst.com/sites/my.ep-reisen.de-28eabc35-7085-4d8f-b450-522bd1a5247c/consent.js
+        ski-boarderweek.de:
+            theme: sbw
+            gtm_id: GTM-MS2C8CH
+            cmp_url: https://consent.cookiefirst.com/sites/my.ski-boarderweek.de-d3641c34-8183-4b8d-b56e-c052e7a9223e/consent.js
+        semesterende-skireisen.de:
+            theme: ser
+            gtm_id: GTM-MNKDKL9
+            cmp_url: https://consent.cookiefirst.com/sites/my.semesterende-skireisen.de-c9b3422d-eb62-4ce4-b8f7-91e9b509e26f/consent.js
+        snowzone.net:
+            theme: snz
+            gtm_id: GTM-M96CKL
+            cmp_url: https://consent.cookiefirst.com/sites/my.snowzone.net-8e6aea0c-7d93-42a0-a822-29fff2aa5613/consent.js
 
 services:
     # default configuration for services in *this* file
@@ -39,6 +64,7 @@ services:
             $xmlDump: '@xml_dump.storage'
             $jsonExport: '@json_export.storage'
             $travelInfoBaseUrl: '%env(APP_TRAVEL_INFO_BASE_URL)%'
+            $termsAndConditionsUrl: '%terms_and_conditions_url%'
             $logger: '@monolog.logger.core'
             $environment: '%kernel.environment%'
 
@@ -59,7 +85,7 @@ services:
                 bpn_username: '%env(APP_BPN_USER)%'
                 bpn_password: '%env(APP_BPN_PASSWORD)%'
                 bpn_api_ip: '%env(APP_BPN_IP)%'
-                bpn_api_port: '%env(APP_BPN_PORT)%'
+                bpn_api_ports: '%env(csv:APP_BPN_PORTS)%'
                 debug: '%env(bool:APP_BPN_DEBUG)%'
                 connection_timeout: '%env(int:APP_BPN_CONNECTION_TIMEOUT)%'
                 stream_timeout: '%env(int:APP_BPN_STREAM_TIMEOUT)%'
@@ -77,13 +103,21 @@ services:
         arguments:
             $path: '%path_to_keys%'
 
-    App\Service\TravelDataService:
+    App\Service\TravelSnapshotManager:
+        arguments:
+            $retentionBufferDays: '%travel_snapshot_retention_buffer_days%'
+
+    App\Service\TravelDataProvider:
         arguments:
             $logger: '@monolog.logger.core'
             $preferRemote: '%env(bool:APP_TRAVEL_PREFER_REMOTE)%'
             $enableFallback: '%env(bool:APP_TRAVEL_ENABLE_FALLBACK)%'
 
-    App\Service\VoucherValidationService:
+    App\Service\BookingEditDataLoader:
+        arguments:
+            $bpnCache: '@bpn.cache'
+
+    App\Service\VoucherValidator:
         arguments:
             $cache: '@cache.app'
             $logger: '@monolog.logger.bpn'
@@ -111,6 +145,7 @@ services:
                 - 'App\Form\Service\ParticipantTransportationOutboundFieldHandler'
                 - 'App\Form\Service\ParticipantTransportationInboundFieldHandler'
                 - 'App\Form\Service\ParticipantPickupFieldHandler'
+                - 'App\Form\Service\ParticipantDropOffFieldHandler'
                 - 'App\Form\Service\ParticipantParkingFieldHandler'
                 - 'App\Form\Service\ParticipantRentalInsuranceFieldHandler'
                 - 'App\Form\Service\ParticipantLicensePlateFieldHandler'
@@ -121,7 +156,41 @@ services:
                 - '@App\Form\Service\ParticipantPurchaseVoucherFieldHandler'
                 - '@App\Form\Service\ParticipantPromoVoucherFieldHandler'
 
-    App\Service\CmsDataService:
+    # Booking Status Rules
+    App\BusProNet\Service\StatusRule\ChaperonServiceStatusRule: ~
+
+    # Booking Status Rule Registry
+    App\BusProNet\Service\BookingStatusRuleRegistry:
+        arguments:
+            $rules:
+                - '@App\BusProNet\Service\StatusRule\ChaperonServiceStatusRule'
+
+    App\Service\CmsDataProvider:
       arguments:
         $httpClient: '@typo3.client'
         $apiKey: 'AbcAbc123'# dummy key, not yet implemented
+
+    App\Logger\RequestIdProcessor:
+        tags:
+            - { name: monolog.processor }
+
+    App\Service\NewsletterManager:
+        arguments:
+            $newsletterConfirmationTtlHours: '%newsletter_confirmation_ttl_hours%'
+
+    App\Service\DomainConfigProvider:
+        arguments:
+            $domainConfig: '%domain_config%'
+
+    App\Email\Mailer:
+        arguments:
+            $defaults:
+                from: '%default_email_from%'
+                to: '%default_email_to%'
+
+    App\Service\MailjetApiClient:
+        arguments:
+            $mailjetApiKey: '%env(default::MAILJET_API_KEY)%'
+            $mailjetApiSecret: '%env(default::MAILJET_API_SECRET)%'
+            $mailjetApiBaseUrl: '%env(default::MAILJET_API_BASE_URL)%'
+            $mailjetNewsletterListId: '%env(default::MAILJET_NEWSLETTER_LIST_ID)%'

config/services_dev.yaml

@@ -0,0 +1,19 @@
+parameters:
+  # domain mapping for theme, gtm id and cmp url
+  domain_config:
+    myep.ddev.site:
+      theme: base
+      gtm_id: GTM-56LWRF
+      cmp_url: https://consent.cookiefirst.com/sites/my.ep-reisen.de-28eabc35-7085-4d8f-b450-522bd1a5247c/consent.js
+    myswb.ddev.site:
+      theme: sbw
+      gtm_id: GTM-MS2C8CH
+      cmp_url: https://consent.cookiefirst.com/sites/my.ski-boarderweek.de-d3641c34-8183-4b8d-b56e-c052e7a9223e/consent.js
+    myser.ddev.site:
+      theme: ser
+      gtm_id: GTM-MNKDKL9
+      cmp_url: https://consent.cookiefirst.com/sites/my.semesterende-skireisen.de-c9b3422d-eb62-4ce4-b8f7-91e9b509e26f/consent.js
+    mysnz.ddev.site:
+      theme: snz
+      gtm_id: GTM-M96CKL
+      cmp_url: https://consent.cookiefirst.com/sites/my.snowzone.net-8e6aea0c-7d93-42a0-a822-29fff2aa5613/consent.js

deploy.php

@@ -17,7 +17,6 @@ add('shared_dirs', [
 
 add('shared_files', [
     'public/.htaccess',
-    '.env.local.php',
 ]);
 
 set('keep_releases', 3);
@@ -33,6 +32,7 @@ $rsyncOptions = [
         '.ddev',
         '.git',
         '.github',
+        '.jj',
         'node_modules',
         '.editorconfig',
         '.env.dev.local',
@@ -46,14 +46,17 @@ $rsyncOptions = [
         '.phpunit.result.cache',
         'config/secret/',
         'CLAUDE.md',
+        'cypress*',
         'deploy.php',
+        'docs',
         'package.json',
         'package-lock.json',
         '*.http',
-        'http-client.private.env.json',
+        'http-client*.json',
         'postcss.config.js',
         'phpunit.xml.dist',
         'public/.htaccess',
+        'ray.php',
         'tailwind.config.js',
         'webpack.config.js',
         'bin/.phpunit',
@@ -74,31 +77,31 @@ $rsyncOptions = [
 ];
 
 host('prod')
-    ->setHostname('92.205.212.39')
-    ->setRemoteUser('ssh-53857-root')
+    ->setHostname('185.243.135.29')
+    ->setRemoteUser('p704161')
     ->setForwardAgent(true)
     ->setSshMultiplexing(true)
-    ->setDeployPath('/kunden/tiefschnee.de/myep')
-    ->set('writable_mode', 'chmod')
-    ->set('http_user', 'ssh-53857-root')
-    ->set('bin/php', '/usr/bin/php82')
-    ->set('rsync_src', __DIR__)
-    ->set('rsync', $rsyncOptions)
-    ->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{release_or_current_path}}/public/ --web-url=https://my.ep-reisen.de')
-;
-
-host('staging')
-    ->setHostname('185.243.132.170')
-    ->setRemoteUser('p546473')
-    ->setForwardAgent(true)
-    ->setSshMultiplexing(true)
-    ->setDeployPath('/home/www/p546473/html/myep')
+    ->setDeployPath('/home/www/p704161/html/myep')
     ->set('writable_mode', 'chmod')
+    ->set('http_user', 'p704161')
     ->set('bin/php', '/usr/local/bin/php')
     ->set('rsync_src', __DIR__)
     ->set('rsync', $rsyncOptions)
-    ->set('keep_releases', 5)
-    ->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{release_or_current_path}}/public/ --web-url=https://myep.dreipunktnull.net')
+    ->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{current_path}}/public/ --web-url=https://my.ep-reisen.de')
+;
+
+host('staging')
+    ->setHostname('185.243.135.29')
+    ->setRemoteUser('p704161')
+    ->setForwardAgent(true)
+    ->setSshMultiplexing(true)
+    ->setDeployPath('/home/www/p704161/html/myep-staging')
+    ->set('writable_mode', 'chmod')
+    ->set('http_user', 'p704161')
+    ->set('bin/php', '/usr/local/bin/php')
+    ->set('rsync_src', __DIR__)
+    ->set('rsync', $rsyncOptions)
+    ->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{current_path}}/public/ --web-url=https://my.ep-reisen.net')
 ;
 
 task('deploy', [
@@ -110,14 +113,15 @@ task('deploy', [
     'rsync',
     'deploy:shared',
     'deploy:writable',
+    'deploy:cache:clear',
     'database:migrate',
-    'deploy:publish',
     'cachetool:clear:opcache',
+    'deploy:publish',
     'deploy:stop-workers',
 ]);
 
 task('deploy:assets', function () {
-    runLocally('npm i && npm run build');
+    runLocally('npm ci && npm run build');
 });
 
 task('deploy:stop-workers', function () {

docs/SYMFONY_7.4_UPGRADE_PLAN.md

@@ -1,9 +1,9 @@
 # Symfony 7.4 Upgrade Plan
 
 **Project:** MyEP Next Booking
-**Current Version:** Symfony 6.4.31
+**Current Version:** Symfony 6.4.x (6.4.33)
 **Target Version:** Symfony 7.4 (LTS)
-**Date:** 2026-01-05
+**Date:** 2026-02-23
 **Status:** Ready for Upgrade
 
 ---
@@ -18,17 +18,16 @@ The MyEP Next Booking application is well-positioned for a Symfony 7.4 upgrade.
 
 **Key Facts:**
 - Symfony 7.4 was released on November 27, 2025
-- Requires PHP 8.2.0+ (current: PHP 8.2.29)
+- Requires PHP 8.2.0+ (current: PHP 8.3.30)
 - LTS version with bug fixes until November 2028, security fixes until November 2029
 - Symfony 8.0 = Symfony 7.4 minus deprecations (same features, PHP 8.4 required)
 
 **Pre-Upgrade Status:**
-- PHP version: 8.2.29 (compatible)
+- PHP version: 8.3.30 (compatible; Symfony 7.4 requires 8.2+)
 - OAuth2 Server Bundle: 1.1.0 (compatible)
 - Stimulus Bundle: 2.32.0 (compatible)
-- KnpMenuBundle: Removed (no longer in use)
 - Doctrine ORM: 3.6.0 (compatible)
-- All 312 tests passing
+- All 433 tests passing
 - Email validation mode: Configured (html5)
 - 18 test-only deprecation warnings (cosmetic, do not affect runtime)
 
@@ -49,19 +48,14 @@ The previous upgrade plan (dated 2025-12-06) has been updated. All pre-upgrade t
 | Email validator "loose" mode deprecation | Needs fix | **Completed** (validator.yaml configured) |
 | Failing test in BookingDataProcessorTest | Unrelated to upgrade | **Resolved** (test now passes) |
 
-### Items No Longer Relevant
-| Item | Reason |
-|------|--------|
-| KnpMenuBundle upgrade | **Bundle removed from project** |
-
 ---
 
 ## Current State Analysis
 
 ### PHP Version Compatibility
 
-- **Current Runtime:** PHP 8.2.29
-- **Composer Platform:** PHP 8.2.28
+- **Current Runtime:** PHP 8.3.30
+- **Composer Platform:** PHP 8.3.30
 - **Symfony 7.4 Required:** PHP 8.2.0+
 - **Status:** Compatible
 
@@ -81,6 +75,11 @@ All 33 Symfony packages currently at 6.4.x need version constraint updates to 7.
 | `symfony/webpack-encore-bundle` | 2.4.0 | Yes |
 | `symfony/monolog-bundle` | 3.11.0 | Yes |
 | `zenstruck/schedule-bundle` | 1.9.0 | Yes |
+| `league/flysystem-bundle` | 3.6.1 | Yes |
+| `league/flysystem-sftp-v3` | 3.30.0 | Yes |
+| `nelexa/zip` | 4.0.2 | Yes (verify post-upgrade) |
+| `spatie/crypto` | 2.1.1 | Yes |
+| `easycorp/easyadmin-bundle` | 4.29.1 (^4.27) | Yes |
 
 ### Code Quality Assessment
 
@@ -124,7 +123,7 @@ All Email constraints in the codebase also explicitly use `mode: 'strict'`:
 **Impact:** These warnings are cosmetic and do not affect:
 - Runtime behavior (all Email constraints use explicit `mode: 'strict'`)
 - Symfony 7.4 compatibility (no code changes needed)
-- Test results (all 312 tests pass)
+- Test results (all 433 tests pass)
 
 **Note:** Warnings can be silenced with `SYMFONY_DEPRECATIONS_HELPER=disabled` if desired.
 
@@ -182,12 +181,16 @@ Update all packages from `6.4.*` to `7.4.*`:
     "symfony/browser-kit": "7.4.*",
     "symfony/css-selector": "7.4.*",
     "symfony/debug-bundle": "7.4.*",
+    "symfony/maker-bundle": "^1.0",
+    "symfony/phpunit-bridge": "7.4.*",
     "symfony/stopwatch": "7.4.*",
     "symfony/web-profiler-bundle": "7.4.*"
   }
 }
 ```
 
+Keep `symfony/maker-bundle` at `^1.0` (compatible with Symfony 7.4).
+
 ### 2. Update Symfony Flex Configuration
 
 **File:** `composer.json`
@@ -252,6 +255,7 @@ Deprecations accumulated in Symfony 7.1-7.4 will need review:
 1. **Update composer.json**
    - Update all Symfony package constraints to `7.4.*`
    - Update `extra.symfony.require` to `"7.4.*"`
+   - Consider tightening `php` to `>=8.2` (Symfony 7.4 requires 8.2+; optional if already on 8.3)
 
 2. **Run Composer Update**
    ```bash
@@ -305,6 +309,7 @@ Deprecations accumulated in Symfony 7.1-7.4 will need review:
    - [ ] User registration
    - [ ] Password reset
    - [ ] Personal data management
+   - [ ] EasyAdmin CRUD / admin panels
 
 4. **Check Symfony Profiler**
    - Review deprecation warnings (should be minimal)
@@ -320,6 +325,10 @@ Deprecations accumulated in Symfony 7.1-7.4 will need review:
    - Verify Toastify notifications
    - Check TailwindCSS compilation
 
+6. **Verify ZIP File Functionality**
+   - Test any features using `nelexa/zip` (package last updated 2022)
+   - Verify document generation and downloads work correctly
+
 ### Phase 4: Bug Fixes (0-2 hours)
 
 Address any issues discovered during testing:
@@ -386,7 +395,7 @@ ddev exec vendor/bin/dep rollback production
 ## Testing Checklist
 
 ### Unit Tests
-- [ ] All PHPUnit tests pass (312 tests)
+- [ ] All PHPUnit tests pass (433 tests)
 - [ ] No new deprecation warnings
 - [ ] Code coverage maintained
 
@@ -442,7 +451,7 @@ Symfony 8.0 was released alongside 7.4 (November 2025) with identical features b
 
 ## Success Criteria
 
-- [ ] All PHPUnit tests pass (312 tests)
+- [ ] All PHPUnit tests pass (433 tests)
 - [ ] No deprecation warnings in Symfony Profiler
 - [ ] All critical user flows functional
 - [ ] OAuth2 authentication working
@@ -469,7 +478,7 @@ Symfony 8.0 was released alongside 7.4 (November 2025) with identical features b
 
 ---
 
-**Document Version:** 5.0
-**Previous Version:** 4.0 (dated 2025-12-06)
-**Last Updated:** 2026-01-05
-**Status:** Ready for Symfony 7.4 Upgrade
+**Document Version:** 7.0
+**Previous Version:** 6.0 (dated 2026-01-09)
+**Last Updated:** 2026-02-23
+**Status:** Ready for Symfony 7.4 Upgrade (updated for current project state)

docs/booking-flow.md

@@ -0,0 +1,196 @@
+# Booking Flow Reference
+
+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.
+
+---
+
+## Shared Concepts
+
+### `BookingDto`
+
+The central data object for both flows. Holds room selections, participants, payment method, and travel reference. Lives in the HTTP session between requests. Has two modes: `MODE_CREATE` and `MODE_EDIT`.
+
+### `BookingSessionManager`
+
+Owns all reads and writes to session-stored `BookingDto` instances. Also manages the baseline room snapshot used for change detection in the create flow.
+
+### `BookingCreateContextFactory`
+
+Assembles the view model (`BookingCreateContext`) passed to create-flow templates. Handles room grouping (by-pax vs. by-room) and wires summary sidebar data.
+
+---
+
+## Create Flow
+
+```
+Step 1 (room selection)
+  → Step 2 (participants)
+    → Step 2 sub-form (per-participant, HTMX)
+  → Step 3 (payment + API pre-validation)
+  → Step 4 (confirmation + final submission)
+  → Success
+```
+
+### Entry / Bootstrap
+
+`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
+
+**Controller:** `Create/Step1Controller`  
+**Route:** `GET|POST /bookings/create/rooms`
+
+1. Load or create DTO via `getOrCreateBookingCreateDto()`
+2. `BookingSessionManager::getOrCreateBaselineSnapshot()` — saves the current room selection as a comparison point for change detection
+3. Render `BookingCreateStep1Type` form
+4. On submit:
+   - If room selection changed from baseline: `BookingDto::resetParticipantAssignments()` — clears stale assignments
+   - `BookingConfigurator::updateBookingStatusFromRoomSelection()` — may switch booking to inquiry mode if capacity constraints require it
+   - `BookingSessionManager::saveBookingDto()`, advance `currentStep` to 2
+   - `BookingSessionManager::clearBaselineSnapshot()`
+   - Redirect to Step 2
+
+HTMX refresh (`/bookings/create/refresh`): processes the form without validation and returns updated room selection + summary sidebar blocks.
+
+### Step 2 — Participants (Card Overview)
+
+**Controller:** `Create/Step2Controller`  
+**Route:** `GET|POST /bookings/create/participants`
+
+1. Load DTO from session (or redirect to Step 1 if missing)
+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.
+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)
+6. `RoomAssigner::assignRoomsIfNeeded()` — auto-assigns participants to rooms
+7. `BookingConfigurator::preselectDefaultServices()` — selects mandatory and auto-book services for all participants
+8. `BookingConfigurator::applyCreateBookingStatusRules()` — re-evaluates booking status (book / inquiry / not-bookable)
+9. `BookingSessionManager::saveBookingDto()`
+10. On form submit (all participants valid): advance to Step 3, redirect
+
+### Step 2 — Individual Participant Form (HTMX)
+
+**Controller:** `Create/Step2ParticipantController`  
+**Routes:** `GET|POST /bookings/create/participants/{index}` and `/participants/{index}/refresh`
+
+Each participant card lazy-loads its form via HTMX. The controller:
+
+1. Verifies the participant slot exists
+2. Refreshes availability
+3. Handles dummy data fill (`ParticipantDataPrefiller::isDummyDataFillRequested()` / `fillDummyParticipant()`)
+4. On submit: re-applies status rules, saves to session, redirects to card overview
+5. `ParticipantFormSupport` is used for form creation options and notification draining
+
+### Step 3 — Payment + API Pre-Validation
+
+**Controller:** `Create/Step3Controller`  
+**Route:** `GET|POST /bookings/create/payment`
+
+1. Load DTO from session
+2. `BookingConfigurator::applyCreateBookingStatusRules()`
+3. On submit:
+   - `ApiClient::createBookingInquiry()` — submits booking to API for validation without committing it
+   - If inquiry fails with "nicht möglich" + "Anfrage" in message: auto-switch to inquiry mode, advance to Step 4
+   - If inquiry fails otherwise: show error, stay on step
+   - Price verification: `BookingPriceCalculator::calculateGrandTotal()` is compared against the API response total (accounting for promotional/goodwill voucher discounts and API-applied group discounts). Mismatch triggers `BookingPriceMismatchAnalyzer` for detailed logging.
+   - On success: advance `currentStep` to 4, redirect
+
+### Step 4 — Confirmation + Final Submission
+
+**Controller:** `Create/Step4Controller`  
+**Route:** `GET|POST /bookings/create/confirmation`
+
+1. Load DTO from session
+2. Newsletter subscription check for opt-in display
+3. On submit:
+   - `BookingConfigurator::applyCreateBookingStatusRules()`
+   - `ApiClient::createBooking()` — final booking submission (already validated in Step 3)
+   - Newsletter double-opt-in if selected
+   - On success: store booking number + total in flash (for analytics), clear travel data cache, `BookingSessionManager::clearBookingDto()`, redirect to success page
+
+---
+
+## Edit Flow
+
+```
+Entry (start)
+  → Load (session or API + draft restore)
+    → Participant sub-forms (HTMX, per-participant)
+  → Submission
+```
+
+### Entry
+
+**Controller:** `Edit/IndexController::start()`  
+**Route:** `GET /bookings/{id}/edit/start`
+
+Clears any existing session DTO for edit mode and invalidates the API booking cache, then redirects to the edit page. This ensures a clean load from API on every intentional re-entry.
+
+### Load
+
+**Controller:** `Edit/IndexController::index()`  
+**Route:** `GET|POST /bookings/{id}/edit`
+
+Loading is delegated entirely to `BookingEditDataLoader::loadFormData()`:
+
+**If session DTO exists and matches the requested booking ID:**
+- `TravelDataProvider::enrichWithFreshAvailabilities()` — refreshes room availability
+- `TravelDataProvider::getMutabilityData()` + `patchMutability()` — applies cached mutability state to DTO
+
+**If no session DTO (first load or after `start`):**
+
+`initializeFromApi()`:
+1. `fetchBookingData()` — `ApiClient::getBooking()` with 5-minute cache (tagged by user ID for bulk invalidation)
+2. `TravelDataProvider::getTravelData()` — loads travel data (XML or snapshot)
+3. `TravelDataProvider::getAvailabilityData(forceRefresh: true)` + `patchAvailabilities()` — force-refreshes availability at edit start, populates cache for subsequent loads within the session
+4. `TravelDataProvider::getMutabilityData(cached: true)` + `patchMutability()` — applies which service categories are currently editable
+5. `BookingDataProcessor::createBookingDtoFromBooking()` — hydrates `BookingDto` from API booking entity
+6. Agency code resolved via `AgencyLoader` (used by field state conditions)
+7. `BookingChangeTracker::generateFingerprint()` — sets `originalFingerprint` on DTO **before** draft is applied, so dirty detection compares against original API data
+8. `BookingEditDraftManager::findDraft()` + `applyDraftToDto()` — if draft exists, merges user edits on top of fresh API data. Sets `draftWasRestored = true` if successful.
+9. `BookingSessionManager::saveBookingDto()`
+
+Back in the controller: shows "draft restored" flash if applicable, fetches booking data for surcharge/status display, renders the card overview with `BookingEditContextFactory::createOverviewContext()`.
+
+### Individual Participant Form (HTMX)
+
+**Controller:** `Edit/ParticipantController`  
+**Routes:** `GET|POST /bookings/{id}/edit/participants/{index}` and `/{index}/refresh`
+
+Per-participant forms are lazy-loaded, matching the create flow pattern.
+
+1. `BookingEditContextFactory::prepareBookingDto()` — refreshes availabilities on the DTO travel object
+2. `ParticipantFormSupport` — form creation, notification draining
+3. On submit: `BookingSessionManager::saveBookingDto()` + `BookingEditDraftManager::saveDraft()` — persists participant edits to both session and draft
+
+### Submission
+
+**Service:** `BookingEditSubmitter::handleSubmission()`  
+Called from `Edit/IndexController` on valid form submit.
+
+1. Invalidate API cache, fetch fresh booking data
+2. Force-refresh mutability data (`TravelDataProvider::getMutabilityData(forceRefresh: true)`) and patch DTO travel
+3. `BookingEditSubmitGuard::reconcileImmutableCategories()` — reverts any DTO fields that have become immutable since the session was loaded. Shows flash if anything was reverted.
+4. `ApiClient::updateBooking()` — submit
+5. On success: invalidate cache again, `BookingSessionManager::clearBookingDto()`, `BookingEditDraftManager::deleteDraft()`
+
+### Other Edit Routes
+
+| Route | Action |
+|-------|--------|
+| `GET /bookings/{id}/edit/reload` | Shows confirmation modal |
+| `POST /bookings/{id}/edit/reload` | Clears session + **deletes draft**, reloads from API |
+| `GET /bookings/{id}/edit/cancel` | Clears session, **preserves draft**, redirects to booking list |
+
+The distinction between reload and cancel is intentional: cancel keeps the draft so the user can return to their changes later; reload discards everything.
+
+---
+
+## Key Invariants
+
+- `currentStep` on the DTO gates forward navigation in create mode; controllers redirect to the current step if a higher step is requested directly.
+- The original fingerprint is set before draft application in edit mode. Dirty detection (`BookingChangeTracker::isDirty()`) always compares the live session DTO against the original API state, not against the draft.
+- Mutability is always patched from fresh or cached data before rendering. The DTO travel object is the authoritative source of which fields are editable at render time.
+- Drafts survive cancel but not reload, and are deleted on successful submission.

docs/service-simplification-plan.md

@@ -0,0 +1,122 @@
+# Service Simplification Plan
+
+Status: active
+Last updated: 2026-04-13
+
+## Purpose
+
+This document tracks the next pass of service simplification work. The goal is to reduce orchestration density, make the booking flow easier to follow for a human reader, and keep responsibilities aligned with the actual boundaries in the code.
+
+The emphasis is not on deleting services for its own sake. The emphasis is on:
+- keeping one clear owner for each meaningful boundary
+- removing thin wrappers and pass-through helpers
+- avoiding services that mostly shuffle data between layers
+- keeping presentation concerns out of calculation and orchestration code
+
+## Current Read
+
+The codebase is already in a better place than it was at the start of the refactor, but a few services still carry more than one responsibility:
+
+- `BookingService` now mostly covers booking bootstrap, service preselection, and booking status rules.
+- `BookingParticipantCountService` was removed — its logic lives as a private method in the one controller that needed it (`Step2Controller`).
+- `BookingRoomSelectionService` was removed — its logic lives as a private method in `BookingCreateContextFactory`.
+- `BookingSummaryParticipantCountService` was removed — its logic lives as a private method in `BookingSummaryDataService`.
+- `ParticipantPrepopulationService` now owns applicant prefill plus the create-mode dummy-data shortcut.
+- `BookingEditParticipantContextFactory` now prepares the edit participant page context directly, replacing the older pass-through participant form service.
+- `BookingPriceCalculatorService` is focused on pricing, but it still sits close to display-oriented behavior in adjacent code paths.
+- `TravelDataService` remains broad and is likely the next larger boundary after booking orchestration is reduced.
+
+One registry stands out as a real orchestration boundary and should be left alone for now:
+- `ParticipantFieldHandlerRegistry`
+
+It is not just a lookup table. It owns execution order, edit-mode mutability gating, and synchronization of submitted form data back into the DTO state.
+
+## Next Pass
+
+### 1. Keep pricing calculation focused
+
+Primary goal: keep pricing code about pricing, not rendering.
+
+Concrete next steps:
+- keep `BookingPriceCalculatorService` as the pricing boundary
+- continue removing display formatting from pricing code paths
+- keep any remaining view-specific formatting in the presentation layer or a dedicated UI helper
+- avoid introducing another service that only formats values already known to the view
+
+Decision rule:
+- if a value is only needed for display, prefer exposing the raw numeric/domain value and formatting it as close to the UI as possible
+
+### 2. Leave the field-handler registry in place
+
+Primary goal: avoid unnecessary churn in a class that is already a meaningful orchestration layer.
+
+Concrete next steps:
+- do not refactor `ParticipantFieldHandlerRegistry` in this pass
+- revisit only if a later change can split ordering, mutability, and synchronization into clear collaborators without making the flow harder to trace
+
+Decision rule:
+- if a registry owns actual workflow behavior, treat it as a boundary rather than a smell
+
+## Follow-Up Queue
+
+After the booking service pass, the next likely candidates are:
+
+### `TravelDataService`
+
+This is the largest broad service still in the codebase. It likely needs a later pass if the application should become easier to follow end to end.
+
+Likely directions:
+- separate runtime travel loading from cache/snapshot maintenance if the public API still feels too wide
+- keep the read path explicit and avoid hiding maintenance work behind one large method surface
+
+### `BookingPriceCalculatorService`
+
+This service should stay focused on pricing logic, but it may still have room for further internal cleanup if more display or transport aggregation concerns surface.
+
+Likely directions:
+- keep calculation responsibilities together
+- avoid dragging presentation behavior back into the calculator
+- split only if a sub-boundary becomes obvious and reusable
+
+### `ParticipantFieldHandlerRegistry`
+
+This stays on the list only as a future optional refactor, not as an immediate target.
+
+Likely directions, only if justified later:
+- isolate ordering/sorting logic if it becomes independently meaningful
+- split synchronization code if a clearer DTO/form boundary emerges
+- otherwise leave it as the central orchestration point for participant field processing
+
+## Current Notes
+
+- `templates/booking/_summary_travel_info.html.twig` already renders the summary participant count directly, so the remaining work here is naming and contract clarity rather than Twig branching.
+- The summary count still needs a clear name if the code should distinguish the display-oriented count from the canonical participant total in the DTO/service layer.
+- `ParticipantFormSupportService` was reviewed and kept: it is shared between two controllers (`Step2ParticipantController` and `Edit/ParticipantController`) with real shared logic, not just delegation.
+
+## Progress Tracker
+
+| Item | Status | Notes |
+|------|--------|-------|
+| Participant card DTO cleanup | Done | Card data now uses typed DTOs instead of nested array payloads |
+| Room label formatting cleanup | Done | Pricing labels now have a dedicated presentation helper |
+| Booking service split | Done | Session lifecycle, hydration, baseline snapshot, return URL handling, room grouping, and participant count shaping moved out of `BookingService` |
+| Dummy prefill extraction | Done | Moved into `ParticipantPrepopulationService` |
+| Micro-service consolidation | Done | `BookingRoomSelectionService`, `BookingParticipantCountService`, `BookingSummaryParticipantCountService` inlined into their single callers |
+| Pricing service review | Pending | Keep focused on calculation, not rendering |
+| Travel data service review | Pending | Broad boundary, likely later pass |
+| Participant field registry review | Deferred | Real orchestration boundary, intentionally left alone for now |
+
+## Acceptance Criteria
+
+The next booking-service pass is only worth keeping if it:
+- reduces the number of unrelated responsibilities in `BookingService`
+- makes the booking flow easier to trace from controller to session/DTO state
+- preserves existing booking behavior and test coverage
+- does not replace one large service with several generic "manager" classes
+
+## Working Agreement
+
+- Update this document as decisions are made.
+- Record rejected simplification ideas here with a short reason.
+- Keep the plan aligned with actual code, not with an abstract architecture ideal.
+- If a future simplification does not clearly reduce cognitive load, do not add it.

http-client.env.json

@@ -7,8 +7,8 @@
           "Grant Type": "Authorization Code",
           "Client ID": "{{oauth2_client_id}}",
           "Client Secret": "{{oauth2_client_secret}}",
-          "Auth URL": "https://myep-next-booking.ddev.site/authorize",
-          "Token URL": "https://myep-next-booking.ddev.site/token",
+          "Auth URL": "https://myep.ddev.site/authorize",
+          "Token URL": "https://myep.ddev.site/token",
           "Redirect URL": "https://myep-team.ddev.site/auth/check",
           "Scope": "email"
         },
@@ -17,8 +17,8 @@
           "Grant Type": "Authorization Code",
           "Client ID": "{{oauth2_client_id}}",
           "Client Secret": "{{oauth2_client_secret}}",
-          "Auth URL": "https://myep-next-booking.ddev.site/authorize",
-          "Token URL": "https://myep-next-booking.ddev.site/token",
+          "Auth URL": "https://myep.ddev.site/authorize",
+          "Token URL": "https://myep.ddev.site/token",
           "Redirect URL": "https://myep-team.ddev.site/auth/check",
           "Scope": "email profile"
         },
@@ -27,8 +27,43 @@
           "Grant Type": "Client Credentials",
           "Client ID": "{{oauth2_api_client_id}}",
           "Client Secret": "{{oauth2_api_client_secret}}",
-          "Auth URL": "https://myep-next-booking.ddev.site/authorize",
-          "Token URL": "https://myep-next-booking.ddev.site/token",
+          "Auth URL": "https://myep.ddev.site/authorize",
+          "Token URL": "https://myep.ddev.site/token",
+          "Scope": "api"
+        }
+      }
+    }
+  },
+  "staging": {
+    "Security": {
+      "Auth": {
+        "oauth2_email": {
+          "Type": "OAuth2",
+          "Grant Type": "Authorization Code",
+          "Client ID": "{{oauth2_client_id}}",
+          "Client Secret": "{{oauth2_client_secret}}",
+          "Auth URL": "https://my.ep-reisen.net/authorize",
+          "Token URL": "https://my.ep-reisen.net/token",
+          "Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
+          "Scope": "email"
+        },
+        "oauth2_profile": {
+          "Type": "OAuth2",
+          "Grant Type": "Authorization Code",
+          "Client ID": "{{oauth2_client_id}}",
+          "Client Secret": "{{oauth2_client_secret}}",
+          "Auth URL": "https://my.ep-reisen.net/authorize",
+          "Token URL": "https://my.ep-reisen.net/token",
+          "Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
+          "Scope": "email profile"
+        },
+        "oauth2_api": {
+          "Type": "OAuth2",
+          "Grant Type": "Client Credentials",
+          "Client ID": "{{oauth2_api_client_id}}",
+          "Client Secret": "{{oauth2_api_client_secret}}",
+          "Auth URL": "https://my.ep-reisen.net/authorize",
+          "Token URL": "https://my.ep-reisen.net/token",
           "Scope": "api"
         }
       }
@@ -42,8 +77,8 @@
           "Grant Type": "Authorization Code",
           "Client ID": "{{oauth2_client_id}}",
           "Client Secret": "{{oauth2_client_secret}}",
-          "Auth URL": "https://myep.ep-reisen.de/authorize",
-          "Token URL": "https://myep.ep-reisen.de/token",
+          "Auth URL": "https://my.ep-reisen.de/authorize",
+          "Token URL": "https://my.ep-reisen.de/token",
           "Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
           "Scope": "email"
         },
@@ -52,8 +87,8 @@
           "Grant Type": "Authorization Code",
           "Client ID": "{{oauth2_client_id}}",
           "Client Secret": "{{oauth2_client_secret}}",
-          "Auth URL": "https://myep.ep-reisen.de/authorize",
-          "Token URL": "https://myep.ep-reisen.de/token",
+          "Auth URL": "https://my.ep-reisen.de/authorize",
+          "Token URL": "https://my.ep-reisen.de/token",
           "Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
           "Scope": "email profile"
         },
@@ -62,8 +97,8 @@
           "Grant Type": "Client Credentials",
           "Client ID": "{{oauth2_api_client_id}}",
           "Client Secret": "{{oauth2_api_client_secret}}",
-          "Auth URL": "https://myep.ep-reisen.de/authorize",
-          "Token URL": "https://myep.ep-reisen.de/token",
+          "Auth URL": "https://my.ep-reisen.de/authorize",
+          "Token URL": "https://my.ep-reisen.de/token",
           "Scope": "api"
         }
       }

mailjet.http

@@ -0,0 +1,191 @@
+###
+# Mailjet API test requests for IntelliJ HTTP Client
+#
+# 1) Fill in variables below (or move them to http-client.private.env.json).
+# 2) Set `mailjet_api_key` and `mailjet_api_secret` in your env file.
+#    IntelliJ HTTP Client will inject them into the Authorization header below.
+#
+# Required variables:
+# - mailjet_base_url (example: https://api.mailjet.com/v3/REST)
+# - mailjet_api_key
+# - mailjet_api_secret
+# - mailjet_contact_email
+# - mailjet_list_id
+#
+# @no-cookie-jar
+
+### Mailjet health check (authenticated)
+# @no-cookie-jar
+GET {{mailjet_base_url}}/apikey
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+
+### Find contact by email
+# @no-cookie-jar
+GET {{mailjet_base_url}}/contact?Email={{mailjet_contact_email}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+> {%
+  if (response.body && response.body.Data && response.body.Data.length > 0) {
+    client.global.set("contact_id", String(response.body.Data[0].ID));
+  }
+%}
+
+
+### Create contact (run if not found)
+# @no-cookie-jar
+POST {{mailjet_base_url}}/contact
+Accept: application/json
+Content-Type: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+{
+  "Email": "{{mailjet_contact_email}}",
+  "IsExcludedFromCampaigns": false
+}
+
+> {%
+  if (response.body && response.body.Data && response.body.Data.length > 0) {
+    client.global.set("contact_id", String(response.body.Data[0].ID));
+  }
+%}
+
+
+### Get contact by ID (after find/create)
+# @no-cookie-jar
+GET {{mailjet_base_url}}/contact/{{contact_id}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+
+### Mark contact as subscribed (opt-in)
+# @no-cookie-jar
+PUT {{mailjet_base_url}}/contact/{{contact_id}}
+Accept: application/json
+Content-Type: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+{
+  "IsExcludedFromCampaigns": false
+}
+
+
+### Mark contact as unsubscribed (opt-out)
+# @no-cookie-jar
+PUT {{mailjet_base_url}}/contact/{{contact_id}}
+Accept: application/json
+Content-Type: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+{
+  "IsExcludedFromCampaigns": true
+}
+
+
+### Get newsletter list by ID
+# @no-cookie-jar
+GET {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+
+### List all available contact lists
+# @no-cookie-jar
+GET {{mailjet_base_url}}/contactslist?Limit=1000
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+
+### Check list recipient status (before actions)
+# @no-cookie-jar
+GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+> {%
+  if (response.body && response.body.Data && response.body.Data.length > 0) {
+    client.global.set("listrecipient_id", String(response.body.Data[0].ID));
+  }
+%}
+
+
+### Subscribe to list (addnoforce)
+# @no-cookie-jar
+POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
+Accept: application/json
+Content-Type: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+{
+  "Action": "addnoforce",
+  "Email": "{{mailjet_contact_email}}"
+}
+
+
+### Verify list recipient after addnoforce
+# @no-cookie-jar
+GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+
+### Unsubscribe from list (unsub)
+# @no-cookie-jar
+POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
+Accept: application/json
+Content-Type: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+{
+  "Action": "unsub",
+  "Email": "{{mailjet_contact_email}}"
+}
+
+
+### Verify list recipient after unsub
+# @no-cookie-jar
+GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+
+### Re-subscribe attempt with addnoforce (expected to keep unsubscribed state)
+# @no-cookie-jar
+POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
+Accept: application/json
+Content-Type: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+{
+  "Action": "addnoforce",
+  "Email": "{{mailjet_contact_email}}"
+}
+
+
+### Verify list recipient after addnoforce re-subscribe attempt
+# @no-cookie-jar
+GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+
+### Re-subscribe with addforce (expected to re-subscribe)
+# @no-cookie-jar
+POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
+Accept: application/json
+Content-Type: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
+
+{
+  "Action": "addforce",
+  "Email": "{{mailjet_contact_email}}"
+}
+
+
+### Verify list recipient after addforce
+# @no-cookie-jar
+GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
+Accept: application/json
+Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}

migrations/Version20260106091117.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260106091117 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create booking_edit_draft table for persisting user edits during booking edit flow';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE booking_edit_draft (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, booking_id INT NOT NULL, form_data JSON NOT NULL COMMENT \'(DC2Type:json)\', created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', updated_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_E6548098A76ED395 (user_id), UNIQUE INDEX user_booking_unique (user_id, booking_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE booking_edit_draft ADD CONSTRAINT FK_E6548098A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE booking_edit_draft DROP FOREIGN KEY FK_E6548098A76ED395');
+        $this->addSql('DROP TABLE booking_edit_draft');
+    }
+}

migrations/Version20260109081315.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260109081315 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE booking_edit_draft ADD travel_date DATE NOT NULL COMMENT \'(DC2Type:date_immutable)\'');
+        $this->addSql('CREATE INDEX IDX_DRAFT_TRAVEL_DATE ON booking_edit_draft (travel_date)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP INDEX IDX_DRAFT_TRAVEL_DATE ON booking_edit_draft');
+        $this->addSql('ALTER TABLE booking_edit_draft DROP travel_date');
+    }
+}

migrations/Version20260110105253.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260110105253 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add booking_number column to booking_edit_draft table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE booking_edit_draft ADD booking_number INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE booking_edit_draft DROP booking_number');
+    }
+}

migrations/Version20260113140000.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260113140000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add date_id and hotel_id columns to booking_edit_draft table for export functionality';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE booking_edit_draft ADD date_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE booking_edit_draft ADD hotel_id INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE booking_edit_draft DROP date_id');
+        $this->addSql('ALTER TABLE booking_edit_draft DROP hotel_id');
+    }
+}

migrations/Version20260119174522.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260119174522 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add profile_complete flag to user table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE user ADD profile_complete TINYINT(1) NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE user DROP profile_complete');
+    }
+}

migrations/Version20260318113000.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260318113000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create newsletter_opt_in_confirmation table for double opt-in confirmations';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("CREATE TABLE newsletter_opt_in_confirmation (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(255) NOT NULL, token_hash VARCHAR(64) NOT NULL, expires_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', confirmed_at DATETIME DEFAULT NULL COMMENT '(DC2Type:datetime_immutable)', created_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', UNIQUE INDEX UNIQ_NEWSLETTER_OPT_IN_TOKEN_HASH (token_hash), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB");
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE newsletter_opt_in_confirmation');
+    }
+}

migrations/Version20260320071724.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260320071724 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add error_code column and index to log_entry table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE log_entry ADD error_code VARCHAR(12) DEFAULT NULL');
+        $this->addSql('CREATE INDEX IDX_LOG_ENTRY_ERROR_CODE ON log_entry (error_code)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX IDX_LOG_ENTRY_ERROR_CODE ON log_entry');
+        $this->addSql('ALTER TABLE log_entry DROP error_code');
+    }
+}

migrations/Version20260321120000.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260321120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create travel_snapshot table for DB-primary travel persistence';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE travel_snapshot (id INT AUTO_INCREMENT NOT NULL, date_id INT NOT NULL, hotel_id INT NOT NULL, date_code VARCHAR(64) DEFAULT NULL, label VARCHAR(255) DEFAULT NULL, product_id INT DEFAULT NULL, product_code VARCHAR(64) DEFAULT NULL, hotel_code VARCHAR(64) DEFAULT NULL, hotel_label VARCHAR(255) DEFAULT NULL, date_from DATE DEFAULT NULL COMMENT \'(DC2Type:date_immutable)\', date_to DATE DEFAULT NULL COMMENT \'(DC2Type:date_immutable)\', payload LONGTEXT NOT NULL, payload_hash VARCHAR(64) NOT NULL, captured_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', updated_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', extended_refreshed_at DATETIME DEFAULT NULL COMMENT \'(DC2Type:datetime_immutable)\', UNIQUE INDEX uniq_snapshot_date_hotel (date_id, hotel_id), INDEX idx_snapshot_date_code (date_code), INDEX idx_snapshot_product_id (product_id), INDEX idx_snapshot_date_to (date_to), INDEX idx_snapshot_extended_refreshed_at (extended_refreshed_at), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE travel_snapshot');
+    }
+}

migrations/Version20260323182524.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260323182524 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE booking_edit_draft CHANGE form_data form_data JSON NOT NULL');
+        $this->addSql('ALTER TABLE log_entry CHANGE context context JSON DEFAULT NULL, CHANGE extra extra JSON DEFAULT NULL');
+        $this->addSql('ALTER TABLE newsletter_opt_in_confirmation RENAME INDEX uniq_newsletter_opt_in_token_hash TO UNIQ_70505214B3BC57DA');
+        $this->addSql('ALTER TABLE user CHANGE roles roles JSON NOT NULL, CHANGE hotel_codes hotel_codes JSON NOT NULL');
+        $this->addSql('DROP INDEX IDX_75EA56E0FB7336F0 ON messenger_messages');
+        $this->addSql('DROP INDEX IDX_75EA56E0E3BD61CE ON messenger_messages');
+        $this->addSql('DROP INDEX IDX_75EA56E016BA31DB ON messenger_messages');
+        $this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0E3BD61CE16BA31DBBF396750 ON messenger_messages (queue_name, available_at, delivered_at, id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE newsletter_opt_in_confirmation RENAME INDEX uniq_70505214b3bc57da TO UNIQ_NEWSLETTER_OPT_IN_TOKEN_HASH');
+        $this->addSql('ALTER TABLE user CHANGE roles roles JSON NOT NULL COLLATE `utf8mb4_bin`, CHANGE hotel_codes hotel_codes JSON NOT NULL COLLATE `utf8mb4_bin`');
+        $this->addSql('DROP INDEX IDX_75EA56E0FB7336F0E3BD61CE16BA31DBBF396750 ON messenger_messages');
+        $this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0 ON messenger_messages (queue_name)');
+        $this->addSql('CREATE INDEX IDX_75EA56E0E3BD61CE ON messenger_messages (available_at)');
+        $this->addSql('CREATE INDEX IDX_75EA56E016BA31DB ON messenger_messages (delivered_at)');
+        $this->addSql('ALTER TABLE log_entry CHANGE context context JSON DEFAULT NULL COLLATE `utf8mb4_bin`, CHANGE extra extra JSON DEFAULT NULL COLLATE `utf8mb4_bin`');
+        $this->addSql('ALTER TABLE booking_edit_draft CHANGE form_data form_data JSON NOT NULL COLLATE `utf8mb4_bin`');
+    }
+}

migrations/Version20260324120000.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Changes travel_snapshot.payload from TEXT to LONGTEXT so large
+ * plain JSON snapshot payloads can be stored safely.
+ */
+final class Version20260324120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Change travel_snapshot.payload from TEXT to LONGTEXT for plain JSON snapshot payloads';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE travel_snapshot CHANGE payload payload LONGTEXT NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE travel_snapshot CHANGE payload payload TEXT NOT NULL');
+    }
+}

package.json

@@ -5,7 +5,7 @@
     "@babel/preset-env": "^7.16.0",
     "@hotwired/stimulus": "^3.0.0",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/webpack-encore": "^5.0.0",
+    "@symfony/webpack-encore": "^6.0.0",
     "@tailwindcss/forms": "^0.5.9",
     "@tailwindcss/typography": "^0.5.15",
     "autoprefixer": "^10.4.20",
@@ -20,7 +20,7 @@
     "tippy.js": "^6.3.7",
     "toastify-js": "^1.12.0",
     "webpack": "^5.74.0",
-    "webpack-cli": "^5.1.0",
+    "webpack-cli": "^6.0.1",
     "webpack-notifier": "^1.15.0"
   },
   "license": "WTFPL",

phpstan.dist.neon

@@ -0,0 +1,13 @@
+includes:
+    - vendor/phpstan/phpstan-symfony/extension.neon
+    - vendor/phpstan/phpstan-doctrine/extension.neon
+
+parameters:
+    level: 6
+    paths:
+        - src
+    tmpDir: var/phpstan
+    symfony:
+        containerXmlPath: var/cache/dev/App_KernelDevDebugContainer.xml
+    doctrine:
+        objectManagerLoader: tests/doctrine-object-manager.php

public/icon.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 124 74" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><g><path d="M107,0.3c-36.4,5.5 -81.6,19.1 -81.6,38.2c0,17.7 41.8,13.2 41.8,13.2c0,0 -67,22.3 -67,-7c0,-33.2 84.5,-44.4 106.8,-44.4Z" style="fill:#0084d4;fill-rule:nonzero;"/><path d="M17,73.5c36.4,-5.4 81.6,-19.1 81.6,-38.2c0,-17.7 -41.8,-13.2 -41.8,-13.2c0,0 67,-22.3 67,7c0,33.3 -84.5,44.4 -106.8,44.4Z" style="fill:#f8c62f;fill-rule:nonzero;"/><g><path d="M60.7,34.3l-12.8,4l12.2,0.8l-0.4,-2.4l1,-2.4Z" style="fill:#0084d4;fill-rule:nonzero;"/><path d="M75.9,35.2l-9.2,2.9l-3.5,9.7l-1.7,-11.3l4,-10.7l1.7,7.9l8.7,1.5Z" style="fill:#f8c62f;fill-rule:nonzero;"/></g></g></g></svg>

public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

public/site.webmanifest

@@ -1,6 +0,0 @@
-{
-	"icons": [
-		{ "src": "/icon-192.png", "type": "image/png", "sizes": "192x192" },
-		{ "src": "/icon-512.png", "type": "image/png", "sizes": "512x512" }
-	]
-}

ray.php

@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'host' => 'host.orb.internal',
-    'port' => 23517,
-    'remote_path' => '/var/www/html',
-    'local_path' => '/Users/fromme/Development/Symfony/myep-next-booking',
-];

src/Admin/Field/JsonDataField.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Admin\Field;
+
+use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
+use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
+
+class JsonDataField implements FieldInterface
+{
+    use FieldTrait;
+
+    public static function new(string $propertyName, ?string $label = null): self
+    {
+        return (new self())
+            ->setProperty($propertyName)
+            ->setLabel($label)
+            ->setTemplatePath('admin/field/json.html.twig');
+    }
+}

src/BusProNet/ApiClient.php

@@ -4,39 +4,43 @@ namespace App\BusProNet;
 
 use App\BusProNet\DataProcessor\BookingDataProcessor;
 use App\BusProNet\Exception\ApiClientException;
+use App\BusProNet\Exception\ImmediateConnectionCloseException;
 use App\BusProNet\Exception\ResponseParserException;
+use App\BusProNet\Exception\TimeoutException;
+use App\BusProNet\Model\Agency;
 use App\BusProNet\Model\BaseData;
 use App\BusProNet\Model\Booking;
 use App\BusProNet\Model\BookingResponse;
 use App\BusProNet\Model\BookingUpdate;
-use App\BusProNet\Model\ContactFormResponse;
 use App\BusProNet\Model\CrmAttributes;
+use App\BusProNet\Model\ExtendedServiceAvailabilityResponse;
 use App\BusProNet\Model\Notification;
 use App\BusProNet\Model\PersonalData;
 use App\BusProNet\Model\PromoVoucher;
 use App\BusProNet\Model\PurchaseVoucher;
+use App\BusProNet\Model\RegistrationResponse;
 use App\BusProNet\Model\ServiceAvailabilityResponse;
 use App\BusProNet\Model\Travel;
-use App\BusProNet\Traits\ApiClientTrait;
 use App\BusProNet\XmlParser\ApiResponseParser;
 use App\Form\Model\BookingDto;
 use App\Form\Model\RegistrationDto;
+use App\Service\RequestIdGenerator;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\SerializerInterface;
 
 class ApiClient
 {
-    use ApiClientTrait;
-
     public const TYPE_NOTIFICATION = 'HINWEIS';
     public const TYPE_CUSTOMER_DATA = 'KUNDENKONTO';
     public const TYPE_BASE_DATA_COUNTRIES = 'STAMMLAENDER';
     public const TYPE_MUTABLE_DATA = 'MOEGLICHEAENDERUNGEN';
     public const TYPE_AVAILABILITY = 'VERFUEGBARKEIT';
+    public const TYPE_AVAILABILITY_EXTENDED = 'VERFUEGBARKEIT2';
     public const TYPE_AVAILABILITY_HOTEL = 'VERFUEGBARKEITHOTEL';
     public const TYPE_BOOKING_UPDATE = 'BUCHUNGAENDERUNG';
     public const TYPE_BOOKING = 'BUCHUNG';
@@ -46,14 +50,21 @@ class ApiClient
     public const TYPE_PURCHASE_VOUCHER = 'GUTSCHEINPRUEFUNGEINLOESUNG';
     public const TYPE_PROMO_VOUCHER = 'AKTIONSGUTSCHEIN';
 
+    /** @var array<string, mixed> */
     private array $config;
+    private float $operationStartTime;
+    private int $selectedPort;
+    private int $requestCounter = 0;
 
+    /** @param array<string, mixed> $options */
     public function __construct(
         private readonly SerializerInterface $serializer,
         private readonly ApiResponseParser $responseParser,
         private readonly FilesystemOperator $xmlDump,
         private readonly LoggerInterface $logger,
         private readonly BookingDataProcessor $bookingDataProcessor,
+        private readonly RequestStack $requestStack,
+        private readonly RequestIdGenerator $requestIdGenerator,
         array $options,
     ) {
         $this->config = $this->resolveOptions($options);
@@ -79,21 +90,14 @@ class ApiClient
     /**
      * @throws ApiClientException
      */
-    public function register(RegistrationDto $registrationData): Notification
+    public function register(RegistrationDto $registrationData): Notification|RegistrationResponse
     {
         $data = [
             'user' => $this->config['bpn_username'],
             'key' => $this->createKey($this->config['bpn_username'], $this->config['bpn_password'], static::TYPE_CUSTOMER_DATA),
             'satz' => ['@typ' => static::TYPE_CUSTOMER_DATA],
             'art' => 'Adresse_Neu',
-            'adressdaten' => [
-                'geschlecht' => $registrationData->gender,
-                'vorname' => $registrationData->firstName,
-                'name' => $registrationData->name,
-                'kommunikation' => [
-                    'email' => $registrationData->email,
-                ],
-            ],
+            'adressdaten' => $registrationData->toPayload(),
         ];
 
         return $this->sendRequest(static::TYPE_CUSTOMER_DATA, $data);
@@ -144,13 +148,13 @@ class ApiClient
     public function createAddress(
         PersonalData $personalData,
         bool $debug = false,
-    ): ContactFormResponse|Notification {
+    ): RegistrationResponse|Notification {
         $data = [
             'user' => $this->config['bpn_username'],
             'key' => $this->createKey($this->config['bpn_username'], $this->config['bpn_password'], static::TYPE_CUSTOMER_DATA),
             'satz' => ['@typ' => static::TYPE_CUSTOMER_DATA],
             'art' => 'Adresse_Neu',
-            'adressdaten' => $personalData->toPayload(),
+            'adressdaten' => $personalData->toPayload(false),
             'ohnemailversand' => 'True',
         ];
 
@@ -316,6 +320,21 @@ class ApiClient
         return $this->sendRequest(static::TYPE_AVAILABILITY, $data);
     }
 
+    /**
+     * @throws ApiClientException
+     */
+    public function getAvailabilitiesExtended(int $dateId): Notification|ExtendedServiceAvailabilityResponse
+    {
+        $data = [
+            'user' => $this->config['bpn_username'],
+            'key' => $this->createKey($this->config['bpn_username'], $this->config['bpn_password'], static::TYPE_AVAILABILITY_EXTENDED),
+            'satz' => ['@typ' => static::TYPE_AVAILABILITY_EXTENDED],
+            'idreise' => $dateId,
+        ];
+
+        return $this->sendRequest(static::TYPE_AVAILABILITY_EXTENDED, $data);
+    }
+
     /**
      * @throws ApiClientException
      */
@@ -397,6 +416,30 @@ class ApiClient
         return $this->sendRequest(static::TYPE_PRODUCT_DATA, $data, ['hotelId' => $hotelId]);
     }
 
+    /**
+     * Fetches raw XML travel data from the BusProNet API.
+     *
+     * Returns the unprocessed XML response for direct storage in the XML export directory.
+     * The response format matches the XML export structure from BusPro.
+     *
+     * @param int $travelId The travel product ID to fetch
+     *
+     * @return string The raw XML response
+     *
+     * @throws ApiClientException If the API request fails
+     */
+    public function getTravelDataXml(int $travelId): string
+    {
+        $data = [
+            'user' => $this->config['bpn_username'],
+            'key' => $this->createKey($this->config['bpn_username'], $this->config['bpn_password'], static::TYPE_PRODUCT_DATA),
+            'satz' => ['@typ' => static::TYPE_PRODUCT_DATA],
+            'idprodukt' => $travelId,
+        ];
+
+        return $this->sendRequestRaw($data);
+    }
+
     /**
      * @throws ApiClientException
      */
@@ -489,10 +532,11 @@ class ApiClient
     }
 
     /**
-     * Sends raw XML to the BPN API with key regeneration.
+     * Sends raw XML to the BPN API with key regeneration and automatic retry.
      *
      * Parses the XML to extract the request type, regenerates the authentication key
      * with the current date, and sends the request. Returns the raw XML response.
+     * Automatically retries on immediate connection close (server busy).
      *
      * @param string $xml   The raw XML request body
      * @param bool   $debug Enable debug mode (XML dumps)
@@ -503,7 +547,18 @@ class ApiClient
      */
     public function sendRawXml(string $xml, bool $debug = false): string
     {
-        $requestId = date(DATE_ATOM).uniqid();
+        return $this->executeWithRetry(fn () => $this->doSendRawXml($xml, $debug));
+    }
+
+    /**
+     * Performs the actual raw XML request to the BPN API.
+     *
+     * @throws ApiClientException
+     * @throws ImmediateConnectionCloseException
+     */
+    private function doSendRawXml(string $xml, bool $debug = false): string
+    {
+        $requestId = $this->getRequestId();
 
         $doc = new \DOMDocument();
         if (false === @$doc->loadXML($xml)) {
@@ -534,25 +589,19 @@ class ApiClient
 
         $body = $doc->saveXML();
 
-        $this->logger->info('Sending raw XML request to BPN API', [
-            'requestId' => $requestId,
-            'type' => $type,
-        ]);
-
         if (true === $debug || true === $this->config['debug']) {
             $this->dumpXmlToFile('request', $requestId, $body);
         }
 
-        $socket = $this->connect(
-            $this->config['bpn_api_ip'],
-            $this->config['bpn_api_port'],
-            $this->config['max_retries'],
-            $this->config['connection_timeout'],
-            $this->config['stream_timeout'],
-            $this->config['total_timeout']
-        );
-        $this->send($socket, $body, $this->config['total_timeout']);
-        $response = $this->receive($socket, $this->config['total_timeout']);
+        $socket = $this->connect();
+
+        $this->logger->info('Sending raw XML request to BPN API', [
+            'requestId' => $requestId,
+            'type' => $type,
+            'port' => $this->selectedPort,
+        ]);
+        $this->send($socket, $body);
+        $response = $this->receive($socket);
         $this->disconnect($socket);
 
         $responseXml = substr($response, 10);
@@ -567,9 +616,81 @@ class ApiClient
     /**
      * @throws ApiClientException
      */
+    /**
+     * @param array<string, mixed> $data
+     * @param array<string, mixed> $additionalArgs
+     */
     private function sendRequest(string $type, array $data, array $additionalArgs = [], bool $debug = false): mixed
     {
-        $requestId = date(DATE_ATOM).uniqid();
+        return $this->executeWithRetry(fn () => $this->doSendRequest($type, $data, $additionalArgs, $debug), $type);
+    }
+
+    /**
+     * @throws ApiClientException
+     */
+    /** @param array<string, mixed> $data */
+    private function sendRequestRaw(array $data): string
+    {
+        return $this->executeWithRetry(fn () => $this->doSendRequestRaw($data));
+    }
+
+    /**
+     * Executes an operation with automatic retry on immediate connection close.
+     *
+     * When the BPN server is busy, it may close connections immediately without responding.
+     * This method detects such conditions and automatically retries after a short delay.
+     *
+     * @throws ImmediateConnectionCloseException If all retry attempts fail
+     */
+    private function executeWithRetry(callable $operation, ?string $type = null): mixed
+    {
+        $maxAttempts = $this->config['busy_retry_attempts'];
+        $retryDelay = $this->config['busy_retry_delay'];
+        $lastException = null;
+
+        for ($attempt = 1; $attempt <= $maxAttempts; ++$attempt) {
+            try {
+                return $operation();
+            } catch (ImmediateConnectionCloseException $e) {
+                $lastException = $e;
+
+                if ($attempt < $maxAttempts) {
+                    $context = [
+                        'attempt' => $attempt,
+                        'maxAttempts' => $maxAttempts,
+                        'retryDelay' => $retryDelay,
+                    ];
+                    if (null !== $type) {
+                        $context['type'] = $type;
+                    }
+                    $this->logger->warning('BPN server busy, retrying request', $context);
+                    sleep($retryDelay);
+                }
+            }
+        }
+
+        $context = ['attempts' => $maxAttempts];
+        if (null !== $type) {
+            $context['type'] = $type;
+        }
+        $this->logger->error('BPN server busy after all retry attempts', $context);
+
+        throw $lastException;
+    }
+
+    /**
+     * Performs the actual request to the BPN API.
+     *
+     * @throws ApiClientException
+     * @throws ImmediateConnectionCloseException
+     */
+    /**
+     * @param array<string, mixed> $data
+     * @param array<string, mixed> $additionalArgs
+     */
+    private function doSendRequest(string $type, array $data, array $additionalArgs = [], bool $debug = false): mixed
+    {
+        $requestId = $this->getRequestId();
 
         $body = $this
             ->serializer
@@ -579,30 +700,33 @@ class ApiClient
             ])
         ;
 
-        $this->logger->info('Sending request to BPN API', [
-            'requestId' => $requestId,
-            'type' => $data['satz']['@typ'],
-        ]);
-
         if (true === $debug || true === $this->config['debug']) {
             $this->dumpXmlToFile('request', $requestId, $body);
         }
 
-        $socket = $this->connect(
-            $this->config['bpn_api_ip'],
-            $this->config['bpn_api_port'],
-            $this->config['max_retries'],
-            $this->config['connection_timeout'],
-            $this->config['stream_timeout'],
-            $this->config['total_timeout']
-        );
-        $this->send($socket, $body, $this->config['total_timeout']);
-        $response = $this->receive($socket, $this->config['total_timeout']);
+        $socket = $this->connect();
+
+        $this->logger->info('Sending request to BPN API', [
+            'requestId' => $requestId,
+            'type' => $data['satz']['@typ'],
+            'port' => $this->selectedPort,
+        ]);
+
+        $this->send($socket, $body);
+        $response = $this->receive($socket);
         $this->disconnect($socket);
 
         // message length (10 bytes) is prepended to actual message
         $xml = substr($response, 10);
 
+        if ('' === $xml) {
+            $this->logger->error('Empty response body received from API (header-only response)', [
+                'request_id' => $requestId,
+                'raw_length' => strlen($response),
+            ]);
+            throw new ApiClientException('Empty response body received from API');
+        }
+
         if (true === $debug || true === $this->config['debug']) {
             $this->dumpXmlToFile('response', $requestId, $xml);
         }
@@ -620,6 +744,46 @@ class ApiClient
         throw new ApiClientException('Unexpected response received from API');
     }
 
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @throws ApiClientException
+     * @throws ImmediateConnectionCloseException
+     */
+    private function doSendRequestRaw(array $data): string
+    {
+        $requestId = $this->getRequestId();
+
+        $body = $this->serializer->serialize($data, 'xml', [
+            XmlEncoder::ROOT_NODE_NAME => 'anfrage',
+            XmlEncoder::ENCODING => 'UTF-8',
+        ]);
+
+        if (true === $this->config['debug']) {
+            $this->dumpXmlToFile('request', $requestId, $body);
+        }
+
+        $socket = $this->connect();
+
+        $this->logger->info('Sending raw request to BPN API', [
+            'requestId' => $requestId,
+            'type' => $data['satz']['@typ'],
+            'port' => $this->selectedPort,
+        ]);
+
+        $this->send($socket, $body);
+        $response = $this->receive($socket);
+        $this->disconnect($socket);
+
+        $xml = substr($response, 10);
+
+        if (true === $this->config['debug']) {
+            $this->dumpXmlToFile('response', $requestId, $xml);
+        }
+
+        return $xml;
+    }
+
     private function dumpXmlToFile(string $type, string $requestId, string $body): void
     {
         try {
@@ -628,6 +792,14 @@ class ApiClient
         }
     }
 
+    private function getRequestId(): string
+    {
+        $baseId = $this->requestStack->getMainRequest()?->attributes->get('request_id')
+            ?? $this->requestIdGenerator->generateBaseId();
+
+        return $baseId.'_'.++$this->requestCounter;
+    }
+
     private function createKey(string $username, string $password, string $type): string
     {
         $date = (new \DateTimeImmutable())->format('Ymd');
@@ -635,6 +807,167 @@ class ApiClient
         return md5($username.$password.$date.$type);
     }
 
+    /**
+     * @return resource
+     *
+     * @throws ApiClientException
+     * @throws TimeoutException
+     */
+    private function connect()
+    {
+        // Randomly select a port from the available ports for load balancing
+        $this->selectedPort = $this->config['bpn_api_ports'][array_rand($this->config['bpn_api_ports'])];
+        $this->operationStartTime = microtime(true);
+
+        $tries = 1;
+        $errNo = $errStr = '';
+        $errorCodesForRetry = [
+            SOCKET_ECONNREFUSED,
+            SOCKET_EBADF,
+        ];
+
+        $openSocket = function (&$errNo, &$errStr) {
+            return @fsockopen(
+                $this->config['bpn_api_ip'],
+                $this->selectedPort,
+                $errNo,
+                $errStr,
+                $this->config['connection_timeout']
+            );
+        };
+
+        $socket = $openSocket($errNo, $errStr);
+
+        while (false === $socket && true === in_array($errNo, $errorCodesForRetry) && $this->config['max_retries'] > $tries) {
+            // Check if we've exceeded total timeout during retries
+            if (microtime(true) - $this->operationStartTime > $this->config['total_timeout']) {
+                $this->logger->error('Connection retry timeout exceeded', [
+                    'elapsed_time' => microtime(true) - $this->operationStartTime,
+                    'total_timeout' => $this->config['total_timeout'],
+                ]);
+                throw new TimeoutException('Connection timeout exceeded during retries');
+            }
+
+            $this->logger->warning('Could not connect to socket, retrying', [
+                'error_message' => $errStr,
+                'error_number' => $errNo,
+                'attempt' => $tries,
+            ]);
+            ++$tries;
+            sleep(1);
+            $socket = $openSocket($errNo, $errStr);
+        }
+
+        if (false !== $socket) {
+            stream_set_timeout($socket, $this->config['stream_timeout']);
+        } else {
+            $this->logger->error('Unable to open socket', [
+                'error_message' => $errStr,
+                'error_number' => $errNo,
+                'elapsed_time' => microtime(true) - $this->operationStartTime,
+            ]);
+            throw new ApiClientException('Unable to open socket');
+        }
+
+        return $socket;
+    }
+
+    /**
+     * @param resource $socket
+     *
+     * @throws TimeoutException
+     */
+    private function send($socket, string $data): void
+    {
+        // Check total timeout before sending
+        if (microtime(true) - $this->operationStartTime > $this->config['total_timeout']) {
+            $this->logger->error('Total timeout exceeded before send', [
+                'elapsed_time' => microtime(true) - $this->operationStartTime,
+            ]);
+            throw new TimeoutException('Total operation timeout exceeded before send');
+        }
+
+        // message length is prepended to actual message
+        $send = sprintf('%010s', strlen($data)).$data;
+        fwrite($socket, $send);
+    }
+
+    /**
+     * @param resource $socket
+     *
+     * @throws TimeoutException
+     * @throws ImmediateConnectionCloseException
+     */
+    private function receive($socket): string
+    {
+        $response = '';
+        $readAttempts = 0;
+        $totalTimeout = $this->config['total_timeout'];
+
+        while (false === feof($socket)) {
+            // Check total timeout before each read
+            $elapsedTime = microtime(true) - $this->operationStartTime;
+            if ($elapsedTime > $totalTimeout) {
+                $this->logger->error('Total timeout exceeded during receive', [
+                    'elapsed_time' => $elapsedTime,
+                    'total_timeout' => $totalTimeout,
+                    'bytes_received' => strlen($response),
+                    'read_attempts' => $readAttempts,
+                ]);
+                throw new TimeoutException('Total operation timeout exceeded while receiving data');
+            }
+
+            $chunk = fread($socket, 4096);
+            ++$readAttempts;
+
+            // Check if stream timed out on this specific read
+            $metadata = stream_get_meta_data($socket);
+            if (true === $metadata['timed_out']) {
+                // Check if this is an immediate rejection (0 bytes, < 1 second)
+                // This indicates the server is busy rather than a true timeout
+                if (0 === strlen($response) && $elapsedTime < 1.0) {
+                    $this->logger->warning('Server closed connection immediately', [
+                        'elapsed_time' => $elapsedTime,
+                        'bytes_received' => 0,
+                        'read_attempts' => $readAttempts,
+                    ]);
+                    throw new ImmediateConnectionCloseException('Server closed connection immediately - server may be busy');
+                }
+
+                $this->logger->error('Stream read timeout detected', [
+                    'elapsed_time' => $elapsedTime,
+                    'bytes_received' => strlen($response),
+                    'read_attempts' => $readAttempts,
+                ]);
+                throw new TimeoutException('Stream timeout while reading from socket');
+            }
+
+            $response .= $chunk;
+        }
+
+        if (0 === strlen($response)) {
+            $elapsedTime = microtime(true) - $this->operationStartTime;
+            $this->logger->warning('Server closed connection without sending data', [
+                'elapsed_time' => $elapsedTime,
+                'read_attempts' => $readAttempts,
+            ]);
+            throw new ImmediateConnectionCloseException('Server closed connection without sending data');
+        }
+
+        return $response;
+    }
+
+    /** @param resource $socket */
+    private function disconnect($socket): void
+    {
+        @fclose($socket);
+    }
+
+    /**
+     * @param array<string, mixed> $options
+     *
+     * @return array<string, mixed>
+     */
     private function resolveOptions(array $options): array
     {
         $optionsResolver = new OptionsResolver();
@@ -642,14 +975,17 @@ class ApiClient
             'bpn_username',
             'bpn_password',
             'bpn_api_ip',
-            'bpn_api_port',
+            'bpn_api_ports',
         ]);
+        $optionsResolver->setAllowedTypes('bpn_api_ports', ['array']);
         $optionsResolver->setDefaults([
             'max_retries' => 25,
             'debug' => false,
             'connection_timeout' => 5,
             'stream_timeout' => 30,
             'total_timeout' => 45,
+            'busy_retry_attempts' => 3,
+            'busy_retry_delay' => 1,
         ]);
 
         return $optionsResolver->resolve($options);

src/BusProNet/Constants.php

@@ -14,6 +14,7 @@ final class Constants
     public const TOKEN_SKI_PASS = 'SPA';
     public const TOKEN_ADDITIONAL = 'SON';
     public const TOKEN_BOARD = 'VPF';
+    public const TOKEN_VEG = 'VEG';
     public const TOKEN_RENTALS = ['VER', 'VE2', 'VE3', 'VE4', 'VE5', 'VE6', 'VE7', 'VE8'];
     public const TOKEN_RENTAL_INSURANCE = 'LVS';
     public const TOKEN_INSURANCES = ['RRV', 'PAK', 'OHN', 'PKG'];
@@ -37,6 +38,7 @@ final class Constants
         self::TOKEN_SKI_PASS => 'Skipässe',
         self::TOKEN_ADDITIONAL => 'Zusatzleistungen',
         self::TOKEN_BOARD => 'Verpflegung',
+        self::TOKEN_VEG => 'Verpflegungswunsch',
         self::TOKEN_RENTAL_INSURANCE => 'Leihmaterial-Versicherung',
         self::TOKEN_PARKING => 'Parkplatz',
         self::GROUP_TRANSPORTATION => 'Beförderung',
@@ -55,7 +57,7 @@ final class Constants
     // Booking status codes from buchungstatusmoeglich attribute
     public const BOOKING_STATUS_FREE = 'F';
     public const BOOKING_STATUS_INQUIRY = 'A';
-    public const BOOKING_STATUS_OPEN = 'O'; // Optionsbuchung - not relevant for current implementation
+    public const BOOKING_STATUS_OPEN = 'O'; // Optionsbuchung
 
     // Payment methods
     public const PAYMENT_METHOD_TRANSFER = 'transfer';
@@ -68,4 +70,7 @@ final class Constants
     // Baby room constraints
     public const BABY_MAX_AGE = 2;
     public const BABY_ROOM_CODE = 'Baby';
+
+    // Pseudo price room - used for website display only, not bookable
+    public const PSEUDO_PRICE_ROOM_CODE = 'PDGS';
 }

src/BusProNet/DataProcessor/BookingDataProcessor.php

@@ -12,8 +12,8 @@ use App\Form\Model\BankAccountDto;
 use App\Form\Model\BookingDto;
 use App\Form\Model\ParticipantDto;
 use App\Form\Model\RoomSelectionDto;
-use App\Service\BookingPriceCalculatorService;
-use App\Service\InsuranceService;
+use App\Service\BookingPriceCalculator;
+use App\Service\InsuranceManager;
 
 /**
  * Processes booking form data and converts it into BusProNet API payload format.
@@ -25,8 +25,8 @@ use App\Service\InsuranceService;
 class BookingDataProcessor
 {
     public function __construct(
-        private readonly InsuranceService $insuranceService,
-        private readonly BookingPriceCalculatorService $priceCalculatorService,
+        private readonly InsuranceManager $insuranceService,
+        private readonly BookingPriceCalculator $priceCalculatorService,
         private readonly ServiceMappingCollector $mappingCollector,
         private readonly ParticipantServiceProcessor $serviceProcessor,
         private readonly BookingPayloadBuilder $payloadBuilder,
@@ -73,14 +73,12 @@ class BookingDataProcessor
             if (0 === $index) {
                 // Copy address if first participant has no street (indicating empty/incomplete address)
                 // This allows applicant and first participant to be different people with different addresses
-                if (null !== $booking->applicant->address) {
-                    $isEmpty = null === $participantData->address
-                        || null === $participantData->address->street
-                        || '' === trim($participantData->address->street);
+                $isEmpty = null === $participantData->address
+                    || null === $participantData->address->street
+                    || '' === trim($participantData->address->street);
 
-                    if ($isEmpty) {
-                        $participantData->address = clone $booking->applicant->address;
-                    }
+                if ($isEmpty) {
+                    $participantData->address = clone $booking->applicant->address;
                 }
 
                 // Copy body dimensions from applicant if not present in participant
@@ -124,9 +122,19 @@ class BookingDataProcessor
             // Pickup location
             $participantData->pickup = $booking->getPickupForParticipant($index);
 
-            // Parking (stored in form data, not in booking entity - needs special handling)
-            // For now, leave as false - may need to extract from transportation services
-            $participantData->parking = false;
+            // Drop-off location
+            $participantData->dropOff = $booking->getDropOffForParticipant($index);
+            $participantData->differentDropOff = null !== $participantData->dropOff;
+
+            // Parking service (for self-organized PKW transportation)
+            $parkingServices = $booking->getAdditionalServicesForParticipantByGroup($index, Constants::TOKEN_PARKING);
+            if (false === empty($parkingServices)) {
+                $participantData->parking = true;
+                $participantData->parkingService = reset($parkingServices);
+            } else {
+                $participantData->parking = false;
+                $participantData->parkingService = null;
+            }
 
             // License plate (not stored in booking entity)
             $participantData->licensePlate = null;
@@ -156,6 +164,8 @@ class BookingDataProcessor
                 $roomSelection->label = $room->label;
                 $roomSelection->price = $room->price;
                 $roomSelection->quantity = $bookingRoom->totalCount; // Actual quantity from booking XML (anzahl)
+                $roomSelection->capacity = $room->minPax ?? 1;
+                $roomSelection->maxQuantity = $bookingRoom->totalCount + ($room->available ?? 0);
                 $dto->roomSelections[] = $roomSelection;
             }
         }
@@ -213,6 +223,11 @@ class BookingDataProcessor
             $participant->rentalInsurance = $travel->additionalServices[$participant->rentalInsurance->id];
         }
 
+        // Enrich parking service
+        if (null !== $participant->parkingService && isset($travel->additionalServices[$participant->parkingService->id])) {
+            $participant->parkingService = $travel->additionalServices[$participant->parkingService->id];
+        }
+
         // Enrich transportation services
         if (null !== $participant->transportationOutbound && isset($travel->transportationServices[$participant->transportationOutbound->id])) {
             $participant->transportationOutbound = $travel->transportationServices[$participant->transportationOutbound->id];
@@ -222,9 +237,33 @@ class BookingDataProcessor
             $participant->transportationInbound = $travel->transportationServices[$participant->transportationInbound->id];
         }
 
-        // Enrich pickup
-        if (null !== $participant->pickup && isset($travel->pickupsOutbound[$participant->pickup->id])) {
-            $participant->pickup = $travel->pickupsOutbound[$participant->pickup->id];
+        // Enrich pickup with data from travel (includes both outbound and inbound prices)
+        // The pickups already have inbound prices merged in from TravelParser
+        if (null !== $participant->pickup && isset($travel->pickups[$participant->pickup->id])) {
+            $enrichedPickup = $travel->pickups[$participant->pickup->id];
+
+            // Copy all properties from enriched pickup to participant's pickup
+            $participant->pickup->price = $enrichedPickup->price;
+            $participant->pickup->priceOutbound = $enrichedPickup->priceOutbound;
+            $participant->pickup->priceInbound = $enrichedPickup->priceInbound;
+            $participant->pickup->time = $enrichedPickup->time;
+            $participant->pickup->city = $enrichedPickup->city;
+            $participant->pickup->street = $enrichedPickup->street;
+            $participant->pickup->postalCode = $enrichedPickup->postalCode;
+            $participant->pickup->code = $enrichedPickup->code;
+        }
+
+        // Enrich drop-off with data from travel
+        if (null !== $participant->dropOff && isset($travel->dropOffs[$participant->dropOff->id])) {
+            $enrichedDropOff = $travel->dropOffs[$participant->dropOff->id];
+            $participant->dropOff->price = $enrichedDropOff->price;
+            $participant->dropOff->priceOutbound = $enrichedDropOff->priceOutbound;
+            $participant->dropOff->priceInbound = $enrichedDropOff->priceInbound;
+            $participant->dropOff->time = $enrichedDropOff->time;
+            $participant->dropOff->city = $enrichedDropOff->city;
+            $participant->dropOff->street = $enrichedDropOff->street;
+            $participant->dropOff->postalCode = $enrichedDropOff->postalCode;
+            $participant->dropOff->code = $enrichedDropOff->code;
         }
 
         // Enrich insurance
@@ -243,7 +282,7 @@ class BookingDataProcessor
      *
      * @param BookingDto|null $formData The booking edit form data containing updated participant and service selections
      *
-     * @return array The structured payload array ready for BusProNet API submission
+     * @return array<string, mixed> The structured payload array ready for BusProNet API submission
      */
     public function createUpdateRequestPayload(?BookingDto $formData): array
     {
@@ -266,13 +305,18 @@ class BookingDataProcessor
         }
 
         $this->serviceProcessor->removeUnusedServices($bookingData);
-        $this->personalDataSynchronizer->updateParticipantPersonalData($formData->participants, $bookingData);
+        $this->personalDataSynchronizer->updateParticipantPersonalData(
+            $formData->participants,
+            $bookingData,
+            $formData->isInternalAgencyBooking()
+        );
 
         $payload = $this->payloadBuilder->buildBasePayload($bookingData);
         $this->payloadBuilder->addBankAccountToPayload($payload, $bookingData);
         $this->payloadBuilder->buildParticipantPayload($payload, $bookingData, $formData->participants);
         $this->payloadBuilder->buildServicesPayload($payload, $bookingData);
         $this->payloadBuilder->buildPickupPayload($payload, $bookingData);
+        $this->payloadBuilder->buildDropOffPayload($payload, $bookingData);
 
         // Add purchase vouchers if any exist
         $purchaseVouchers = $this->mappingCollector->collectPurchaseVouchers($formData);
@@ -299,7 +343,7 @@ class BookingDataProcessor
      * @param BookingDto $bookingDto  The booking creation form data
      * @param string     $bookingType Either 'Anfrage' (inquiry) or 'Buchung' (final booking)
      *
-     * @return array The structured payload array for BusProNet API submission
+     * @return array<string, mixed> The structured payload array for BusProNet API submission
      */
     public function createBookingRequestPayload(BookingDto $bookingDto, string $bookingType): array
     {
@@ -342,7 +386,7 @@ class BookingDataProcessor
             $participantPrices[$index] = $this->priceCalculatorService->calculateIndividualParticipantPriceExcludingInsurance($bookingDto, $index);
         }
 
-        // Use InsuranceService for proper type-based assignment with price tier matching
+        // Use InsuranceManager for proper type-based assignment with price tier matching
         $assignments = $this->insuranceService->batchAssignInsuranceToParticipants(
             $selectableInsurances,
             $applicant->insurance,

src/BusProNet/DataProcessor/BookingPayloadBuilder.php

@@ -7,6 +7,7 @@ namespace App\BusProNet\DataProcessor;
 use App\BusProNet\Constants;
 use App\BusProNet\Model\Booking;
 use App\Form\Model\BookingDto;
+use App\Form\Model\ParticipantDto;
 
 /**
  * Builds API payload structures for BusProNet booking requests.
@@ -16,6 +17,8 @@ use App\Form\Model\BookingDto;
  */
 class BookingPayloadBuilder
 {
+    private const DEFAULT_PARTICIPANT_STATUS = 'F';
+
     public function __construct(
         private readonly ServiceMappingCollector $mappingCollector,
     ) {
@@ -28,7 +31,7 @@ class BookingPayloadBuilder
      *
      * @param Booking $bookingData The booking data object
      *
-     * @return array The base payload structure
+     * @return array<string, mixed> The base payload structure
      */
     public function buildBasePayload(Booking $bookingData): array
     {
@@ -64,8 +67,8 @@ class BookingPayloadBuilder
      *
      * Bank account information is required for direct debit payments.
      *
-     * @param array   $payload     The payload array to modify
-     * @param Booking $bookingData The booking data object
+     * @param array<string, mixed> $payload     The payload array to modify
+     * @param Booking              $bookingData The booking data object
      */
     public function addBankAccountToPayload(array &$payload, Booking $bookingData): void
     {
@@ -84,9 +87,9 @@ class BookingPayloadBuilder
      *
      * Includes status, personal data, and wishes (room remarks, license plate) for each participant.
      *
-     * @param array   $payload         The payload array to modify
-     * @param Booking $bookingData     The booking data object
-     * @param array   $participantDtos The participant DTOs from the form (for wishes data)
+     * @param array<string, mixed>       $payload         The payload array to modify
+     * @param Booking                    $bookingData     The booking data object
+     * @param array<int, ParticipantDto> $participantDtos The participant DTOs from the form (for wishes data)
      */
     public function buildParticipantPayload(array &$payload, Booking $bookingData, array $participantDtos): void
     {
@@ -139,28 +142,31 @@ class BookingPayloadBuilder
      * Includes additional services, transportation services, and accommodation details
      * with participant mappings and quantities.
      *
-     * @param array   $payload     The payload array to modify
-     * @param Booking $bookingData The booking data object
+     * @param array<string, mixed> $payload     The payload array to modify
+     * @param Booking              $bookingData The booking data object
      */
     public function buildServicesPayload(array &$payload, Booking $bookingData): void
     {
         foreach ($bookingData->additionalServices as $service) {
+            $uniqueMapping = array_unique($service->mapping);
             $payload['zusatzleistungen']['zusatzleistung'][] = [
                 '@idleistung' => $service->id,
-                '@anzahl' => count($service->mapping),
-                '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $service->mapping)),
+                '@anzahl' => count($uniqueMapping),
+                '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $uniqueMapping)),
             ];
         }
 
         foreach ($bookingData->transportationServices as $service) {
+            $uniqueMapping = array_unique($service->mapping);
             $payload['beförderungen']['beförderung'][] = [
                 '@idleistung' => $service->id,
-                '@anzahl' => count($service->mapping),
-                '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $service->mapping)),
+                '@anzahl' => count($uniqueMapping),
+                '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $uniqueMapping)),
             ];
         }
 
         foreach ($bookingData->rooms as $room) {
+            $uniqueMapping = array_unique($room->mapping);
             $payload['ferienzielunterbringungen']['ferienzielunterbringung'][] = [
                 '@idzimmer' => $room->id,
                 '@kategorie' => $room->category,
@@ -168,7 +174,7 @@ class BookingPayloadBuilder
                 '@anreise' => $room->dateFrom ? $room->dateFrom->format('d.m.Y') : null,
                 '@abreise' => $room->dateTo ? $room->dateTo->format('d.m.Y') : null,
                 '@anzahl' => $room->totalCount,
-                '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $room->mapping)),
+                '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $uniqueMapping)),
             ];
         }
 
@@ -176,11 +182,12 @@ class BookingPayloadBuilder
         if (false === empty($bookingData->insurances)) {
             $payload['versicherungen']['versicherung'] = [];
             foreach ($bookingData->insurances as $insurance) {
-                if (count($insurance->mapping) > 0) {
+                $uniqueMapping = array_unique($insurance->mapping);
+                if (count($uniqueMapping) > 0) {
                     $payload['versicherungen']['versicherung'][] = [
                         '@idversicherung' => $insurance->id,
-                        '@anzahl' => count($insurance->mapping),
-                        '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $insurance->mapping)),
+                        '@anzahl' => count($uniqueMapping),
+                        '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $uniqueMapping)),
                     ];
                 }
             }
@@ -192,18 +199,44 @@ class BookingPayloadBuilder
      *
      * Only included in payload if there are actual pickup assignments for bus transportation.
      *
-     * @param array   $payload     The payload array to modify
-     * @param Booking $bookingData The booking data object
+     * @param array<string, mixed> $payload     The payload array to modify
+     * @param Booking              $bookingData The booking data object
      */
     public function buildPickupPayload(array &$payload, Booking $bookingData): void
     {
-        if (0 < count($bookingData->pickupsOutbound)) {
+        $payload['zustiege'] = [];
+
+        if (0 < count($bookingData->pickups)) {
             $payload['zustiege']['zustieg'] = [];
-            foreach ($bookingData->pickupsOutbound as $pickup) {
+            foreach ($bookingData->pickups as $pickup) {
+                $uniqueMapping = array_unique($pickup->mapping);
                 $payload['zustiege']['zustieg'][] = [
                     '@idzustieg' => $pickup->id,
-                    '@anzahl' => count($pickup->mapping),
-                    '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $pickup->mapping)),
+                    '@anzahl' => count($uniqueMapping),
+                    '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $uniqueMapping)),
+                ];
+            }
+        }
+    }
+
+    /**
+     * Builds the drop-off locations section of the payload.
+     *
+     * Only included in payload if there are actual drop-off assignments for bus transportation.
+     *
+     * @param array<string, mixed> $payload     The payload array to modify
+     * @param Booking              $bookingData The booking data object
+     */
+    public function buildDropOffPayload(array &$payload, Booking $bookingData): void
+    {
+        if (0 < count($bookingData->dropOffs)) {
+            $payload['ausstiege']['ausstieg'] = [];
+            foreach ($bookingData->dropOffs as $dropOff) {
+                $uniqueMapping = array_unique($dropOff->mapping);
+                $payload['ausstiege']['ausstieg'][] = [
+                    '@idzustieg' => $dropOff->id,
+                    '@anzahl' => count($uniqueMapping),
+                    '@zuordnung' => implode(',', array_map(fn ($index) => $index + 1, $uniqueMapping)),
                 ];
             }
         }
@@ -217,7 +250,7 @@ class BookingPayloadBuilder
      * @param BookingDto $bookingDto  The booking creation form data
      * @param string     $bookingType Either 'Anfrage' (inquiry) or 'Buchung' (final booking)
      *
-     * @return array The structured payload array for BusProNet API submission
+     * @return array<string, mixed> The structured payload array for BusProNet API submission
      */
     public function buildCreatePayload(BookingDto $bookingDto, string $bookingType): array
     {
@@ -270,6 +303,7 @@ class BookingPayloadBuilder
         foreach ($bookingDto->participants as $index => $participant) {
             $participantData = [
                 '@id' => $index + 1,
+                'status' => self::DEFAULT_PARTICIPANT_STATUS,
                 'name' => $participant->lastName,
                 'vorname' => $participant->firstName,
                 'geschlecht' => $participant->gender ?? '',
@@ -359,6 +393,13 @@ class BookingPayloadBuilder
         $this->addRoomMappingsToPayload($payload, $roomMap, $bookingDto);
         $this->addServicesFromMap($payload, 'zusatzleistungen', 'zusatzleistung', '@idleistung', $serviceMap);
         $this->addServicesFromMap($payload, 'zustiege', 'zustieg', '@idzustieg', $pickupMap);
+        if (false === array_key_exists('zustiege', $payload)) {
+            $payload['zustiege'] = [];
+        }
+
+        $dropOffMap = $this->mappingCollector->collectDropOffMappings($bookingDto);
+        $this->addServicesFromMap($payload, 'ausstiege', 'ausstieg', '@idzustieg', $dropOffMap);
+
         $this->addServicesFromMap($payload, 'versicherungen', 'versicherung', '@idversicherung', $insuranceMap);
 
         // Add purchase vouchers (regular purchase vouchers, excluding goodwill vouchers)
@@ -399,11 +440,11 @@ class BookingPayloadBuilder
      * Generic helper method that converts service ID => participant IDs mappings
      * into XML payload structure.
      *
-     * @param array  $payload         The payload array to modify
-     * @param string $sectionKey      The section key (e.g., 'beförderungen', 'versicherungen')
-     * @param string $itemKey         The item key (e.g., 'beförderung', 'versicherung')
-     * @param string $idAttributeName The ID attribute name (e.g., '@idleistung', '@idversicherung')
-     * @param array  $serviceMap      Map of service ID to participant IDs
+     * @param array<string, mixed>     $payload         The payload array to modify
+     * @param string                   $sectionKey      The section key (e.g., 'beförderungen', 'versicherungen')
+     * @param string                   $itemKey         The item key (e.g., 'beförderung', 'versicherung')
+     * @param string                   $idAttributeName The ID attribute name (e.g., '@idleistung', '@idversicherung')
+     * @param array<int|string, int[]> $serviceMap      Map of service ID to participant IDs
      */
     public function addServicesFromMap(
         array &$payload,
@@ -415,10 +456,11 @@ class BookingPayloadBuilder
         if (false === empty($serviceMap)) {
             $payload[$sectionKey][$itemKey] = [];
             foreach ($serviceMap as $serviceId => $participantIds) {
+                $uniqueParticipantIds = array_unique($participantIds);
                 $payload[$sectionKey][$itemKey][] = [
                     $idAttributeName => $serviceId,
-                    '@anzahl' => count($participantIds),
-                    '@zuordnung' => implode(',', $participantIds),
+                    '@anzahl' => count($uniqueParticipantIds),
+                    '@zuordnung' => implode(',', $uniqueParticipantIds),
                 ];
             }
         }
@@ -434,9 +476,9 @@ class BookingPayloadBuilder
      * - abreise (departure date)
      * - anzahl (number of rooms of this type booked)
      *
-     * @param array      $payload    The payload array to modify
-     * @param array      $roomMap    Map of room ID to participant IDs
-     * @param BookingDto $bookingDto The booking data for accessing room details and quantities
+     * @param array<string, mixed>     $payload    The payload array to modify
+     * @param array<int|string, int[]> $roomMap    Map of room ID to participant IDs
+     * @param BookingDto               $bookingDto The booking data for accessing room details and quantities
      */
     public function addRoomMappingsToPayload(array &$payload, array $roomMap, BookingDto $bookingDto): void
     {
@@ -462,6 +504,7 @@ class BookingPayloadBuilder
             }
 
             $quantity = $roomQuantities[$roomId] ?? 1;
+            $uniqueParticipantIds = array_unique($participantIds);
 
             $payload['ferienzielunterbringungen']['ferienzielunterbringung'][] = [
                 '@idzimmer' => $room->id,
@@ -470,7 +513,7 @@ class BookingPayloadBuilder
                 '@anreise' => $bookingDto->travel->dateFrom->format('d.m.Y'),
                 '@abreise' => $bookingDto->travel->dateTo->format('d.m.Y'),
                 '@anzahl' => $quantity,
-                '@zuordnung' => implode(',', $participantIds),
+                '@zuordnung' => implode(',', $uniqueParticipantIds),
             ];
         }
     }
@@ -478,8 +521,8 @@ class BookingPayloadBuilder
     /**
      * Adds purchase vouchers to the payload.
      *
-     * @param array      $payload    The payload array to modify
-     * @param BookingDto $bookingDto The booking data
+     * @param array<string, mixed> $payload    The payload array to modify
+     * @param BookingDto           $bookingDto The booking data
      */
     public function addPurchaseVouchersToPayload(array &$payload, BookingDto $bookingDto): void
     {

src/BusProNet/DataProcessor/ParticipantServiceProcessor.php

@@ -7,6 +7,7 @@ namespace App\BusProNet\DataProcessor;
 use App\BusProNet\Model\Booking;
 use App\BusProNet\Model\Travel;
 use App\Form\Model\ParticipantDto;
+use Psr\Log\LoggerInterface;
 
 /**
  * Processes participant service selections for booking updates.
@@ -17,6 +18,11 @@ use App\Form\Model\ParticipantDto;
  */
 class ParticipantServiceProcessor
 {
+    public function __construct(
+        private readonly LoggerInterface $logger,
+    ) {
+    }
+
     /**
      * Resets all existing participant-to-service mappings to start with a clean slate.
      *
@@ -30,8 +36,8 @@ class ParticipantServiceProcessor
         $servicesToReset = [
             ...$bookingData->additionalServices,
             ...$bookingData->transportationServices,
-            ...$bookingData->pickupsOutbound,
-            ...$bookingData->pickupsInbound,
+            ...$bookingData->pickups,
+            ...$bookingData->dropOffs,
             ...$bookingData->rooms,
             ...$bookingData->insurances,
         ];
@@ -60,6 +66,7 @@ class ParticipantServiceProcessor
         $this->processAdditionalServices($participant, $bookingData, $travelData);
         $this->processTransportationServices($participant, $bookingData, $travelData);
         $this->processPickupLocations($participant, $bookingData);
+        $this->processDropOffLocations($participant, $bookingData);
         $this->processRoomAssignment($participant, $bookingData);
         $this->processInsurance($participant, $bookingData, $travelData);
     }
@@ -86,15 +93,15 @@ class ParticipantServiceProcessor
             }
         }
 
-        foreach ($bookingData->pickupsOutbound as $pickup) {
+        foreach ($bookingData->pickups as $pickup) {
             if (0 === count($pickup->mapping)) {
-                unset($bookingData->pickupsOutbound[$pickup->id]);
+                unset($bookingData->pickups[$pickup->id]);
             }
         }
 
-        foreach ($bookingData->pickupsInbound as $pickup) {
-            if (0 === count($pickup->mapping)) {
-                unset($bookingData->pickupsInbound[$pickup->id]);
+        foreach ($bookingData->dropOffs as $dropOff) {
+            if (0 === count($dropOff->mapping)) {
+                unset($bookingData->dropOffs[$dropOff->id]);
             }
         }
 
@@ -109,7 +116,7 @@ class ParticipantServiceProcessor
      * Collects additional services from a participant for mapping.
      *
      * Extracts all additional services (courses, board, rentals, ski pass, rental insurance,
-     * additional services) from a participant into a flat array of Service objects.
+     * parking, additional services) from a participant into a flat array of Service objects.
      *
      * @param ParticipantDto $participant The participant data
      *
@@ -134,6 +141,11 @@ class ParticipantServiceProcessor
             $services[] = $participant->rentalInsurance;
         }
 
+        // Add parking service if selected (for self-organized PKW transportation)
+        if (true === $participant->parking && null !== $participant->parkingService) {
+            $services[] = $participant->parkingService;
+        }
+
         return $services;
     }
 
@@ -154,11 +166,18 @@ class ParticipantServiceProcessor
         foreach ($servicesToMap as $service) {
             if (false === isset($bookingData->additionalServices[$service->id])) {
                 $serviceToAdd = $travelData->additionalServices[$service->id] ?? null;
-                if (null !== $serviceToAdd) {
-                    $bookingData->additionalServices[$service->id] = $serviceToAdd;
-                    $bookingData->additionalServices[$service->id]->individualPrice[$participant->index] = $serviceToAdd->price;
+                if (null === $serviceToAdd) {
+                    $this->logger->warning('Additional service not found in travel data, skipping mapping', [
+                        'bookingId' => $bookingData->id,
+                        'serviceId' => $service->id,
+                        'participantIndex' => $participant->index,
+                    ]);
+                    continue;
                 }
+                $bookingData->additionalServices[$service->id] = $serviceToAdd;
+                $bookingData->additionalServices[$service->id]->individualPrice[$participant->index] = $serviceToAdd->price;
             }
+
             $bookingData->additionalServices[$service->id]->mapping[] = $participant->index;
         }
     }
@@ -176,13 +195,24 @@ class ParticipantServiceProcessor
     private function processTransportationServices(ParticipantDto $participant, Booking $bookingData, Travel $travelData): void
     {
         foreach ([$participant->transportationOutbound, $participant->transportationInbound] as $service) {
+            if (null === $service) {
+                continue;
+            }
+
             if (false === isset($bookingData->transportationServices[$service->id])) {
                 $serviceToAdd = $travelData->transportationServices[$service->id] ?? null;
-                if (null !== $serviceToAdd) {
-                    $bookingData->transportationServices[$service->id] = $serviceToAdd;
-                    $bookingData->transportationServices[$service->id]->individualPrice[$participant->index] = $serviceToAdd->price;
+                if (null === $serviceToAdd) {
+                    $this->logger->warning('Transportation service not found in travel data, skipping mapping', [
+                        'bookingId' => $bookingData->id,
+                        'serviceId' => $service->id,
+                        'participantIndex' => $participant->index,
+                    ]);
+                    continue;
                 }
+                $bookingData->transportationServices[$service->id] = $serviceToAdd;
+                $bookingData->transportationServices[$service->id]->individualPrice[$participant->index] = $serviceToAdd->price;
             }
+
             $bookingData->transportationServices[$service->id]->mapping[] = $participant->index;
         }
     }
@@ -203,10 +233,34 @@ class ParticipantServiceProcessor
         $hasInboundBus = null !== $participant->transportationInbound && 'BUS' === $participant->transportationInbound->subType;
 
         if (($hasOutboundBus || $hasInboundBus) && null !== $selectedPickup = $participant->pickup) {
-            if (false === isset($bookingData->pickupsOutbound[$selectedPickup->id])) {
-                $bookingData->pickupsOutbound[$selectedPickup->id] = $selectedPickup;
+            if (false === isset($bookingData->pickups[$selectedPickup->id])) {
+                $bookingData->pickups[$selectedPickup->id] = $selectedPickup;
             }
-            $bookingData->pickupsOutbound[$selectedPickup->id]->mapping[] = $participant->index;
+            $bookingData->pickups[$selectedPickup->id]->mapping[] = $participant->index;
+        }
+    }
+
+    /**
+     * Processes drop-off locations for participants using bus transportation.
+     *
+     * Only processes drop-off locations for bus transportation services and maps the participant
+     * to their selected drop-off location.
+     *
+     * @param ParticipantDto $participant The participant data from the form
+     * @param Booking        $bookingData The booking data object to update
+     */
+    private function processDropOffLocations(ParticipantDto $participant, Booking $bookingData): void
+    {
+        $hasOutboundBus = null !== $participant->transportationOutbound
+            && 'BUS' === $participant->transportationOutbound->subType;
+        $hasInboundBus = null !== $participant->transportationInbound
+            && 'BUS' === $participant->transportationInbound->subType;
+
+        if (($hasOutboundBus || $hasInboundBus) && null !== $selectedDropOff = $participant->dropOff) {
+            if (false === isset($bookingData->dropOffs[$selectedDropOff->id])) {
+                $bookingData->dropOffs[$selectedDropOff->id] = $selectedDropOff;
+            }
+            $bookingData->dropOffs[$selectedDropOff->id]->mapping[] = $participant->index;
         }
     }
 

src/BusProNet/DataProcessor/PersonalDataSynchronizer.php

@@ -6,7 +6,7 @@ namespace App\BusProNet\DataProcessor;
 
 use App\BusProNet\Model\Address;
 use App\BusProNet\Model\Booking;
-use App\BusProNet\Model\Communication;
+use App\BusProNet\Model\PersonalData;
 use App\Form\Model\ParticipantDto;
 
 /**
@@ -20,28 +20,53 @@ class PersonalDataSynchronizer
     /**
      * Updates participant personal data from form input.
      *
-     * Processes all active participants (status 'F' or 'A'). Skips canceled participants (status 'S').
+     * Processes all participants regardless of status, including canceled participants (status 'S').
      * Updates all personal data fields and communication information.
      *
+     * Also fills missing mandatory fields on the applicant object for company bookings
+     * created by travel agencies. The applicant is separate from participant 0 and may
+     * contain only company data without personal fields required by the BPN API.
+     *
      * IMPORTANT: The applicant's address must never be modified. This method updates
      * participant addresses independently to ensure applicant data remains intact.
      *
-     * @param array<ParticipantDto> $participants The participants array from the form
-     * @param Booking               $bookingData  The booking data object to update
+     * @param array<ParticipantDto> $participants            The participants array from the form
+     * @param Booking               $bookingData             The booking data object to update
+     * @param bool                  $isInternalAgencyBooking Whether to fill default names for participants with empty names
      */
-    public function updateParticipantPersonalData(array $participants, Booking $bookingData): void
-    {
-        foreach ($participants as $participant) {
-            // Skip canceled participants (status 'S')
-            if ('S' === $participant->status) {
-                continue;
-            }
+    public function updateParticipantPersonalData(
+        array $participants,
+        Booking $bookingData,
+        bool $isInternalAgencyBooking = false,
+    ): void {
+        // Fill missing mandatory fields on applicant (for company bookings by travel agencies)
+        // This is separate from participants - applicant may be a company while participants are real people
+        $this->fillMissingApplicantFields($bookingData);
 
+        foreach ($participants as $participant) {
             $bookingData->participants[$participant->index]->firstName = $participant->firstName;
             $bookingData->participants[$participant->index]->name = $participant->lastName;
+
+            // For internal agency bookings, participants with empty names get default values.
+            // Agencies pre-book slots with placeholder data (e.g. applicant surname, empty first name),
+            // and the BPN API rejects updates with empty name fields.
+            if ($isInternalAgencyBooking) {
+                $defaultName = sprintf('Teilnehmer:in %d', $participant->index + 1);
+                $personalData = $bookingData->participants[$participant->index];
+
+                if (null === $personalData->firstName || '' === $personalData->firstName) {
+                    $personalData->firstName = $defaultName;
+                }
+                if (null === $personalData->name || '' === $personalData->name) {
+                    $personalData->name = $defaultName;
+                }
+            }
+
             $bookingData->participants[$participant->index]->dateOfBirth = $participant->dateOfBirth;
             $bookingData->participants[$participant->index]->gender = $participant->gender;
             $bookingData->participants[$participant->index]->nationality = $participant->nationality;
+
+            $this->fillMissingParticipantFields($bookingData->participants[$participant->index]);
             $bookingData->participants[$participant->index]->height = $participant->height;
             $bookingData->participants[$participant->index]->weight = $participant->weight;
             $bookingData->participants[$participant->index]->shoeSize = $participant->shoeSize;
@@ -60,12 +85,61 @@ class PersonalDataSynchronizer
             }
 
             if ($participant->email || $participant->mobile) {
-                if (null === $bookingData->participants[$participant->index]->communication) {
-                    $bookingData->participants[$participant->index]->communication = new Communication();
-                }
                 $bookingData->participants[$participant->index]->communication->email = $participant->email;
                 $bookingData->participants[$participant->index]->communication->mobile = $participant->mobile;
             }
         }
     }
+
+    /**
+     * Fills missing mandatory fields on the applicant for company bookings.
+     *
+     * Travel agencies often create bookings with company data as the applicant,
+     * which lacks personal data fields. These fields are mandatory for the BPN
+     * API, so we fill them with sensible defaults. The applicant is separate from
+     * participants - participant 0 is a real person and must not be modified here.
+     */
+    private function fillMissingApplicantFields(Booking $bookingData): void
+    {
+        if (null === $bookingData->applicant) {
+            return;
+        }
+
+        $applicant = $bookingData->applicant;
+
+        if (null === $applicant->firstName || '' === $applicant->firstName) {
+            $applicant->firstName = 'Anmelder';
+        }
+
+        if (null === $applicant->gender || '' === $applicant->gender) {
+            $applicant->gender = 'D';
+        }
+
+        if (null === $applicant->nationality || '' === $applicant->nationality) {
+            $applicant->nationality = 'D';
+        }
+
+        if (null === $applicant->dateOfBirth) {
+            $applicant->dateOfBirth = new \DateTimeImmutable('-20 years');
+        }
+
+        if (null === $applicant->communication->mobile || '' === $applicant->communication->mobile) {
+            $applicant->communication->mobile = '12345';
+        }
+    }
+
+    /**
+     * Fills missing mandatory fields on a participant.
+     *
+     * Ensures mandatory fields have sensible defaults before submission to the
+     * BPN API. Currently handles nationality which defaults to 'D' (German).
+     *
+     * @param PersonalData $participant The participant to fill defaults for
+     */
+    private function fillMissingParticipantFields(PersonalData $participant): void
+    {
+        if (null === $participant->nationality || '' === $participant->nationality) {
+            $participant->nationality = 'D';
+        }
+    }
 }

src/BusProNet/DataProcessor/PickupPlanningTransformer.php

@@ -16,7 +16,7 @@ class PickupPlanningTransformer
     /**
      * @param array<int, array<string, mixed>> $payload
      *
-     * @return array<string, array<int, array<string, string>>>
+     * @return array<string, array<int, array{city: string, location: string, datetime: string, busNumber: string}>>
      */
     public function transform(array $payload): array
     {
@@ -27,26 +27,25 @@ class PickupPlanningTransformer
                 continue;
             }
 
-            $travelCodes = $item['Reisecodes'] ?? [];
+            $code = $item['Reisecode'] ?? '';
 
-            if (0 === count($travelCodes)) {
+            if ('' === $code) {
                 continue;
             }
 
             $dateTime = \DateTimeImmutable::createFromFormat('d.m.Y H:i', $item['Zeit'] ?? '');
 
-            foreach ($travelCodes as $code) {
-                $pickup = [
-                    'city' => $item['Zustieg/Ausstieg Ort'] ?? '',
-                    'location' => $item['Zustieg/Ausstieg Strasse'] ?? '',
-                    'datetime' => false !== $dateTime ? $dateTime->format('Y-m-d H:i') : '',
-                ];
+            $pickup = [
+                'city' => $item['Zustieg/Ausstieg Ort'] ?? '',
+                'location' => $item['Zustieg/Ausstieg Strasse'] ?? '',
+                'datetime' => false !== $dateTime ? $dateTime->format('Y-m-d H:i') : '',
+                'busNumber' => $item['BusNummer'] ?? '',
+            ];
 
-                $key = sprintf('%s|%s|%s', $pickup['city'], $pickup['location'], $pickup['datetime']);
+            $key = sprintf('%s|%s|%s|%s', $pickup['city'], $pickup['location'], $pickup['datetime'], $pickup['busNumber']);
 
-                if (false === isset($result[$code][$key])) {
-                    $result[$code][$key] = $pickup;
-                }
+            if (false === isset($result[$code][$key])) {
+                $result[$code][$key] = $pickup;
             }
         }
 

src/BusProNet/DataProcessor/ServiceMappingCollector.php

@@ -20,7 +20,7 @@ class ServiceMappingCollector
      *
      * Groups participants by their assigned room ID.
      *
-     * @return array<string, array<int>> Map of room ID to participant IDs
+     * @return array<int, list<int>> Map of room ID to participant IDs
      */
     public function collectRoomMappings(BookingDto $bookingDto): array
     {
@@ -57,6 +57,11 @@ class ServiceMappingCollector
                 $serviceMap[$board->id][] = $participantId;
             }
 
+            // Veg (vegetarian/vegan) preference
+            if (null !== $participant->veg) {
+                $serviceMap[$participant->veg->id][] = $participantId;
+            }
+
             // Ski pass
             if (null !== $participant->skiPass) {
                 $serviceMap[$participant->skiPass->id][] = $participantId;
@@ -138,6 +143,28 @@ class ServiceMappingCollector
         return $pickupMap;
     }
 
+    /**
+     * Collects drop-off location mappings.
+     *
+     * Collects the drop-off selection for the inbound/return direction.
+     *
+     * @return array<string, array<int>> Map of drop-off ID to participant IDs
+     */
+    public function collectDropOffMappings(BookingDto $bookingDto): array
+    {
+        $dropOffMap = [];
+
+        foreach ($bookingDto->participants as $index => $participant) {
+            $participantId = $index + 1;
+
+            if (null !== $participant->dropOff) {
+                $dropOffMap[$participant->dropOff->id][] = $participantId;
+            }
+        }
+
+        return $dropOffMap;
+    }
+
     /**
      * Collects insurance mappings.
      *

src/BusProNet/DataProvider/CountryDataProvider.php

@@ -14,6 +14,7 @@ class CountryDataProvider
     {
     }
 
+    /** @return array<string, Country> */
     public function getAll(): array
     {
         try {

src/BusProNet/Exception/ImmediateConnectionCloseException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BusProNet\Exception;
+
+/**
+ * Thrown when the BPN server closes the connection immediately without sending data.
+ *
+ * This typically indicates the server is busy processing other requests.
+ * Unlike a true timeout, this is a transient condition that may succeed on retry.
+ */
+class ImmediateConnectionCloseException extends ApiClientException
+{
+}

src/BusProNet/Form/CountryType.php

@@ -10,6 +10,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/** @extends AbstractType<string> */
 class CountryType extends AbstractType
 {
     public function __construct(private readonly CountryDataProvider $countries)

src/BusProNet/Model/Address.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace App\BusProNet\Model;
 
+use Symfony\Component\Validator\Constraints as Assert;
+
 /**
  * Represents a physical address with street, postal code, city, and country information.
  *
@@ -13,14 +15,18 @@ namespace App\BusProNet\Model;
  */
 class Address
 {
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
     public ?string $street = null;
 
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
     public ?string $postCode = null;
 
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
     public ?string $city = null;
 
     public ?string $district = null;
 
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
     public ?string $country = null;
 
     /**

src/BusProNet/Model/AgeConstraintResult.php

@@ -12,6 +12,7 @@ namespace App\BusProNet\Model;
  */
 class AgeConstraintResult
 {
+    /** @param array<string, mixed> $metadata */
     public function __construct(
         public readonly string $type,
         public readonly ?int $ageFrom = null,

src/BusProNet/Model/BaseData.php

@@ -12,6 +12,7 @@ namespace App\BusProNet\Model;
  */
 class BaseData
 {
+    /** @param array<array-key, mixed> $items */
     public function __construct(private readonly array $items)
     {
     }
@@ -19,7 +20,7 @@ class BaseData
     /**
      * Retrieves all items in the base data collection.
      *
-     * @return array The complete items array
+     * @return array<array-key, mixed> The complete items array
      */
     public function getItems(): array
     {

src/BusProNet/Model/Booking.php

@@ -36,14 +36,50 @@ class Booking
     public ?string $paymentType = null;
     public ?string $paymentLabel = null;
     public ?BankAccount $bankAccount = null;
+
+    /**
+     * @var array<int, string>
+     */
     public array $participantsStatus = [];
+
+    /**
+     * @var array<int, PersonalData>
+     */
     public array $participants = [];
+
+    /**
+     * @var array<int, Service>
+     */
     public array $transportationServices = [];
+
+    /**
+     * @var array<int, Service>
+     */
     public array $additionalServices = [];
+
+    /**
+     * @var array<int, Room>
+     */
     public array $rooms = [];
-    public array $pickupsOutbound = [];
-    public array $pickupsInbound = [];
+
+    /**
+     * @var array<int, Pickup>
+     */
+    public array $pickups = [];
+
+    /**
+     * @var array<int, Pickup>
+     */
+    public array $dropOffs = [];
+
+    /**
+     * @var array<int, Surcharge>
+     */
     public array $surcharges = [];
+
+    /**
+     * @var array<string|int, Insurance>
+     */
     public array $insurances = [];
     public ?int $invoiceNumber = null;
     public ?float $totalPrice = null;
@@ -136,7 +172,7 @@ class Booking
      * Retrieves pickup service for a specific participant.
      *
      * Finds the pickup service assigned to the specified participant
-     * from the outbound pickup services.
+     * from the pickup services.
      *
      * @param int $participantIndex The participant index to search for
      *
@@ -144,7 +180,7 @@ class Booking
      */
     public function getPickupForParticipant(int $participantIndex): ?Pickup
     {
-        foreach ($this->pickupsOutbound as $pickup) {
+        foreach ($this->pickups as $pickup) {
             if (in_array($participantIndex, $pickup->mapping)) {
                 return $pickup;
             }
@@ -153,6 +189,27 @@ class Booking
         return null;
     }
 
+    /**
+     * Retrieves drop-off service for a specific participant.
+     *
+     * Finds the drop-off service assigned to the specified participant
+     * from the drop-off services (inbound/return direction).
+     *
+     * @param int $participantIndex The participant index to search for
+     *
+     * @return Pickup|null The matching drop-off service or null if not found
+     */
+    public function getDropOffForParticipant(int $participantIndex): ?Pickup
+    {
+        foreach ($this->dropOffs as $dropOff) {
+            if (in_array($participantIndex, $dropOff->mapping)) {
+                return $dropOff;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Gets the insurance assigned to a specific participant.
      *
@@ -163,7 +220,7 @@ class Booking
     public function getInsuranceForParticipant(int $participantIndex): ?Insurance
     {
         foreach ($this->insurances as $insurance) {
-            if (in_array($participantIndex, $insurance->mapping ?? [], true)) {
+            if (in_array($participantIndex, $insurance->mapping, true)) {
                 return $insurance;
             }
         }

src/BusProNet/Model/BookingResponse.php

@@ -16,15 +16,15 @@ namespace App\BusProNet\Model;
 class BookingResponse
 {
     /**
-     * @param string                $status            Booking status (möglich|erfolgt)
-     * @param string|null           $transactionNumber Transaction number (vorgang)
-     * @param array<int, PriceItem> $priceItems        Individual price items from response
-     * @param float|null            $totalPrice        Total price (gesamtpreis)
-     * @param PaymentTerms|null     $paymentTerms      Payment terms (anzahlung/restzahlung)
+     * @param string                $status        Booking status (möglich|erfolgt)
+     * @param int|null              $bookingNumber Booking number (BPN XML: vorgang)
+     * @param array<int, PriceItem> $priceItems    Individual price items from response
+     * @param float|null            $totalPrice    Total price (gesamtpreis)
+     * @param PaymentTerms|null     $paymentTerms  Payment terms (anzahlung/restzahlung)
      */
     public function __construct(
         public readonly string $status,
-        public readonly ?string $transactionNumber = null,
+        public readonly ?int $bookingNumber = null,
         public readonly array $priceItems = [],
         public readonly ?float $totalPrice = null,
         public readonly ?PaymentTerms $paymentTerms = null,
@@ -102,4 +102,48 @@ class BookingResponse
             2
         );
     }
+
+    /**
+     * Gets API-applied discounts that cannot be predicted by the local price calculator.
+     *
+     * The BusProNet API may apply automatic discounts based on business rules that
+     * are not known to the local application, such as:
+     * - ERM/GRU: Gruppenrabatt (group discount for large bookings)
+     * - Other ERM subtypes: Various automatic discounts
+     *
+     * These discounts appear as negative price items with type "ERM" and must be
+     * accounted for when comparing the API total price against the locally calculated price.
+     *
+     * Important: Only ERM type discounts are considered API-applied. Other negative price
+     * items (like BEF transportation discounts) are already handled by the local price
+     * calculator and should not be subtracted again.
+     *
+     * Note: Voucher discounts (AKTION, KULANZGUTSCHEIN) are handled separately via
+     * getVoucherDiscountFromPrices() as they are user-initiated, not automatic.
+     *
+     * @return array<PriceItem> Price items representing API-applied automatic discounts
+     */
+    public function getApiAppliedDiscounts(): array
+    {
+        return array_filter(
+            $this->priceItems,
+            fn (PriceItem $item) => $item->totalPrice < 0 && 'ERM' === $item->type
+        );
+    }
+
+    /**
+     * Gets total discount from API-applied automatic discounts.
+     *
+     * Returns the absolute sum of negative price items that represent automatic
+     * discounts applied by the API (excluding voucher discounts which are handled separately).
+     */
+    public function getApiAppliedDiscountTotal(): float
+    {
+        $discount = 0.0;
+        foreach ($this->getApiAppliedDiscounts() as $item) {
+            $discount += abs($item->totalPrice);
+        }
+
+        return round($discount, 2);
+    }
 }

src/BusProNet/Model/CrmAttributes.php

@@ -12,8 +12,23 @@ namespace App\BusProNet\Model;
  */
 class CrmAttributes
 {
+    /**
+     * @var array<int, CrmSelectionGroup>|null
+     */
     public ?array $selectionGroups = null;
+
+    /**
+     * @var array<int, CrmAction>|null
+     */
     public ?array $crmActions = null;
+
+    /**
+     * @var array<int, string>
+     */
     public array $hotelCodes = [];
+
+    /**
+     * @var array<int, string>
+     */
     public array $roles = [];
 }

src/BusProNet/Model/CrmSelection.php

@@ -15,15 +15,15 @@ use Symfony\Component\Serializer\Attribute\Groups;
  */
 class CrmSelection
 {
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?int $id = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?string $label = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $mutable = false;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $selected = false;
 }

src/BusProNet/Model/CrmSelectionGroup.php

@@ -19,7 +19,7 @@ class CrmSelectionGroup
      * Maps BusPro IDs of CRM selection groups representing
      * included services.
      *
-     * @var array<string, string>
+     * @var array<int, string>
      */
     public static array $includedServicesMapping = [
         7 => 'Skipass',
@@ -32,13 +32,16 @@ class CrmSelectionGroup
         90 => 'Transport',
     ];
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?int $id = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?string $label = null;
 
-    #[Groups(['api:single'])]
+    /**
+     * @var array<int, CrmSelection>|null
+     */
+    #[Groups(['api:single', 'snapshot'])]
     public ?array $selections = null;
 
     /**

src/BusProNet/Model/Error.php

@@ -1,115 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\BusProNet\Model;
-
-/**
- * Represents error codes and messages for the BusProNet API.
- *
- * This class provides a static mapping of error codes to their corresponding
- * German error messages for consistent error handling across the application.
- * Error codes range from 100-999 and cover various API scenarios.
- */
-class Error
-{
-    /**
-     * @var array<int, string>
-     */
-    private static array $errors = [
-        100 => 'Anfrageknoten fehlt',
-        101 => 'Satzknoten fehlt in Anfrageknoten',
-        102 => 'Ungültiger Satztyp [#1#]',
-        103 => 'User fehlt',
-        104 => 'User fehlerhaft',
-        105 => 'Key fehlt',
-        106 => 'Key fehlerhaft',
-        200 => 'Keine Einträge vorhanden',
-        201 => 'Keine Partner zur Auswahl gefunden',
-        202 => 'Keinen Partner mit der ID [#1#] gefunden',
-        203 => 'Ungültiger Termin',
-        300 => 'IDReise fehlt',
-        301 => 'Reise nicht gefunden',
-        302 => 'IDLeistung (Hin & Rück) fehlt',
-        303 => 'IDLeistung passt nicht zu IDReise',
-        304 => 'Es konnte nicht für alle Teilnehmer ein Sitzplatz ermittelt werden',
-        305 => 'Anzahl Personen fehlt',
-        306 => 'Leistungen mit ID #1# nicht gefunden',
-        307 => 'Leistungen mit ID #1# passen nicht zur Reise mit ID #2#',
-        308 => 'Keine Zahlungsarten gefunden',
-        400 => 'IDPartner fehlt',
-        401 => 'Partner nicht gefunden',
-        402 => 'Bis-Termin fehlt',
-        403 => 'Keine Unterbringungsleistungen gefunden',
-        500 => 'Art fehlt',
-        501 => 'Reise- und Buchungszeitraum fehlen',
-        502 => 'Keine Kunden gefunden',
-        600 => 'Keine Gutscheine gefunden',
-        601 => 'Gutschein-IDs fehlen',
-        602 => 'Gutscheine mit ID #1# nicht gefunden',
-        610 => 'Buchungsart fehlt',
-        611 => 'Buchungsart falsch',
-        612 => 'Gutscheinart fehlt',
-        613 => 'Gutscheinart falsch',
-        614 => 'Gutscheinstamm-ID fehlt',
-        615 => 'Gutschein (Stamm) mit ID #1# nicht gefunden',
-        616 => 'Kapazität beim Gutschein #1# nicht ausreichend',
-        617 => 'Rechnungsempfänger fehlt',
-        618 => 'Zahlungsart fehlt',
-        619 => 'Agentur-ID fehlt',
-        620 => 'Agentur mit ID #1# nicht gefunden',
-        650 => '#1#',
-        700 => 'Keine Agenturen gefunden',
-        701 => 'Agentur mit ID #1# nicht gefunden',
-        800 => 'Produkt-ID fehlt',
-        801 => 'Produkt mit ID #1# nicht gefunden',
-        805 => 'Es wurden keine Produkte gefunden',
-        810 => 'Stammdaten (#1#) nicht gefunden',
-        900 => 'Buchungsart fehlt',
-        901 => 'Buchungsart falsch',
-        902 => 'Status fehlt',
-        903 => 'Status falsch',
-        904 => 'Agentur-ID fehlt',
-        905 => 'Agentur mit ID #1# nicht gefunden',
-        906 => 'Reise-ID fehlt',
-        907 => 'Reise mit ID #1# nicht gefunden',
-        908 => 'Reise mit ID #1# ist storniert',
-        909 => 'Beförderungen fehlen',
-        910 => 'Leistung mit ID #1# gehört nicht zur Reise',
-        911 => 'Leistung mit ID #1# gehört nicht zum Produkt',
-        912 => 'Beförderungsleistung für die #1# fehlt',
-        913 => 'Unterbringungen fehlen',
-        914 => 'Partner-ID fehlt',
-        915 => 'Partner mit ID #1# nicht gefunden',
-        916 => 'Ferienziel-Unterbringungen fehlen',
-        917 => 'Ferienziel: Zimmer-IDZ fehlt',
-        918 => 'Ferienziel: Kategorie fehlt',
-        919 => 'Ferienziel: Verpflegungs-ID fehlt',
-        920 => 'Ferienziel: Anreise fehlt',
-        921 => 'Ferienziel: Anreise passt nicht zur Beförderungsleistung (Hinfahrt)',
-        922 => 'Ferienziel: Abreise fehlt',
-        923 => 'Ferienziel: Abreise passt nicht zur Beförderungsleistung (Rückfahrt)',
-        924 => 'Ferienziel: Keine Preise zu den Daten gefunden',
-        925 => 'Ferienziel: Preis zu den Daten nicht gefunden',
-        930 => 'Zustiege fehlen',
-        931 => 'Zustieg mit ID #1# nicht gefunden',
-        932 => 'Zustieg mit ID #1# bei Leistung #2# nicht freigegeben',
-        933 => 'Sitzplan mit ID #1# bei Leistung #2# nicht freigegeben',
-        935 => 'Versicherung mit ID #1# nicht gefunden',
-        940 => 'Zahlungsart fehlt',
-        941 => 'Zahlungsart-ID fehlt',
-        942 => 'Zahlungsart mit ID #1# nicht gültig',
-        950 => 'Anmelder fehlt',
-        951 => 'Teilnehmerliste fehlt',
-        952 => 'Teilnehmer-ID fehlt',
-        960 => 'Preisfehler: Struct #1# / Obj #2#',
-        961 => 'Buchung konnte nicht gespeichert werden',
-        980 => 'Reise ist fürs Internet gesperrt',
-        981 => 'Reise ist nicht mehr buchbar (#1#)',
-        982 => 'Optionsbuchungen nicht zugelassen',
-        983 => 'Anfragebuchung nicht zugelassen',
-        984 => 'Leistung mit ID #1# nicht fürs Internet buchbar',
-        985 => 'Zustieg mit ID #1# nicht fürs Internet buchbar',
-        999 => 'Systemfehler: #1#',
-    ];
-}

src/BusProNet/Model/ExtendedAvailability.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BusProNet\Model;
+
+/**
+ * Extended availability details for one service from VERFUEGBARKEIT2.
+ *
+ * This model augments classic availability with optional timing/date/description
+ * fields used to enrich persisted travel snapshots.
+ */
+class ExtendedAvailability
+{
+    public ?int $serviceId = null;
+    public ?string $status = null;
+    public ?int $available = null;
+    public ?float $price = null;
+    public ?\DateTimeImmutable $dateFrom = null;
+    public ?\DateTimeImmutable $dateTo = null;
+    public ?string $timeFrom = null;
+    public ?string $description = null;
+    public ?int $ageFrom = null;
+    public ?int $ageTo = null;
+    public ?bool $mandatory = null;
+}

src/BusProNet/Model/ExtendedServiceAvailabilityResponse.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BusProNet\Model;
+
+/**
+ * Response model for extended availability endpoint payloads.
+ */
+class ExtendedServiceAvailabilityResponse
+{
+    /**
+     * @param array<int, ExtendedAvailability> $services
+     * @param array<string>                    $allowedBookingStatus
+     */
+    public function __construct(
+        private readonly array $services,
+        public readonly array $allowedBookingStatus = [],
+        public readonly ?string $travelStatus = null,
+    ) {
+    }
+
+    /**
+     * @return array<int, ExtendedAvailability>
+     */
+    public function getServices(): array
+    {
+        return $this->services;
+    }
+}

src/BusProNet/Model/Guide.php

@@ -14,9 +14,9 @@ use Symfony\Component\Serializer\Attribute\Groups;
  */
 class Guide
 {
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?string $name = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?string $phone = null;
 }

src/BusProNet/Model/Hotel.php

@@ -15,24 +15,24 @@ use Symfony\Component\Serializer\Attribute\Groups;
  */
 class Hotel
 {
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $id = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $code = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $name = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $city = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $street = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $phone = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $country = null;
 }

src/BusProNet/Model/PersonalData.php

@@ -31,11 +31,18 @@ class PersonalData
 
     public ?string $salutation = null;
     public ?string $title = null;
+
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
+    #[Assert\Choice(choices: ['M', 'W', 'D'], message: 'Bitte gib einen gültigen Wert an', groups: ['personal_data'])]
     public ?string $gender = null;
+
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
     public ?string $nationality = null;
     public ?string $height = null;
     public ?string $shoeSize = null;
     public ?string $weight = null;
+
+    #[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
     public ?\DateTimeImmutable $dateOfBirth = null;
     public ?string $remarks = null;
 
@@ -49,7 +56,9 @@ class PersonalData
     #[Assert\Valid(groups: ['personal_data'])]
     public Communication $communication;
 
+    /** @var list<string> */
     public array $roles = [];
+    /** @var list<string> */
     public array $hotelCodes = [];
 
     public function __construct()
@@ -71,17 +80,11 @@ class PersonalData
      *
      * @return array<string, mixed> The payload array for API transmission
      */
-    public function toPayload(): array
+    public function toPayload(bool $includeDateOfBirth = true): array
     {
-        // Ensure date of birth is populated
-        if (null === $dob = $this->dateOfBirth) {
-            $dob = new \DateTimeImmutable(self::DEFAULT_AGE_YEARS.' years ago');
-        }
-
-        return [
+        $payload = [
             'idadresse' => $this->addressId,
             'idadresseperson' => $this->personId,
-            'geburtsdatum' => $dob->format('d.m.Y'),
             'anrede' => $this->salutation,
             'geschlecht' => $this->gender,
             'nationalitaet' => $this->nationality,
@@ -95,6 +98,13 @@ class PersonalData
             'sonstiges3' => $this->shoeSize,
             'bemerkung' => $this->remarks,
         ];
+
+        if (true === $includeDateOfBirth) {
+            $dob = $this->dateOfBirth ?? new \DateTimeImmutable(self::DEFAULT_AGE_YEARS.' years ago');
+            $payload['geburtsdatum'] = $dob->format('d.m.Y');
+        }
+
+        return $payload;
     }
 
     public static function fromContactFormSubmission(ContactFormSubmission $dto): self

src/BusProNet/Model/Pickup.php

@@ -17,28 +17,35 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
  */
 class Pickup
 {
-    #[Groups(['api:list'])]
+    #[Groups(['api:list', 'snapshot'])]
     public ?int $id = null;
 
-    #[Groups(['api:list'])]
+    #[Groups(['api:list', 'snapshot'])]
     public ?string $code = null;
 
-    #[Groups(['api:list'])]
+    #[Groups(['api:list', 'snapshot'])]
     public ?string $city = null;
 
-    #[Groups(['api:list'])]
+    #[Groups(['api:list', 'snapshot'])]
     public ?string $postalCode = null;
 
-    #[Groups(['api:list'])]
+    #[Groups(['api:list', 'snapshot'])]
     public ?string $street = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d H:i'])]
     public ?\DateTimeImmutable $time = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?float $price = null;
 
+    #[Groups(['api:single', 'snapshot'])]
+    public ?float $priceOutbound = null;
+
+    #[Groups(['api:single', 'snapshot'])]
+    public ?float $priceInbound = null;
+
+    /** @var list<int> */
     #[Groups(['api:booking'])]
     public array $mapping = [];
 
@@ -90,4 +97,75 @@ class Pickup
 
         return sprintf('%s (€%s)', $label, number_format($this->price, 2, ',', '.'));
     }
+
+    /**
+     * Gets the formatted label with context-aware pricing based on transportation directions.
+     *
+     * Calculates the effective price based on which directions use bus transportation:
+     * - Both directions BUS: shows combined price (outbound + inbound)
+     * - Only outbound BUS: shows outbound price only
+     * - Only inbound BUS: shows inbound price only
+     * - Falls back to legacy price property when split pricing data is unavailable
+     *
+     * @param bool $hasOutboundBus Whether outbound transportation is bus
+     * @param bool $hasInboundBus  Whether inbound transportation is bus
+     *
+     * @return string The formatted pickup label with contextual pricing
+     */
+    public function getLabelWithContextualPrice(bool $hasOutboundBus, bool $hasInboundBus): string
+    {
+        $label = $this->getLabel();
+        $effectivePrice = $this->calculateEffectivePrice($hasOutboundBus, $hasInboundBus);
+
+        if (null === $effectivePrice) {
+            return $label;
+        }
+
+        if (0.0 === $effectivePrice) {
+            return sprintf('%s (inkl.)', $label);
+        }
+
+        if ($effectivePrice < 0) {
+            return sprintf('%s (-%s€ Rabatt)', $label, number_format(abs($effectivePrice), 2, ',', '.'));
+        }
+
+        return sprintf('%s (€%s)', $label, number_format($effectivePrice, 2, ',', '.'));
+    }
+
+    /**
+     * Calculates the effective pickup price based on transportation directions.
+     *
+     * Uses split pricing (priceOutbound/priceInbound) when available, falling back
+     * to the legacy price property for backward compatibility with older data.
+     *
+     * @param bool $hasOutboundBus Whether outbound transportation is bus
+     * @param bool $hasInboundBus  Whether inbound transportation is bus
+     *
+     * @return float|null The calculated effective price or null if no applicable price
+     */
+    public function calculateEffectivePrice(bool $hasOutboundBus, bool $hasInboundBus): ?float
+    {
+        // Neither direction is bus - no pickup price applies
+        if (false === $hasOutboundBus && false === $hasInboundBus) {
+            return null;
+        }
+
+        $effectivePrice = 0.0;
+        $hasSplitPricing = null !== $this->priceOutbound || null !== $this->priceInbound;
+
+        if ($hasOutboundBus) {
+            if ($hasSplitPricing) {
+                $effectivePrice += $this->priceOutbound ?? 0.0;
+            } else {
+                // Fallback to legacy price for backward compatibility
+                $effectivePrice += $this->price ?? 0.0;
+            }
+        }
+
+        if ($hasInboundBus && null !== $this->priceInbound) {
+            $effectivePrice += $this->priceInbound;
+        }
+
+        return $effectivePrice;
+    }
 }

src/BusProNet/Model/RegistrationResponse.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\BusProNet\Model;
 
-class ContactFormResponse
+class RegistrationResponse
 {
     public function __construct(
         public readonly int $addressId,

src/BusProNet/Model/Room.php

@@ -20,19 +20,19 @@ class Room
     public const SELECTION_TYPE_BY_PAX = 'by_pax';
     public const SELECTION_TYPE_BY_ROOM = 'by_room';
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $id = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $category = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $boardId = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $code = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $label = null;
 
     #[Groups(['booking'])]
@@ -46,33 +46,35 @@ class Room
     #[Groups(['booking'])]
     public ?int $totalCount = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $minPax = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $maxPax = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $nights = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $status = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $available = null;
 
     #[Groups(['booking'])]
     public ?string $board = null;
 
+    /** @var list<int> */
     #[Groups(['booking'])]
     public array $mapping = [];
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?float $price = null;
 
     #[Groups(['booking'])]
     public ?float $totalPrice = null;
 
+    /** @var array<int, float|null> */
     #[Groups(['booking'])]
     public array $individualPrice = [];
 

src/BusProNet/Model/Service.php

@@ -17,84 +17,90 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
  */
 class Service
 {
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?int $id = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $category = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $status = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public bool $mandatory = false;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
+    public bool $autoBook = false;
+
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $label = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
     public ?\DateTimeImmutable $dateFrom = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $timeFrom = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $dayTime = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
     public ?\DateTimeImmutable $dateTo = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $subType = null;
 
     #[Groups(['booking'])]
     public ?int $totalCount = null;
 
-    #[Groups(['api:single'])]
+    /** @var list<int> */
+    #[Groups(['api:single', 'snapshot'])]
     public array $mapping = [];
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?float $price = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?float $totalPrice = null;
 
-    #[Groups(['api:single'])]
+    /** @var array<int, float|null> */
+    #[Groups(['api:single', 'snapshot'])]
     public array $individualPrice = [];
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?int $available = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $source = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $direction = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?int $ageFrom = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?int $ageTo = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?int $birthYearFrom = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?int $birthYearTo = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $ageConstraintType = null;
 
+    /** @var array<string, mixed>|null */
     #[Groups(['api:single'])]
     public ?array $ageConstraintMetadata = null;
 
     #[Groups(['api:single'])]
     public ?string $rawAgeConstraintData = null;
 
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public ?string $description = null;
 
     /**
@@ -104,6 +110,6 @@ class Service
      * When false, this service's price is excluded when determining which insurance
      * tier is appropriate for a participant.
      */
-    #[Groups(['api:single', 'api:list'])]
+    #[Groups(['api:single', 'api:list', 'snapshot'])]
     public bool $includeInInsuranceCalculation = true;
 }

src/BusProNet/Model/Surcharge.php

@@ -13,7 +13,9 @@ namespace App\BusProNet\Model;
 class Surcharge
 {
     public ?string $label = null;
+    /** @var list<int> */
     public array $mapping = [];
     public ?float $totalPrice = null;
+    /** @var array<int, float|null> */
     public array $individualPrice = [];
 }

src/BusProNet/Model/Travel.php

@@ -20,40 +20,43 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 class Travel
 {
     use SortByPriceTrait;
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $id = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $code = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $productCode = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
+    public ?int $productId = null;
+
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $label = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?int $hotelId = null;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?Hotel $hotel = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
     public ?\DateTimeImmutable $dateFrom = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
     public ?\DateTimeImmutable $dateTo = null;
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?string $type = null;
 
     /**
      * Travel booking status from BusProNet API.
      * Possible values: 'Frei', 'Anfrage', 'Buchungsstop'.
      */
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?string $status = null;
 
     /**
@@ -62,53 +65,71 @@ class Travel
      *
      * @var array<string>
      */
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public array $allowedBookingStatus = [];
 
-    #[Groups(['api:list', 'api:single'])]
+    #[Groups(['api:list', 'api:single', 'snapshot'])]
     public ?float $priceFrom = null;
 
-    #[Groups(['api:single'])]
+    /**
+     * @var array<int, CrmSelectionGroup>
+     */
+    #[Groups(['api:single', 'snapshot'])]
     public array $selectionGroups = [];
 
-    #[Groups(['api:single'])]
+    /**
+     * @var array<int, Service>
+     */
+    #[Groups(['api:single', 'snapshot'])]
     public array $additionalServices = [];
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $additionalServicesMutable = true;
 
-    #[Groups(['api:single'])]
+    /**
+     * @var array<int, Service>
+     */
+    #[Groups(['api:single', 'snapshot'])]
     public array $transportationServices = [];
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $transportationServicesMutable = true;
 
-    #[Groups(['api:single'])]
-    public array $pickupsOutbound = [];
+    /**
+     * @var array<int, Pickup>
+     */
+    #[Groups(['api:single', 'snapshot'])]
+    public array $pickups = [];
 
-    #[Groups(['api:single'])]
-    public array $pickupsInbound = [];
+    /**
+     * @var array<int, Pickup>
+     */
+    #[Groups(['api:single', 'snapshot'])]
+    public array $dropOffs = [];
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $pickupsMutable = true;
 
-    #[Groups(['api:single'])]
+    /**
+     * @var array<int, Room>
+     */
+    #[Groups(['api:single', 'snapshot'])]
     public array $rooms = [];
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $roomsMutable = true;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $participantDataMutable = true;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public bool $participantCountMutable = true;
 
-    #[Groups(['api:single'])]
+    #[Groups(['api:single', 'snapshot'])]
     public ?Guide $guide = null;
 
     /**
-     * @var array<Insurance> Available insurances for this travel package
+     * @var array<string|int, Insurance> Available insurances for this travel package
      */
     #[Groups(['api:single'])]
     public array $insurances = [];
@@ -182,7 +203,7 @@ class Travel
      * Maps selection group IDs to their corresponding services based on
      * the predefined included services mapping.
      *
-     * @return array<int, Service> The included services from selection groups
+     * @return array<int, CrmSelectionGroup> The included services from selection groups
      */
     public function getIncludedServices(): array
     {

src/BusProNet/Service/BookingStatusRuleRegistry.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BusProNet\Service;
+
+use App\BusProNet\Service\Contract\BookingStatusRuleInterface;
+use App\Form\Model\BookingDto;
+
+/**
+ * Registry for booking status evaluation rules.
+ *
+ * Evaluates registered rules in priority order and returns the first matching
+ * status. Falls back to 'F' when no rule applies.
+ */
+class BookingStatusRuleRegistry
+{
+    private const DEFAULT_STATUS = 'F';
+
+    /**
+     * @var BookingStatusRuleInterface[]
+     */
+    private array $sortedRules;
+
+    /**
+     * @param BookingStatusRuleInterface[] $rules
+     */
+    public function __construct(array $rules)
+    {
+        $this->sortedRules = $this->sortRulesByPriority($rules);
+    }
+
+    public function evaluateStatus(BookingDto $bookingDto): string
+    {
+        foreach ($this->sortedRules as $rule) {
+            if (true === $rule->evaluate($bookingDto)) {
+                return $rule->getStatus();
+            }
+        }
+
+        return self::DEFAULT_STATUS;
+    }
+
+    /**
+     * @param BookingStatusRuleInterface[] $rules
+     *
+     * @return BookingStatusRuleInterface[]
+     */
+    private function sortRulesByPriority(array $rules): array
+    {
+        usort($rules, static fn (
+            BookingStatusRuleInterface $a,
+            BookingStatusRuleInterface $b,
+        ): int => $b->getPriority() <=> $a->getPriority());
+
+        return $rules;
+    }
+}

src/BusProNet/Service/Contract/BookingStatusRuleInterface.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BusProNet\Service\Contract;
+
+use App\Form\Model\BookingDto;
+
+/**
+ * Defines the contract for booking status evaluation rules.
+ *
+ * Rules are evaluated in priority order. The first matching rule determines
+ * the enforced booking status.
+ */
+interface BookingStatusRuleInterface
+{
+    /**
+     * Evaluates whether this rule applies to the given booking.
+     */
+    public function evaluate(BookingDto $bookingDto): bool;
+
+    /**
+     * Returns the status code to assign when this rule matches.
+     */
+    public function getStatus(): string;
+
+    /**
+     * Returns the rule priority (higher values evaluated first).
+     */
+    public function getPriority(): int;
+
+    /**
+     * Returns a human-readable rule description.
+     */
+    public function getDescription(): string;
+}

src/BusProNet/Service/StatusRule/ChaperonServiceStatusRule.php

@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\BusProNet\Service\StatusRule;
+
+use App\BusProNet\Model\Service;
+use App\BusProNet\Service\Contract\BookingStatusRuleInterface;
+use App\Form\Model\BookingDto;
+use App\Form\Model\ParticipantDto;
+
+/**
+ * Status rule for bookings with chaperon (Begleitperson) services.
+ *
+ * Assigns 'Option' status to bookings where any participant has selected any
+ * service containing 'Begleitperson' in its label.
+ */
+class ChaperonServiceStatusRule implements BookingStatusRuleInterface
+{
+    private const STATUS = 'O';
+    private const PRIORITY = 100;
+    private const SEARCH_TERM = 'begleitperson';
+
+    /**
+     * @see BookingStatusRuleInterface::evaluate()
+     */
+    public function evaluate(BookingDto $bookingDto): bool
+    {
+        foreach ($bookingDto->participants as $participant) {
+            if (true === $this->participantHasChaperonService($participant)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function participantHasChaperonService(ParticipantDto $participant): bool
+    {
+        // Check array services
+        $arrayServices = [
+            $participant->additionalServices,
+            $participant->courses,
+            $participant->board,
+            $participant->rentals,
+        ];
+
+        foreach ($arrayServices as $services) {
+            foreach ($services as $service) {
+                if (true === $this->containsSearchTerm($service->label)) {
+                    return true;
+                }
+            }
+        }
+
+        // Check single service properties
+        $singleServices = [
+            $participant->skiPass,
+            $participant->veg,
+        ];
+
+        foreach ($singleServices as $service) {
+            if ($service instanceof Service && true === $this->containsSearchTerm($service->label)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @see BookingStatusRuleInterface::getStatus()
+     */
+    public function getStatus(): string
+    {
+        return self::STATUS;
+    }
+
+    /**
+     * @see BookingStatusRuleInterface::getPriority()
+     */
+    public function getPriority(): int
+    {
+        return self::PRIORITY;
+    }
+
+    /**
+     * @see BookingStatusRuleInterface::getDescription()
+     */
+    public function getDescription(): string
+    {
+        return 'Assigns Option status when a Begleitperson service is selected';
+    }
+
+    /**
+     * Checks if the label contains the search term (case-insensitive).
+     */
+    private function containsSearchTerm(?string $label): bool
+    {
+        if (null === $label) {
+            return false;
+        }
+
+        return false !== stripos($label, self::SEARCH_TERM);
+    }
+}

src/BusProNet/Traits/ApiClientTrait.php

@@ -1,136 +0,0 @@
-<?php
-
-namespace App\BusProNet\Traits;
-
-use App\BusProNet\Exception\ApiClientException;
-use App\BusProNet\Exception\TimeoutException;
-
-trait ApiClientTrait
-{
-    private float $operationStartTime;
-
-    /**
-     * @throws ApiClientException
-     * @throws TimeoutException
-     */
-    private function connect(string $host, int $port, int $maxRetries = 25, int $connectionTimeout = 5, int $streamTimeout = 30, int $totalTimeout = 45)
-    {
-        $this->operationStartTime = microtime(true);
-
-        $tries = 1;
-        $errNo = $errStr = '';
-        $errorCodesForRetry = [
-            SOCKET_ECONNREFUSED,
-            SOCKET_EBADF,
-        ];
-
-        $openSocket = function (&$errNo, &$errStr) use ($host, $port, $connectionTimeout) {
-            return @fsockopen(
-                $host,
-                $port,
-                $errNo,
-                $errStr,
-                $connectionTimeout
-            );
-        };
-
-        $socket = $openSocket($errNo, $errStr);
-
-        while (false === $socket && true === in_array($errNo, $errorCodesForRetry) && $maxRetries > $tries) {
-            // Check if we've exceeded total timeout during retries
-            if (microtime(true) - $this->operationStartTime > $totalTimeout) {
-                $this->logger->error('Connection retry timeout exceeded', [
-                    'elapsed_time' => microtime(true) - $this->operationStartTime,
-                    'total_timeout' => $totalTimeout,
-                ]);
-                throw new TimeoutException('Connection timeout exceeded during retries');
-            }
-
-            $this->logger->warning('Could not connect to socket, retrying', [
-                'error_message' => $errStr,
-                'error_number' => $errNo,
-                'attempt' => $tries,
-            ]);
-            ++$tries;
-            sleep(1);
-            $socket = $openSocket($errNo, $errStr);
-        }
-
-        if (false !== $socket) {
-            stream_set_timeout($socket, $streamTimeout);
-        } else {
-            $this->logger->error('Unable to open socket', [
-                'error_message' => $errStr,
-                'error_number' => $errNo,
-                'elapsed_time' => microtime(true) - $this->operationStartTime,
-            ]);
-            throw new ApiClientException('Unable to open socket');
-        }
-
-        return $socket;
-    }
-
-    /**
-     * @throws TimeoutException
-     */
-    private function send($socket, string $data, int $totalTimeout): void
-    {
-        // Check total timeout before sending
-        if (microtime(true) - $this->operationStartTime > $totalTimeout) {
-            $this->logger->error('Total timeout exceeded before send', [
-                'elapsed_time' => microtime(true) - $this->operationStartTime,
-            ]);
-            throw new TimeoutException('Total operation timeout exceeded before send');
-        }
-
-        // message length is prepended to actual message
-        $send = sprintf('%010s', strlen($data)).$data;
-        fwrite($socket, $send);
-    }
-
-    /**
-     * @throws TimeoutException
-     */
-    private function receive($socket, int $totalTimeout): string
-    {
-        $response = '';
-        $readAttempts = 0;
-
-        while (false === feof($socket)) {
-            // Check total timeout before each read
-            $elapsedTime = microtime(true) - $this->operationStartTime;
-            if ($elapsedTime > $totalTimeout) {
-                $this->logger->error('Total timeout exceeded during receive', [
-                    'elapsed_time' => $elapsedTime,
-                    'total_timeout' => $totalTimeout,
-                    'bytes_received' => strlen($response),
-                    'read_attempts' => $readAttempts,
-                ]);
-                throw new TimeoutException('Total operation timeout exceeded while receiving data');
-            }
-
-            $chunk = fread($socket, 4096);
-            ++$readAttempts;
-
-            // Check if stream timed out on this specific read
-            $metadata = stream_get_meta_data($socket);
-            if (true === $metadata['timed_out']) {
-                $this->logger->error('Stream read timeout detected', [
-                    'elapsed_time' => $elapsedTime,
-                    'bytes_received' => strlen($response),
-                    'read_attempts' => $readAttempts,
-                ]);
-                throw new TimeoutException('Stream timeout while reading from socket');
-            }
-
-            $response .= $chunk;
-        }
-
-        return $response;
-    }
-
-    private function disconnect($socket): void
-    {
-        @fclose($socket);
-    }
-}

src/BusProNet/Traits/SortByPriceTrait.php

@@ -28,9 +28,9 @@ trait SortByPriceTrait
      * collections in the application. Items are sorted from lowest to highest price,
      * with null prices being treated as zero (appearing first).
      *
-     * @param array $items Array of objects with a price property to sort
+     * @param array<array-key, object> $items Array of objects with a price property to sort
      *
-     * @return array The sorted array of objects (ascending by price)
+     * @return array<array-key, object> The sorted array of objects (ascending by price)
      */
     protected function sortByPrice(array $items): array
     {