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

Most views now show the transaction the current journal/transaction is set in, even if it's not the current default currency. See issue #37

Browse Source
This commit is contained in:
James Cole
2014-12-30 06:30:20 +01:00
parent 89363ecfa3
commit c0c37eec7b
9 changed files with 208 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
bootstrap/functions.php Normal file
View File

@@ -0,0 +1,166 @@
<?php
if (!function_exists('mf')) {
/**
* @param $amount
* @param bool $coloured
*
* @return string
*/
function mf($amount, $coloured = true)
{
$currencySymbol = getCurrencySymbol();
return mfc($currencySymbol, $amount, $coloured);
}
}
if (!function_exists('mft')) {
/**
* @param \Transaction $transaction
* @param bool $coloured
*
* @return string
*/
function mft(\Transaction $transaction, $coloured = true)
{
$symbol = $transaction->transactionJournal->transactionCurrency->symbol;
$amount = floatval($transaction->amount);
return mfc($symbol, $amount, $coloured);
}
}
if (!function_exists('mfj')) {
/**
* @param \TransactionJournal $journal
* @param float $amount
* @param bool $coloured
*
* @return string
*/
function mfj(\TransactionJournal $journal, $amount, $coloured = true)
{
$symbol = $journal->transactionCurrency->symbol;
return mfc($symbol, $amount, $coloured);
}
}
if (!function_exists('mfc')) {
/**
* @param string $symbol
* @param float $amount
* @param bool $coloured
*
* @return string
*/
function mfc($symbol, $amount, $coloured = true)
{
$amount = floatval($amount);
$amount = round($amount, 2);
$string = number_format($amount, 2, ',', '.');
if ($coloured === true) {
if ($amount === 0.0) {
return '<span style="color:#999">' . $symbol . ' ' . $string . '</span>';
}
if ($amount > 0) {
return '<span class="text-success">' . $symbol . ' ' . $string . '</span>';
}
return '<span class="text-danger">' . $symbol . ' ' . $string . '</span>';
}
// &#8364;
return $symbol . ' ' . $string;
}
}
if (!function_exists('getCurrencySymbol')) {
/**
* @return string
*/
function getCurrencySymbol()
{
if (defined('FFCURRENCYSYMBOL')) {
return FFCURRENCYSYMBOL;
}
if (Cache::has('FFCURRENCYSYMBOL')) {
define('FFCURRENCYSYMBOL', Cache::get('FFCURRENCYSYMBOL'));
return FFCURRENCYSYMBOL;
}
/** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencies */
$currencies = App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
/** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
$currencyPreference = $preferences->get('currencyPreference', 'EUR');
$currency = $currencies->findByCode($currencyPreference->data);
Cache::forever('FFCURRENCYSYMBOL', $currency->symbol);
define('FFCURRENCYSYMBOL', $currency->symbol);
return $currency->symbol;
}
}
if (!function_exists('getCurrencyCode')) {
/**
* @return string
*/
function getCurrencyCode()
{
if (defined('FFCURRENCYCODE')) {
return FFCURRENCYCODE;
}
if (Cache::has('FFCURRENCYCODE')) {
define('FFCURRENCYCODE', Cache::get('FFCURRENCYCODE'));
return FFCURRENCYCODE;
}
/** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencies */
$currencies = App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
/** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
$currencyPreference = $preferences->get('currencyPreference', 'EUR');
$currency = $currencies->findByCode($currencyPreference->data);
Cache::forever('FFCURRENCYCODE', $currency->code);
define('FFCURRENCYCODE', $currency->code);
return $currency->code;
}
}
if (!function_exists('boolstr')) {
/**
* @param $boolean
*
* @return string
*/
function boolstr($boolean)
{
if (is_bool($boolean) && $boolean === true) {
return 'BOOLEAN TRUE';
}
if (is_bool($boolean) && $boolean === false) {
return 'BOOLEAN FALSE';
}
return 'NO BOOLEAN: ' . $boolean;
}
}

114
bootstrap/start.php
View File

@@ -1,118 +1,6 @@
<?php
if (!function_exists('mf')) {
/**
* @param $amount
* @param bool $coloured
*
* @return string
*/
function mf($amount, $coloured = true)
{
$currencySymbol = getCurrencySymbol();
$amount = floatval($amount);
$amount = round($amount, 2);
$string = number_format($amount, 2, ',', '.');
if ($coloured === true) {
if ($amount === 0.0) {
return '<span style="color:#999">' . $currencySymbol . ' ' . $string . '</span>';
}
if ($amount > 0) {
return '<span class="text-success">' . $currencySymbol . ' ' . $string . '</span>';
}
return '<span class="text-danger">' . $currencySymbol . ' ' . $string . '</span>';
}
// &#8364;
return $currencySymbol . ' ' . $string;
}
}
if (!function_exists('getCurrencySymbol')) {
/**
* @return string
*/
function getCurrencySymbol()
{
if (defined('FFCURRENCYSYMBOL')) {
return FFCURRENCYSYMBOL;
}
if (Cache::has('FFCURRENCYSYMBOL')) {
define('FFCURRENCYSYMBOL', Cache::get('FFCURRENCYSYMBOL'));
return FFCURRENCYSYMBOL;
}
/** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencies */
$currencies = App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
/** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
$currencyPreference = $preferences->get('currencyPreference', 'EUR');
$currency = $currencies->findByCode($currencyPreference->data);
Cache::forever('FFCURRENCYSYMBOL', $currency->symbol);
define('FFCURRENCYSYMBOL', $currency->symbol);
return $currency->symbol;
}
}
if (!function_exists('getCurrencyCode')) {
/**
* @return string
*/
function getCurrencyCode()
{
if (defined('FFCURRENCYCODE')) {
return FFCURRENCYCODE;
}
if (Cache::has('FFCURRENCYCODE')) {
define('FFCURRENCYCODE', Cache::get('FFCURRENCYCODE'));
return FFCURRENCYCODE;
}
/** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencies */
$currencies = App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
/** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
$currencyPreference = $preferences->get('currencyPreference', 'EUR');
$currency = $currencies->findByCode($currencyPreference->data);
Cache::forever('FFCURRENCYCODE', $currency->code);
define('FFCURRENCYCODE', $currency->code);
return $currency->code;
}
}
if (!function_exists('boolstr')) {
/**
* @param $boolean
*
* @return string
*/
function boolstr($boolean)
{
if (is_bool($boolean) && $boolean === true) {
return 'BOOLEAN TRUE';
}
if (is_bool($boolean) && $boolean === false) {
return 'BOOLEAN FALSE';
}
return 'NO BOOLEAN: ' . $boolean;
}
}
include('functions.php');
$app = new Illuminate\Foundation\Application;