From 6232858b8504df9041a82cbad9a9179b058dd40c Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 29 Jun 2020 06:44:17 +0200 Subject: [PATCH] Fix #3469 --- app/Http/Controllers/Account/IndexController.php | 4 ++-- app/Http/Controllers/Account/ReconcileController.php | 4 ++-- app/Http/Controllers/Budget/AvailableBudgetController.php | 2 +- app/Http/Controllers/Budget/BudgetLimitController.php | 2 +- app/Http/Controllers/Budget/IndexController.php | 2 +- app/Http/Controllers/PiggyBank/AmountController.php | 3 +-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 8d09a2d818..427f12fe8f 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -101,7 +101,7 @@ class IndexController extends Controller $account->startBalance = $this->isInArray($startBalances, $account->id); $account->endBalance = $this->isInArray($endBalances, $account->id); $account->difference = bcsub($account->endBalance, $account->startBalance); - $account->interest = round($this->repository->getMetaValue($account, 'interest'), 6); + $account->interest = number_format((float) $this->repository->getMetaValue($account, 'interest'), 6, '.', ''); $account->interestPeriod = (string) trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period'))); $account->accountTypeString = (string) trans(sprintf('firefly.account_type_%s', $account->accountType->type)); } @@ -155,7 +155,7 @@ class IndexController extends Controller $account->startBalance = $this->isInArray($startBalances, $account->id); $account->endBalance = $this->isInArray($endBalances, $account->id); $account->difference = bcsub($account->endBalance, $account->startBalance); - $account->interest = round($this->repository->getMetaValue($account, 'interest'), 6); + $account->interest = number_format((float) $this->repository->getMetaValue($account, 'interest'), 6, '.', ''); $account->interestPeriod = (string) trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period'))); $account->accountTypeString = (string) trans(sprintf('firefly.account_type_%s', $account->accountType->type)); $account->location = $this->repository->getLocation($account); diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 85e47b0be9..a7665f037d 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -129,8 +129,8 @@ class ReconcileController extends Controller $startDate = clone $start; $startDate->subDay(); - $startBalance = round(app('steam')->balance($account, $startDate), $currency->decimal_places); - $endBalance = round(app('steam')->balance($account, $end), $currency->decimal_places); + $startBalance = number_format((float) app('steam')->balance($account, $startDate), $currency->decimal_places, '.', ''); + $endBalance = number_format((float) app('steam')->balance($account, $end), $currency->decimal_places, '.', ''); $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); $subTitle = (string) trans('firefly.reconcile_account', ['account' => $account->name]); diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php index 080ca541ae..94994bfdf3 100644 --- a/app/Http/Controllers/Budget/AvailableBudgetController.php +++ b/app/Http/Controllers/Budget/AvailableBudgetController.php @@ -157,7 +157,7 @@ class AvailableBudgetController extends Controller */ public function edit(AvailableBudget $availableBudget, Carbon $start, Carbon $end) { - $availableBudget->amount = round($availableBudget->amount, $availableBudget->transactionCurrency->decimal_places); + $availableBudget->amount = number_format((float) $availableBudget->amount, $availableBudget->transactionCurrency->decimal_places, '.', ''); return view('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end')); } diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php index 7e16f4f793..5726fab0d5 100644 --- a/app/Http/Controllers/Budget/BudgetLimitController.php +++ b/app/Http/Controllers/Budget/BudgetLimitController.php @@ -213,7 +213,7 @@ class BudgetLimitController extends Controller $array['left_per_day'] = bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']); // left per day formatted. - $array['amount'] = round($limit['amount'], $limit->transactionCurrency->decimal_places); + $array['amount'] = number_format((float) $limit['amount'], $limit->transactionCurrency->decimal_places, '.', ''); $array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']); return response()->json($array); diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 5df4354803..8889a9677e 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -174,7 +174,7 @@ class IndexController extends Controller $currency = $limit->transactionCurrency ?? $defaultCurrency; $array['budgeted'][] = [ 'id' => $limit->id, - 'amount' => round($limit->amount, $currency->decimal_places), + 'amount' => number_format((float) $limit->amount, $currency->decimal_places, '.', ''), 'start_date' => $limit->start_date->formatLocalized($this->monthAndDayFormat), 'end_date' => $limit->end_date->formatLocalized($this->monthAndDayFormat), 'in_range' => $limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end), diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php index eb82627d01..44ee05c769 100644 --- a/app/Http/Controllers/PiggyBank/AmountController.php +++ b/app/Http/Controllers/PiggyBank/AmountController.php @@ -155,8 +155,7 @@ class AmountController extends Controller return redirect(route('piggy-banks.index')); } - - $amount = (string) round($request->get('amount'), 12); + $amount = number_format((float) $request->get('amount'), 12, '.', ''); session()->flash( 'error',