IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-31 19:27:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Match methods

Browse Source
This commit is contained in:
James Cole 2014-08-19 15:30:19 +02:00
parent f00dfd2859
commit eacad20f51
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/Piggybank.php
View File

@ -242,6 +242,9 @@ class Piggybank extends Ardent
{
$query = $this->piggybankrepetitions()
->where(
function ($q) use ($date) {
$q->where(
function ($q) use ($date) {
$q->whereNull('startdate');
$q->orWhere('startdate', '<=', $date->format('Y-m-d'));
@ -253,6 +256,13 @@ class Piggybank extends Ardent
$q->orWhere('targetdate', '>=', $date->format('Y-m-d'));
}
);
}
)->orWhere(
function ($q) use ($date) {
$q->where('startdate', '>=', $date->format('Y-m-d'));
$q->where('targetdate', '>=', $date->format('Y-m-d'));
}
)->orderBy('startdate', 'ASC');
$result = $query->first();
return $result;