kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 06:38:09 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up.

Browse Source
This commit is contained in:
James Cole
2015-03-29 08:18:15 +02:00
parent afb47eb742
commit bfe8b14e49
3 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -3,7 +3,6 @@
composer.phar composer.phar
Thumbs.db Thumbs.db
.idea/ .idea/
.DS_Store
tests/_output/* tests/_output/*
_ide_helper.php _ide_helper.php
/build/logs/clover.xml /build/logs/clover.xml

1
app/Models/PiggyBank.php
View File

@@ -45,7 +45,6 @@ class PiggyBank extends Model
return $rep; return $rep;
} else { } else {
Log::error('Tried to work with a piggy bank with a repeats=1 value! (id is '.$this->id.')'); Log::error('Tried to work with a piggy bank with a repeats=1 value! (id is '.$this->id.')');
//App::abort(500);
} }

51
app/Models/PiggyBankRepetition.php
View File

@@ -1,8 +1,9 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
/** /**
* Class PiggyBankRepetition * Class PiggyBankRepetition
* *
@@ -27,27 +28,6 @@ class PiggyBankRepetition extends Model
return $this->belongsTo('FireflyIII\Models\PiggyBank'); return $this->belongsTo('FireflyIII\Models\PiggyBank');
} }
/**
* @param EloquentBuilder $query
* @param Carbon $date
*
* @return mixed
*/
public function scopeRelevantOnDate(EloquentBuilder $query, Carbon $date)
{
return $query->where(
function($q) use ($date) {
$q->where('startdate', '<=', $date->format('Y-m-d 00:00:00'));
$q->orWhereNull('startdate');
})
->where(function($q) use ($date) {
$q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00'));
$q->orWhereNull('targetdate');
});
}
/** /**
* @param EloquentBuilder $query * @param EloquentBuilder $query
* @param Carbon $start * @param Carbon $start
@@ -57,7 +37,30 @@ class PiggyBankRepetition extends Model
*/ */
public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $target) public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $target)
{ {
return $query->where('startdate',$start->format('Y-m-d'))->where('targetdate',$target->format('Y-m-d')); return $query->where('startdate', $start->format('Y-m-d'))->where('targetdate', $target->format('Y-m-d'));
}
/**
* @param EloquentBuilder $query
* @param Carbon $date
*
* @return mixed
*/
public function scopeRelevantOnDate(EloquentBuilder $query, Carbon $date)
{
return $query->where(
function (EloquentBuilder $q) use ($date) {
$q->where('startdate', '<=', $date->format('Y-m-d 00:00:00'));
$q->orWhereNull('startdate');
}
)
->where(
function (EloquentBuilder $q) use ($date) {
$q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00'));
$q->orWhereNull('targetdate');
}
);
} }
} }