IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 17:31:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small updates.

Browse Source
This commit is contained in:
James Cole 2015-03-15 09:34:57 +01:00
parent 8b4f656d90
commit f572445a65
4 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/Support/Amount.php
View File

@ -5,6 +5,7 @@ namespace FireflyIII\Support;
use Cache;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use Preferences as Prefs;
/**
@ -30,19 +31,27 @@ class Amount
}
/**
* @param Transaction|\Transaction $transaction
* @param bool $coloured
*
* @return string
*/
public function formatTransaction(Transaction $transaction, $coloured = true)
public function getCurrencySymbol()
{
$symbol = $transaction->transactionJournal->transactionCurrency->symbol;
$amount = floatval($transaction->amount);
if (defined('FFCURRENCYSYMBOL')) {
return FFCURRENCYSYMBOL;
}
if (\Cache::has('FFCURRENCYSYMBOL')) {
define('FFCURRENCYSYMBOL', \Cache::get('FFCURRENCYSYMBOL'));
return $this->formatWithSymbol($symbol, $amount, $coloured);
return FFCURRENCYSYMBOL;
}
$currencyPreference = Prefs::get('currencyPreference', 'EUR');
$currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
\Cache::forever('FFCURRENCYSYMBOL', $currency->symbol);
define('FFCURRENCYSYMBOL', $currency->symbol);
return $currency->symbol;
}
/**
@ -73,29 +82,45 @@ class Amount
return $symbol . ' ' . $string;
}
/**
* @return string
*
* @param TransactionJournal $journal
*/
public function getCurrencySymbol()
public function formatJournal(TransactionJournal $journal, $coloured = true)
{
if (defined('FFCURRENCYSYMBOL')) {
return FFCURRENCYSYMBOL;
$showPositive = true;
$symbol = $journal->transactionCurrency->symbol;
$amount = 0;
switch ($journal->transactionType->type) {
case 'Withdrawal':
$showPositive = false;
}
if (\Cache::has('FFCURRENCYSYMBOL')) {
define('FFCURRENCYSYMBOL', \Cache::get('FFCURRENCYSYMBOL'));
return FFCURRENCYSYMBOL;
foreach ($journal->transactions as $t) {
if (floatval($t->amount) > 0 && $showPositive === true) {
$amount = floatval($t->amount);
break;
}
if (floatval($t->amount) < 0 && $showPositive === false) {
$amount = floatval($t->amount);
}
}
$currencyPreference = Prefs::get('currencyPreference', 'EUR');
$currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
return $this->formatWithSymbol($symbol, $amount, $coloured);
}
\Cache::forever('FFCURRENCYSYMBOL', $currency->symbol);
/**
* @param Transaction $transaction
* @param bool $coloured
*
* @return string
*/
public function formatTransaction(Transaction $transaction, $coloured = true)
{
$symbol = $transaction->transactionJournal->transactionCurrency->symbol;
$amount = floatval($transaction->amount);
define('FFCURRENCYSYMBOL', $currency->symbol);
return $currency->symbol;
return $this->formatWithSymbol($symbol, $amount, $coloured);
}
/**

2
public/js/gcharts.js
View File

@ -24,7 +24,7 @@ function googleChart(chartType, URL, container, options) {
/*
Create a new google charts object.
*/
var chart = false
var chart = false;
var options = false;
var isMaterialDesign = false;
if (chartType === 'line') {

2
resources/views/index.blade.php
View File

@ -81,7 +81,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-money fa-fw"></i>
<a href="{{route('accounts.show',$data[1]->id)}}">{{{$data[1]->name}}}</a>
<a href="{{route('accounts.show',$data[1]->id)}}">{{{$data[1]->name}}}</a> ({!! Amount::format(Steam::balance($data[1])) !!})
<!-- ACTIONS MENU -->

14
resources/views/list/journals-tiny.blade.php
View File

@ -15,19 +15,7 @@
{{{$journal->description}}}
<span class="pull-right small">
@if(isset($account))
@foreach($journal->transactions as $index => $t)
@if($t->account_id == $account->id)
{!! Amount::formatTransaction($t) !!}
@endif
@endforeach
@else
@foreach($journal->transactions as $index => $t)
@if($index == 0)
{!! Amount::formatTransaction($t) !!}
@endif
@endforeach
@endif
{!! Amount::formatJournal($journal) !!}
</span>
</a>