Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2019-10-24 14:34:57 +02:00
@@ -17,15 +17,15 @@
</thead> </thead>
<tbody> <tbody>
<tr v-for="event of events"> <tr v-for="event of events">
<td>{{ formatBookingDate(event.dateBooking) }}</td> <td>{{ formatBookingDate(event.buchungsdatum) }}</td>
<td>{{ event.dateTravel | date }}</td> <td>{{ event.reisedatum | date }}</td>
<td>{{ event.product }}</td> <td>{{ event.reise }}</td>
<td> <td>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li v-for="customer in event.customers">{{ customer.lastName }}, {{ customer.firstName }}</li> <li v-for="customer in event.customers">{{ customer.name }}, {{ customer.vorname }}</li>
</ul> </ul>
</td> </td>
<td style="white-space: nowrap">{{ event.price }} </td> <td style="white-space: nowrap">{{ event.preis }} </td>
<td style="white-space: nowrap">{{ calculateBalance(event) }}</td> <td style="white-space: nowrap">{{ calculateBalance(event) }}</td>
<td>{{ status[event.status] }}</td> <td>{{ status[event.status] }}</td>
<td> <td>