kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Reinstated soft deletes, added first steps for account controller.

Browse Source
This commit is contained in:
James Cole
2015-02-07 23:19:28 +01:00
parent 1499b2cd40
commit 3d01669cea
17 changed files with 300 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Support/Amount.php
View File

@@ -2,10 +2,11 @@
namespace FireflyIII\Support;
use Cache;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
use Preferences as Prefs;
use Cache;
/**
* Class Amount
*
@@ -13,6 +14,21 @@ use Cache;
*/
class Amount
{
/**
* @param $amount
* @param bool $coloured
*
* @return string
*/
public function format($amount, $coloured = true)
{
$currencySymbol = $this->getCurrencySymbol();
return $this->formatWithSymbol($currencySymbol, $amount, $coloured);
}
/**
* @param \Transaction $transaction
* @param bool $coloured
@@ -29,7 +45,6 @@ class Amount
}
/**
* @param string $symbol
* @param float $amount
@@ -58,6 +73,31 @@ class Amount
return $symbol . ' ' . $string;
}
/**
* @return string
*/
public function getCurrencySymbol()
{
if (defined('FFCURRENCYSYMBOL')) {
return FFCURRENCYSYMBOL;
}
if (\Cache::has('FFCURRENCYSYMBOL')) {
define('FFCURRENCYSYMBOL', \Cache::get('FFCURRENCYSYMBOL'));
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;
}
/**
* @return string
*/