kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 11:19:16 +00:00
Code Issues Projects Releases Wiki Activity

Charts will respect decimal places #506

Browse Source
This commit is contained in:
James Cole
2016-12-30 11:51:58 +01:00
parent d146476c91
commit eb8f5512c5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BudgetController.php
View File

@@ -189,7 +189,7 @@ class BudgetController extends Controller
return view( return view(
'budgets.index', 'budgets.index',
compact('available', 'periodStart', 'periodEnd', 'budgetInformation', 'defaultCurrency', 'inactive', 'budgets', 'spent', 'budgeted') compact('available', 'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets', 'spent', 'budgeted')
); );
} }

5
app/Http/Middleware/Range.php
View File

@@ -13,6 +13,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Middleware; namespace FireflyIII\Http\Middleware;
use Amount;
use App; use App;
use Carbon\Carbon; use Carbon\Carbon;
use Closure; use Closure;
@@ -109,19 +110,21 @@ class Range
$monthFormat = (string)trans('config.month'); $monthFormat = (string)trans('config.month');
$monthAndDayFormat = (string)trans('config.month_and_day'); $monthAndDayFormat = (string)trans('config.month_and_day');
$dateTimeFormat = (string)trans('config.date_time'); $dateTimeFormat = (string)trans('config.date_time');
$defaultCurrency = Amount::getDefaultCurrency();
// change localeconv to a new array: // change localeconv to a new array:
$numberFormatter = numfmt_create($lang, NumberFormatter::CURRENCY); $numberFormatter = numfmt_create($lang, NumberFormatter::CURRENCY);
$localeconv = [ $localeconv = [
'mon_decimal_point' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL)), 'mon_decimal_point' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL)),
'mon_thousands_sep' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL)), 'mon_thousands_sep' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL)),
'frac_digits' => $numberFormatter->getAttribute(NumberFormatter::MAX_FRACTION_DIGITS), 'frac_digits' => $defaultCurrency->decimal_places,
]; ];
View::share('monthFormat', $monthFormat); View::share('monthFormat', $monthFormat);
View::share('monthAndDayFormat', $monthAndDayFormat); View::share('monthAndDayFormat', $monthAndDayFormat);
View::share('dateTimeFormat', $dateTimeFormat); View::share('dateTimeFormat', $dateTimeFormat);
View::share('language', $lang); View::share('language', $lang);
View::share('localeconv', $localeconv); View::share('localeconv', $localeconv);
View::share('defaultCurrency', $defaultCurrency);
} }
/** /**