mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Methods to grab the requested currency symbol. #37
This commit is contained in:
parent
80f5e61b6b
commit
c2dd61e96b
@ -123,7 +123,7 @@ class Form
|
||||
$html .= \Form::input('text', $name, $value, $options);
|
||||
break;
|
||||
case 'amount':
|
||||
$html .= '<div class="input-group"><div class="input-group-addon">€</div>';
|
||||
$html .= '<div class="input-group"><div class="input-group-addon">'.getCurrencySymbol().'</div>';
|
||||
$html .= \Form::input('number', $name, $value, $options);
|
||||
$html .= '</div>';
|
||||
break;
|
||||
|
@ -100,15 +100,15 @@
|
||||
<!-- budget-info-X holds the input and the euro-sign: -->
|
||||
<span id="budget-info-{{$budget->id}}">
|
||||
@if($budget->currentRep->amount > $budget->spent)
|
||||
<span class="text-success">€</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
|
||||
<span class="text-danger">€</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
|
||||
</span>
|
||||
@else
|
||||
<span id="budget-description-{{$budget->id}}"><em>No budget</em></span>
|
||||
<span id="budget-info-{{$budget->id}}">
|
||||
<span class="text-success" style="display:none;">€</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>
|
||||
@endif
|
||||
</span>
|
||||
|
@ -9,6 +9,7 @@ if (!function_exists('mf')) {
|
||||
*/
|
||||
function mf($amount, $coloured = true)
|
||||
{
|
||||
$currencySymbol = getCurrencySymbol();
|
||||
|
||||
$amount = floatval($amount);
|
||||
$amount = round($amount, 2);
|
||||
@ -16,18 +17,51 @@ if (!function_exists('mf')) {
|
||||
|
||||
if ($coloured === true) {
|
||||
if ($amount === 0.0) {
|
||||
return '<span style="color:#999">€ ' . $string . '</span>';
|
||||
return '<span style="color:#999">'.$currencySymbol.' ' . $string . '</span>';
|
||||
}
|
||||
if ($amount > 0) {
|
||||
return '<span class="text-success">€ ' . $string . '</span>';
|
||||
return '<span class="text-success">'.$currencySymbol.' ' . $string . '</span>';
|
||||
}
|
||||
|
||||
return '<span class="text-danger">€ ' . $string . '</span>';
|
||||
return '<span class="text-danger">'.$currencySymbol.' ' . $string . '</span>';
|
||||
}
|
||||
|
||||
return '€ ' . $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')) {
|
||||
/**
|
||||
* @param $boolean
|
||||
|
Loading…
Reference in New Issue
Block a user