diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php index 589f883803..6c51ad393c 100644 --- a/app/controllers/GoogleChartController.php +++ b/app/controllers/GoogleChartController.php @@ -449,7 +449,7 @@ class GoogleChartController extends BaseController /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $rcr */ $rcr = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction'); - $recurring = $rcr->get(); + $recurring = $rcr->getActive(); /** @var \RecurringTransaction $entry */ foreach ($recurring as $entry) { diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php index d8a0414204..4dc53d136c 100644 --- a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php +++ b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php @@ -16,7 +16,7 @@ use Illuminate\Support\MessageBag; * * @package FireflyIII\Database */ -class PiggyBank implements CUD, CommonDatabaseCalls, PiggybankInterface +class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface { use SwitchUser; diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggybankInterface.php b/app/lib/FireflyIII/Database/PiggyBank/PiggybankInterface.php index 33ac058796..dbcbea2635 100644 --- a/app/lib/FireflyIII/Database/PiggyBank/PiggybankInterface.php +++ b/app/lib/FireflyIII/Database/PiggyBank/PiggybankInterface.php @@ -3,11 +3,11 @@ namespace FireflyIII\Database\PiggyBank; /** - * Interface PiggybankInterface + * Interface PiggyBankInterface * * @package FireflyIII\Database\Ifaces */ -interface PiggybankInterface +interface PiggyBankInterface { /** diff --git a/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php b/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php index 550ab79740..1792b5fdba 100644 --- a/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php +++ b/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php @@ -18,7 +18,7 @@ use Illuminate\Support\MessageBag; * * @package FireflyIII\Database */ -class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface +class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggyBankInterface { use SwitchUser; diff --git a/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php b/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php index 2616773d73..80068ac6fd 100644 --- a/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php +++ b/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php @@ -211,6 +211,16 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac throw new NotImplementedException; } + /** + * Returns all objects. + * + * @return Collection + */ + public function getActive() + { + return $this->getUser()->recurringtransactions()->where('active', 1)->get(); + } + /** * @param \RecurringTransaction $recurring * @param Carbon $start