diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index f5c8adc2eb..b1530b08ca 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -19,7 +19,6 @@ use FireflyIII\Support\FireflyConfig; use FireflyIII\Support\Navigation; use FireflyIII\Support\Preferences; use FireflyIII\Support\Steam; -use FireflyIII\Support\Twig\Budget; use FireflyIII\Support\Twig\General; use FireflyIII\Support\Twig\Journal; use FireflyIII\Support\Twig\PiggyBank; @@ -51,7 +50,6 @@ class FireflyServiceProvider extends ServiceProvider Twig::addExtension(new PiggyBank); Twig::addExtension(new General); Twig::addExtension(new Journal); - Twig::addExtension(new Budget); Twig::addExtension(new Translation); Twig::addExtension(new Transaction); Twig::addExtension(new Rule); diff --git a/app/Support/Twig/Budget.php b/app/Support/Twig/Budget.php deleted file mode 100644 index a01f27b44e..0000000000 --- a/app/Support/Twig/Budget.php +++ /dev/null @@ -1,68 +0,0 @@ -addProperty($repetition->id); - $cache->addProperty('spentInRepetition'); - if ($cache->has()) { - return $cache->get(); - } - $sum - = auth()->user()->transactionJournals() - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') - ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->before($repetition->enddate) - ->after($repetition->startdate) - ->where('limit_repetitions.id', '=', $repetition->id) - ->get(['transaction_journals.*'])->sum('amount'); - $cache->store($sum); - - return $sum; - } - ); - - return $functions; - - } - - /** - * {@inheritDoc} - */ - public function getName(): string - { - return 'FireflyIII\Support\Twig\Budget'; - } -} diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 1dd261c23c..b2dfda8831 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -40,7 +40,6 @@ class General extends Twig_Extension { return [ $this->formatAmount(), - $this->formatTransaction(), $this->formatAmountPlain(), $this->formatJournal(), $this->balance(), @@ -236,18 +235,6 @@ class General extends Twig_Extension ); } - /** - * @return Twig_SimpleFilter - */ - protected function formatTransaction(): Twig_SimpleFilter - { - return new Twig_SimpleFilter( - 'formatTransaction', function (Transaction $transaction) : string { - return app('amount')->formatTransaction($transaction); - }, ['is_safe' => ['html']] - ); - } - /** * @return Twig_SimpleFilter */