kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Some dependency clean up.

Browse Source
This commit is contained in:
James Cole
2015-07-07 19:09:45 +02:00
parent 3de57c668f
commit c00bcd78cc
23 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Support/Twig/General.php
View File

@@ -2,7 +2,6 @@
namespace FireflyIII\Support\Twig;
use App;
use Carbon\Carbon;
use Config;
use FireflyIII\Models\Account;
@@ -74,7 +73,7 @@ class General extends Twig_Extension
{
return new Twig_SimpleFilter(
'formatAmount', function ($string) {
return App::make('amount')->format($string);
return app('amount')->format($string);
}, ['is_safe' => ['html']]
);
}
@@ -86,7 +85,7 @@ class General extends Twig_Extension
{
return new Twig_SimpleFilter(
'formatTransaction', function (Transaction $transaction) {
return App::make('amount')->formatTransaction($transaction);
return app('amount')->formatTransaction($transaction);
}, ['is_safe' => ['html']]
);
}
@@ -98,7 +97,7 @@ class General extends Twig_Extension
{
return new Twig_SimpleFilter(
'formatAmountPlain', function ($string) {
return App::make('amount')->format($string, false);
return app('amount')->format($string, false);
}, ['is_safe' => ['html']]
);
}
@@ -110,7 +109,7 @@ class General extends Twig_Extension
{
return new Twig_SimpleFilter(
'formatJournal', function ($journal) {
return App::make('amount')->formatJournal($journal);
return app('amount')->formatJournal($journal);
}, ['is_safe' => ['html']]
);
}
@@ -127,7 +126,7 @@ class General extends Twig_Extension
}
$date = Session::get('end', Carbon::now()->endOfMonth());
return App::make('steam')->balance($account, $date);
return app('steam')->balance($account, $date);
}
);
}
@@ -151,7 +150,7 @@ class General extends Twig_Extension
{
return new Twig_SimpleFunction(
'getCurrencyCode', function () {
return App::make('amount')->getCurrencyCode();
return app('amount')->getCurrencyCode();
}
);
}
@@ -163,7 +162,7 @@ class General extends Twig_Extension
{
return new Twig_SimpleFunction(
'getCurrencySymbol', function () {
return App::make('amount')->getCurrencySymbol();
return app('amount')->getCurrencySymbol();
}
);
}

9
app/Support/Twig/Journal.php
View File

@@ -3,7 +3,6 @@
namespace FireflyIII\Support\Twig;
use App;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\CacheProperties;
@@ -156,7 +155,7 @@ class Journal extends Twig_Extension
*/
protected function relevantTagsNoTags(TransactionJournal $journal)
{
return App::make('amount')->formatJournal($journal);
return app('amount')->formatJournal($journal);
}
/**
@@ -182,7 +181,7 @@ class Journal extends Twig_Extension
if ($tag->tagMode == 'balancingAct') {
// return tag formatted for a "balancing act", even if other
// tags are present.
$amount = App::make('amount')->format($journal->actual_amount, false);
$amount = app('amount')->format($journal->actual_amount, false);
$string = '<a href="' . route('tags.show', [$tag->id]) . '" class="label label-success" title="' . $amount
. '"><i class="fa fa-fw fa-refresh"></i> ' . $tag->tag . '</a>';
@@ -191,7 +190,7 @@ class Journal extends Twig_Extension
if ($tag->tagMode == 'advancePayment') {
if ($journal->transactionType->type == 'Deposit') {
$amount = App::make('amount')->formatJournal($journal, false);
$amount = app('amount')->formatJournal($journal, false);
$string = '<a href="' . route('tags.show', [$tag->id]) . '" class="label label-success" title="' . $amount
. '"><i class="fa fa-fw fa-sort-numeric-desc"></i> ' . $tag->tag . '</a>';
@@ -203,7 +202,7 @@ class Journal extends Twig_Extension
* the tag. The TransactionJournal should properly calculate the amount.
*/
if ($journal->transactionType->type == 'Withdrawal') {
$amount = App::make('amount')->formatJournal($journal);
$amount = app('amount')->formatJournal($journal);
$string = '<a href="' . route('tags.show', [$tag->id]) . '">' . $amount . '</a>';