kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-18 20:38:57 +00:00
Code Issues Projects Releases Wiki Activity

Lots of new stuff.

Browse Source
This commit is contained in:
James Cole
2014-11-24 10:12:34 +01:00
parent 4456ef2326
commit bfda4bc199
12 changed files with 467 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/lib/FireflyIII/Shared/Toolkit/Date.php
View File

@@ -82,12 +82,14 @@ class Date
case 'monthly':
$currentEnd->addMonth()->subDay();
break;
case 'quarter':
case 'quarterly':
$currentEnd->addMonths(3)->subDay();
break;
case 'half-year':
$currentEnd->addMonths(6)->subDay();
break;
case 'year':
case 'yearly':
$currentEnd->addYear()->subDay();
break;
@@ -154,6 +156,7 @@ class Date
$date->addMonths(6);
}
break;
case 'year':
case 'yearly':
$date->startOfYear();
break;

7
app/lib/FireflyIII/Shared/Toolkit/Reminders.php
View File

@@ -71,8 +71,13 @@ class Reminders
/** @var \FireflyIII\Database\Piggybank $repository */
$repository = \App::make('FireflyIII\Database\Piggybank');
/** @var \FireflyIII\Database\Piggybank $repeatedRepository */
$repeatedRepository = \App::make('FireflyIII\Database\RepeatedExpense');
/** @var Collection $piggybanks */
$piggybanks = $repository->get();
$piggybanks = $repository->get()->merge($repeatedRepository->get());
$set = $piggybanks->filter(
function (\Piggybank $piggybank) {
if (!is_null($piggybank->reminder)) {