diff --git a/app/models/LimitRepetition.php b/app/models/LimitRepetition.php index 651b5dd40e..750191030a 100644 --- a/app/models/LimitRepetition.php +++ b/app/models/LimitRepetition.php @@ -119,38 +119,4 @@ class LimitRepetition extends Ardent } } - /** - * TODO remove this method in favour of something in the FireflyIII libraries. - * - * Same as above, just with a more natural view. So "March 2012". - */ - public function periodShow() - { - if (is_null($this->repeat_freq)) { - $this->repeat_freq = $this->limit->repeat_freq; - } - switch ($this->repeat_freq) { - default: - throw new FireflyException('No date formats for frequency "' . $this->repeat_freq . '"!'); - break; - case 'daily': - return $this->startdate->format('j F Y'); - break; - case 'weekly': - return $this->startdate->format('\W\e\e\k W, Y'); - break; - case 'monthly': - return $this->startdate->format('F Y'); - break; - case 'half-year': - case 'quarterly': - return $this->startdate->format('M Y') . ' - ' . $this->enddate->format('M Y'); - break; - case 'yearly': - return $this->startdate->format('Y'); - break; - } - } - - } \ No newline at end of file diff --git a/app/models/Piggybank.php b/app/models/Piggybank.php index a0580c14c9..e69a85d689 100644 --- a/app/models/Piggybank.php +++ b/app/models/Piggybank.php @@ -53,7 +53,7 @@ class Piggybank extends Ardent 'startdate' => 'date', // when you started 'targetdate' => 'date', // when its due 'repeats' => 'required|boolean', // does it repeat? - 'rep_length' => 'in:day,week,month,year', // how long is the period? + 'rep_length' => 'in:day,week,month,quarter,year', // how long is the period? 'rep_every' => 'required|min:1|max:100', // how often does it repeat? every 3 years. 'rep_times' => 'min:1|max:100', // how many times do you want to save this amount? eg. 3 times 'reminder' => 'in:day,week,month,year', // want a reminder to put money in this? diff --git a/app/models/PiggybankRepetition.php b/app/models/PiggybankRepetition.php index 8d20be1873..ef9557bfa1 100644 --- a/app/models/PiggybankRepetition.php +++ b/app/models/PiggybankRepetition.php @@ -1,6 +1,7 @@ belongsTo('Piggybank'); } + public function scopeStarts(Builder $query, Carbon $date) { + $query->where('startdate',$date->format('Y-m-d')); + } + public function scopeTargets(Builder $query, Carbon $date) { + $query->where('targetdate',$date->format('Y-m-d')); + } + } \ No newline at end of file