EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2021-03-31 14:56:19 +02:00
parent cdf4c02f05 571bba47f1
commit 7ed8105a24
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
+2 -2
View File
@@ -17,7 +17,7 @@
</div> </div>
<div> <div>
<mutable-fields :mutable-fields="mutableFields"></mutable-fields> <mutable-fields :mutable-fields="mutableFields"></mutable-fields>
<contingents-overview :contingents="contingents"/> <contingents-overview :contingents="bookingData.accomodations"/>
<panel title="Beförderungsart (alle Teilnehmer)" :body="true"> <panel title="Beförderungsart (alle Teilnehmer)" :body="true">
<transportation-select :services="services.transportation" <transportation-select :services="services.transportation"
:initial-transportation-ids="bookingData.selectedTransportationIds" :initial-transportation-ids="bookingData.selectedTransportationIds"
@@ -76,7 +76,7 @@
<participant-sizes-form :services="services.other" <participant-sizes-form :services="services.other"
:participant="participant" :participant="participant"
:mutable="mutableFields.services.mutable" :mutable="mutableFields.services.mutable"
v-on:updated="[onParticipantDataUpdated($event, index)]" v-on:updated="onParticipantDataUpdated($event, index)"
/> />
<pickup-select <pickup-select
:pickups="services.pickups" :pickups="services.pickups"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ContingentsOverview.vue
+3 -3
View File
@@ -1,5 +1,5 @@
<template> <template>
<panel title="Kontingente" :body="true"> <panel title="Gebuchte Kontingente" :body="true">
<table class="table table-condensed"> <table class="table table-condensed">
<colgroup> <colgroup>
<col style="width: 75%"> <col style="width: 75%">
@@ -7,8 +7,8 @@
</colgroup> </colgroup>
<tbody> <tbody>
<tr v-for="contingent in contingents" :key="contingent.id"> <tr v-for="contingent in contingents" :key="contingent.id">
<th>{{ contingent.name }}</th> <th>{{ contingent.room }}</th>
<td><span class="label" :class="contingent.available > 0 ? 'label-success' : 'label-danger'">{{ contingent.available >= 0 ? contingent.available : 0 }}</span></td> <td>{{ contingent.count }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>