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

Methods to grab the requested currency symbol. #37

Browse Source
This commit is contained in:
James Cole
2014-12-24 05:58:26 +01:00
parent 80f5e61b6b
commit c2dd61e96b
3 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/FireflyIII/Form/Form.php
View File

@@ -123,7 +123,7 @@ class Form
$html .= \Form::input('text', $name, $value, $options); $html .= \Form::input('text', $name, $value, $options);
break; break;
case 'amount': case 'amount':
$html .= '<div class="input-group"><div class="input-group-addon">&euro;</div>'; $html .= '<div class="input-group"><div class="input-group-addon">'.getCurrencySymbol().'</div>';
$html .= \Form::input('number', $name, $value, $options); $html .= \Form::input('number', $name, $value, $options);
$html .= '</div>'; $html .= '</div>';
break; break;

6
app/views/budgets/index.blade.php
View File

@@ -100,15 +100,15 @@
<!-- budget-info-X holds the input and the euro-sign: --> <!-- budget-info-X holds the input and the euro-sign: -->
<span id="budget-info-{{$budget->id}}"> <span id="budget-info-{{$budget->id}}">
@if($budget->currentRep->amount > $budget->spent) @if($budget->currentRep->amount > $budget->spent)
<span class="text-success">&euro;</span> <input type="number" min="0" max="{{$budgetMaximum}}" data-id="{{$budget->id}}" step="1" value="{{$budget->currentRep->amount}}" style="width:90px;color:#3c763d;" /> <span class="text-success">{{getCurrencySymbol()}}</span> <input type="number" min="0" max="{{$budgetMaximum}}" data-id="{{$budget->id}}" step="1" value="{{$budget->currentRep->amount}}" style="width:90px;color:#3c763d;" />
@else @else
<span class="text-danger">&euro;</span> <input type="number" min="0" max="{{$budgetMaximum}}" data-id="{{$budget->id}}" step="1" value="{{$budget->currentRep->amount}}" style="width:90px;color:#a94442;" /> <span class="text-danger">{{getCurrencySymbol()}}</span> <input type="number" min="0" max="{{$budgetMaximum}}" data-id="{{$budget->id}}" step="1" value="{{$budget->currentRep->amount}}" style="width:90px;color:#a94442;" />
@endif @endif
</span> </span>
@else @else
<span id="budget-description-{{$budget->id}}"><em>No budget</em></span> <span id="budget-description-{{$budget->id}}"><em>No budget</em></span>
<span id="budget-info-{{$budget->id}}"> <span id="budget-info-{{$budget->id}}">
<span class="text-success" style="display:none;">&euro;</span> <input data-id="{{$budget->id}}" type="number" min="0" max="{{$budgetMaximum}}" step="1" value="0" style="width:50px;color:#3c763d;display:none;" /> <span class="text-success" style="display:none;">{{getCurrencySymbol()}}</span> <input data-id="{{$budget->id}}" type="number" min="0" max="{{$budgetMaximum}}" step="1" value="0" style="width:50px;color:#3c763d;display:none;" />
</span> </span>
@endif @endif
</span> </span>

44
bootstrap/start.php
View File

@@ -9,6 +9,7 @@ if (!function_exists('mf')) {
*/ */
function mf($amount, $coloured = true) function mf($amount, $coloured = true)
{ {
$currencySymbol = getCurrencySymbol();
$amount = floatval($amount); $amount = floatval($amount);
$amount = round($amount, 2); $amount = round($amount, 2);
@@ -16,18 +17,51 @@ if (!function_exists('mf')) {
if ($coloured === true) { if ($coloured === true) {
if ($amount === 0.0) { if ($amount === 0.0) {
return '<span style="color:#999">&#8364; ' . $string . '</span>'; return '<span style="color:#999">'.$currencySymbol.' ' . $string . '</span>';
} }
if ($amount > 0) { if ($amount > 0) {
return '<span class="text-success">&#8364; ' . $string . '</span>'; return '<span class="text-success">'.$currencySymbol.' ' . $string . '</span>';
} }
return '<span class="text-danger">&#8364; ' . $string . '</span>'; return '<span class="text-danger">'.$currencySymbol.' ' . $string . '</span>';
} }
// &#8364;
return '&#8364; ' . $string; 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('boolstr')) { if (!function_exists('boolstr')) {
/** /**
* @param $boolean * @param $boolean