Added helper methods for first and last day of month.

Sub-bookings are now showed in the bookings index view.
This commit is contained in:
Lukas Halbritter
2018-10-01 09:56:55 +02:00
parent 491a6f6153
commit 8f865e9bff
2 changed files with 34 additions and 10 deletions
+6 -8
View File
@@ -29,7 +29,7 @@
<tr style='color: red; font-weight: bold'>
<td></td>
<td></td>
<td>{{ $year . '-' . sprintf('%02d', $month) . '-01'}}</td>
<td>{{ startOfMonth($year, $month) }}</td>
<td>Saldo</td>
<td></td>
<td></td>
@@ -71,7 +71,7 @@
</td>
</tr>
@if (!$booking->isSimple())
@foreach ($booking->subBookings() as $subBooking)
@foreach ($booking->subBookings as $subBooking)
<tr>
<td>+</td>
<td></td>
@@ -80,12 +80,12 @@
<td></td>
<td align='right'>
@if ($subBooking->signedAmount() < 0)
{{ formatAmount($subBooking->signedAmount) }}
{{ formatAmount($subBooking->signedAmount()) }}
@endif
</td>
<td align='right'>
@if ($subBooking->signedAmount() >= 0)
{{ formatAmount($subBooking->signedAmount) }}
{{ formatAmount($subBooking->signedAmount()) }}
@endif
</td>
<td>
@@ -103,8 +103,7 @@
<td></td>
<td></td>
<td>
{{ $year . '-' . sprintf('%02d', $month) . '-' .
cal_days_in_month(CAL_GREGORIAN, $month, $year) }}
{{ endOfMonth($year, $month) }}
</td>
<td>Monatsabschluss</td>
<td></td>
@@ -117,8 +116,7 @@
<td></td>
<td></td>
<td>
{{ $year . '-' . sprintf('%02d', $month) . '-' .
cal_days_in_month(CAL_GREGORIAN, $month, $year) }}
{{ endOfMonth($year, $month) }}
</td>
<td>Saldo</td>
<td></td>