diff --git a/app/Http/Middleware/Reminders.php b/app/Http/Middleware/Reminders.php index 5e611ebbe6..556cc8f6b7 100644 --- a/app/Http/Middleware/Reminders.php +++ b/app/Http/Middleware/Reminders.php @@ -14,6 +14,7 @@ use Closure; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\Reminder; use Illuminate\Contracts\Auth\Guard; +use Log; use Navigation; /** @@ -60,8 +61,14 @@ class Reminders /** @var PiggyBank $piggyBank */ foreach ($piggyBanks as $piggyBank) { + $startDate = is_null($piggyBank->startdate) ? 'null' : $piggyBank->startdate->format('d M Y'); + $targetDate = is_null($piggyBank->targetdate) ? 'null' : $piggyBank->targetdate->format('d M Y'); + Log::debug('PiggyBank: #' . $piggyBank->id . ', name: ' . $piggyBank->name); + Log::debug('Startdate: ' . $startDate . ', target date: ' . $targetDate); + if (!is_null($piggyBank->targetdate)) { // count back until now. + // echo 'Count back!
'; $start = $piggyBank->targetdate; $end = $piggyBank->startdate; @@ -69,21 +76,27 @@ class Reminders $currentEnd = clone $start; $start = Navigation::subtractPeriod($start, $piggyBank->reminder, 1); $currentStart = clone $start; + Log::debug('Now range: [' . $currentStart->format('d M Y') . '] to [' . $currentEnd->format('d M Y') . ']'); + // for today? if ($today < $currentEnd && $today > $currentStart) { + Log::debug('Today!'); + // find a reminder first? $reminders = $this->auth->user()->reminders() ->where('remindersable_id', $piggyBank->id) ->onDates($currentStart, $currentEnd) ->count(); + Log::debug('Found ' . $reminders . ' reminders'); + if ($reminders == 0) { // create a reminder here! + Log::debug('create reminder!'); $repository->createReminder($piggyBank, $currentStart, $currentEnd); } // stop looping, we're done. break; } - } } else { $start = clone $piggyBank->startdate; @@ -91,7 +104,7 @@ class Reminders $currentStart = clone $start; $start = Navigation::addPeriod($start, $piggyBank->reminder, 0); $currentEnd = clone $start; - + Log::debug('Now range: [' . $currentStart->format('d M Y') . '] to [' . $currentEnd->format('d M Y') . ']'); // for today? if ($today < $currentEnd && $today > $currentStart) { @@ -99,19 +112,18 @@ class Reminders ->where('remindersable_id', $piggyBank->id) ->onDates($currentStart, $currentEnd) ->count(); + Log::debug('Found ' . $reminders . ' reminders'); if ($reminders == 0) { // create a reminder here! + Log::debug('create reminder!'); $repository->createReminder($piggyBank, $currentStart, $currentEnd); } } - - } } } - } return $next($request);