IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Expanded the selection of reminders.

Browse Source
This commit is contained in:
James Cole 2014-11-18 01:53:52 +01:00
parent d34b49bd48
commit 7e8f5c9548
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,12 +20,13 @@ class Reminders
* @return int * @return int
* @throws FireflyException * @throws FireflyException
*/ */
public function amountForReminder(\Reminder $reminder) { public function amountForReminder(\Reminder $reminder)
{
/** @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');
switch(get_class($reminder->remindersable)) { switch (get_class($reminder->remindersable)) {
case 'Piggybank': case 'Piggybank':
$start = new Carbon; $start = new Carbon;
@ -40,16 +41,16 @@ class Reminders
*/ */
$repetition = $reminder->remindersable->currentRelevantRep(); $repetition = $reminder->remindersable->currentRelevantRep();
$leftToSave = floatval($reminder->remindersable->targetamount) - floatval($repetition->currentamount); $leftToSave = floatval($reminder->remindersable->targetamount) - floatval($repetition->currentamount);
$reminders = $reminders == 0 ? 1 : $reminders; $reminders = $reminders == 0 ? 1 : $reminders;
return $leftToSave / $reminders; return $leftToSave / $reminders;
break; break;
default: default:
throw new FireflyException('Cannot handle class '. get_class($reminder->remindersable).' in amountForReminder.'); throw new FireflyException('Cannot handle class ' . get_class($reminder->remindersable) . ' in amountForReminder.');
break; break;
} }
return 50; return 50;
} }
@ -58,7 +59,12 @@ class Reminders
*/ */
public function getReminders() public function getReminders()
{ {
$reminders = \Auth::user()->reminders()->get(); $reminders = \Auth::user()->reminders()
->where('active', 1)
->where('startdate', '<=', Carbon::now()->format('Y-m-d'))
->where('enddate', '>=', Carbon::now()->format('Y-m-d'))
->get();
return $reminders; return $reminders;
// $reminders = \Auth::user()->reminders()->where('active', true)->get(); // $reminders = \Auth::user()->reminders()->where('active', true)->get();
// $return = []; // $return = [];