kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-01 11:31:06 +00:00
Code Issues Projects Releases Wiki Activity

Build a new collector and first view online.

Browse Source
This commit is contained in:
James Cole
2019-03-24 09:23:36 +01:00
parent fb304de75e
commit d94b23b15d
15 changed files with 720 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Providers/FireflyServiceProvider.php
View File

@@ -61,9 +61,11 @@ use FireflyIII\Support\Navigation;
use FireflyIII\Support\Preferences;
use FireflyIII\Support\Steam;
use FireflyIII\Support\Twig\AmountFormat;
use FireflyIII\Support\Twig\Extension\TransactionGroupTwig;
use FireflyIII\Support\Twig\General;
use FireflyIII\Support\Twig\Journal;
use FireflyIII\Support\Twig\Loader\AccountLoader;
use FireflyIII\Support\Twig\Loader\TransactionGroupLoader;
use FireflyIII\Support\Twig\Loader\TransactionJournalLoader;
use FireflyIII\Support\Twig\Loader\TransactionLoader;
use FireflyIII\Support\Twig\Rule;
@@ -97,14 +99,16 @@ class FireflyServiceProvider extends ServiceProvider
);
$config = app('config');
//Twig::addExtension(new Functions($config));
Twig::addRuntimeLoader(new TransactionLoader);
Twig::addRuntimeLoader(new AccountLoader);
Twig::addRuntimeLoader(new TransactionJournalLoader);
//Twig::addRuntimeLoader(new TransactionLoader);
//Twig::addRuntimeLoader(new AccountLoader);
//Twig::addRuntimeLoader(new TransactionJournalLoader);
//Twig::addRuntimeLoader(new TransactionGroupLoader);
Twig::addExtension(new General);
Twig::addExtension(new Journal);
Twig::addExtension(new TransactionGroupTwig);
//Twig::addExtension(new Journal);
Twig::addExtension(new Translation);
Twig::addExtension(new Transaction);
Twig::addExtension(new Rule);
//Twig::addExtension(new Transaction);
//Twig::addExtension(new Rule);
Twig::addExtension(new AmountFormat);
//Twig::addExtension(new Twig_Extension_Debug);
}

22
app/Providers/JournalServiceProvider.php
View File

@@ -22,6 +22,8 @@ declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Helpers\Collector\GroupCollector;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollector;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Repositories\Journal\JournalRepository;
@@ -49,6 +51,7 @@ class JournalServiceProvider extends ServiceProvider
{
$this->registerRepository();
$this->registerCollector();
$this->registerGroupCollector();
}
/**
@@ -70,6 +73,25 @@ class JournalServiceProvider extends ServiceProvider
);
}
/**
*
*/
private function registerGroupCollector(): void
{
$this->app->bind(
GroupCollectorInterface::class,
function (Application $app) {
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollector::class);
if ($app->auth->check()) {
$collector->setUser(auth()->user());
}
return $collector;
}
);
}
/**
* Register repository.
*/