kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Display bug for piggy banks with no reminders.

Browse Source
This commit is contained in:
James Cole
2014-11-16 10:36:23 +01:00
parent 2d9c89375a
commit 8c254554eb
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/Piggybank.php
View File

@@ -74,6 +74,10 @@ class Piggybank extends Ardent
/** @var \FireflyIII\Shared\Toolkit\Date $dateKit */ /** @var \FireflyIII\Shared\Toolkit\Date $dateKit */
$dateKit = App::make('FireflyIII\Shared\Toolkit\Date'); $dateKit = App::make('FireflyIII\Shared\Toolkit\Date');
if(is_null($this->reminder)) {
return 0;
}
$start = new Carbon; $start = new Carbon;
$end = !is_null($this->targetdate) ? clone $this->targetdate : new Carbon; $end = !is_null($this->targetdate) ? clone $this->targetdate : new Carbon;
$reminders = 0; $reminders = 0;

20
app/views/piggybanks/show.blade.php
View File

@@ -70,6 +70,7 @@
@endif @endif
</td> </td>
</tr> </tr>
@if(!is_null($piggybank->reminder))
<tr> <tr>
<td>Reminder</td> <td>Reminder</td>
<td> <td>
@@ -84,14 +85,17 @@
@endif @endif
</td> </td>
</tr> </tr>
<tr> @endif
<td>Reminders left</td> @if($remindersCount > 0)
<td>{{$remindersCount}}</td> <tr>
</tr> <td>Reminders left</td>
<tr> <td>{{$remindersCount}}</td>
<td>Expected amount per reminder</td> </tr>
<td>{{mf($amountPerReminder)}}</td> <tr>
</tr> <td>Expected amount per reminder</td>
<td>{{mf($amountPerReminder)}}</td>
</tr>
@endif
</table> </table>
</div> </div>
</div> </div>