Merge branch 'develop'

public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue

@@ -101,6 +101,14 @@
                                 <th>Beförderung</th>
                                 <td>{{ getSelectedServicesLabels(participant.transportationIds, services.transportation) }}</td>
                             </tr>
+                            <tr v-if="participant.surcharges.length > 0">
+                              <th>Zuschläge</th>
+                              <td>
+                                <p v-for="surcharge in participant.surcharges">
+                                  {{ surcharge.priceSingle.toFixed(2) }} € ({{ surcharge.name }})
+                                </p>
+                              </td>
+                            </tr>
                             <tr>
                                 <th>Gesamtpreis</th>
                                 <td>{{ calculateSinglePrice(participant).toFixed(2) }} €</td>
@@ -307,6 +315,9 @@
                 if ('S' === participant.data.status && participant.data.cancellationFee) {
                     singlePrice += participant.data.cancellationFee;
                 }
+                for (let surcharge of participant.surcharges) {
+                    singlePrice += surcharge.priceSingle
+                }
                 return singlePrice;
             },
             onAccommodationSelected (accommodation, index) {

public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ContingentsOverview.vue

@@ -25,7 +25,7 @@
         },
         props: {
             contingents: {
-                type: Object,
+                type: Array,
                 required: true
             }
         }