From 21181552e58a9a6e23ee62ada28a2f8d87cc8955 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 8 Apr 2018 00:12:31 +0300 Subject: [PATCH] Revert recurrence change --- app/Models/Traits/HasRecurrence.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Models/Traits/HasRecurrence.php b/app/Models/Traits/HasRecurrence.php index a81ef8cc0280..87cab5187c19 100644 --- a/app/Models/Traits/HasRecurrence.php +++ b/app/Models/Traits/HasRecurrence.php @@ -14,7 +14,6 @@ trait HasRecurrence /** * @return bool */ - /* public function shouldSendToday() { if (! $this->user->confirmed) { @@ -79,8 +78,8 @@ trait HasRecurrence return false; } - */ + /* public function shouldSendToday() { if (! $this->user->confirmed) { @@ -115,6 +114,7 @@ trait HasRecurrence return $this->account->getDateTime() >= $nextSendDate; } } + */ /** * @throws \Recurr\Exception\MissingData @@ -154,7 +154,8 @@ trait HasRecurrence */ public function getNextSendDate() { - if (! $this->is_public) { + // expenses don't have an is_public flag + if ($this->is_recurring && ! $this->is_public) { return null; }