From 7b835efe8405b2f734f7e6b0d5c465967e4301e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Tue, 17 Sep 2024 11:27:13 +0200
Subject: [PATCH] fix: adopt extended service subtypes in MyE&P

---
 .../Private/Assets/js/myep/BookingEdit.vue         | 14 +++++++-------
 .../Assets/js/myep/components/ServiceSelect.vue    |  5 ++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
index aca156ff..7387e178 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
@@ -108,7 +108,7 @@
                                               v-on:selected="onAccommodationSelected($event, index)"
                         />
                         <service-select v-for="subType in servicesSubTypes"
-                                        :key="subType.code"
+                                        :key="subType.label"
                                         :sub-type="subType"
                                         :services="services.other"
                                         :participant="participant"
@@ -219,12 +219,12 @@
                 contingents: null,
                 services: null,
                 servicesSubTypes: [
-                  { 'code': 'KUR', 'label': 'Kurse' },
-                  { 'code': 'SON', 'label': 'Zusatzleistungen' },
-                  { 'code': 'SPA', 'label': 'Skipass' },
-                  { 'code': 'VPF', 'label': 'Verpflegung' },
-                  { 'code': 'VER', 'label': 'Verleih' },
-                  { 'code': 'EIN', 'label': '???' }
+                  { 'codes': ['KUR'], 'label': 'Kurse' },
+                  { 'codes': ['SON'], 'label': 'Zusatzleistungen' },
+                  { 'codes': ['SPA'], 'label': 'Skipass' },
+                  { 'codes': ['VPF'], 'label': 'Verpflegung' },
+                  { 'codes': ['VER', 'VE2', 'VE3', 'VE4', 'VE5', 'VE6', 'VE7', 'VE8'], 'label': 'Verleih' },
+                  { 'codes': ['EIN'], 'label': '???' }
                 ],
                 modal: {
                     title: 'Hinweis',
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServiceSelect.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServiceSelect.vue
index f9ee158a..3d4bebda 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServiceSelect.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServiceSelect.vue
@@ -72,7 +72,10 @@
             availableServices () {
                 let filteredServices = {};
                 for (let id of Object.keys(this.services)) {
-                    if (this.services[id].subType !== undefined && this.services[id].subType !== this.subType.code) {
+                    if (this.services[id].subType === undefined) {
+                        continue;
+                    }
+                    if (!this.subType.codes.includes(this.services[id].subType)) {
                         continue;
                     }
                     filteredServices[id] = this.services[id];