1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00

Revert recurrence change

This commit is contained in:
Hillel Coren 2018-04-08 00:11:42 +03:00
parent 8d210a18cd
commit 889ffb431a

View File

@ -14,7 +14,6 @@ trait HasRecurrence
/** /**
* @return bool * @return bool
*/ */
/*
public function shouldSendToday() public function shouldSendToday()
{ {
if (! $this->user->confirmed) { if (! $this->user->confirmed) {
@ -79,8 +78,8 @@ trait HasRecurrence
return false; return false;
} }
*/
/*
public function shouldSendToday() public function shouldSendToday()
{ {
if (! $this->user->confirmed) { if (! $this->user->confirmed) {
@ -115,6 +114,7 @@ trait HasRecurrence
return $this->account->getDateTime() >= $nextSendDate; return $this->account->getDateTime() >= $nextSendDate;
} }
} }
*/
/** /**
* @throws \Recurr\Exception\MissingData * @throws \Recurr\Exception\MissingData
@ -154,7 +154,8 @@ trait HasRecurrence
*/ */
public function getNextSendDate() public function getNextSendDate()
{ {
if (! $this->is_public) { // expenses don't have an is_public flag
if ($this->is_recurring && ! $this->is_public) {
return null; return null;
} }