IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 18:01:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2626

Browse Source
This commit is contained in:
James Cole 2019-09-20 16:17:57 +02:00
parent 845ae94252
commit 17c943fcf1
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Budget/BudgetLimitController.php
View File

@ -206,6 +206,7 @@ class BudgetLimitController extends Controller
$array['left_per_day'] = bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']); $array['left_per_day'] = bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
// left per day formatted. // left per day formatted.
$array['amount'] = round($limit['amount'], $limit->transactionCurrency->decimal_places);
$array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']); $array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']);
return response()->json($array); return response()->json($array);

5
app/Http/Controllers/Report/BudgetController.php
View File

@ -388,7 +388,7 @@ class BudgetController extends Controller
]; ];
$noBudget = $this->nbRepository->sumExpenses($start, $end); $noBudget = $this->nbRepository->sumExpenses($start, $end);
foreach ($noBudget as $noBudgetEntry) { foreach ($noBudget as $noBudgetEntry) {
$report['budgets'][0]['budget_limits'][] = [ $report['budgets'][0]['budget_limits'][] = [
'budget_limit_id' => null, 'budget_limit_id' => null,
'start_date' => $start, 'start_date' => $start,
'end_date' => $end, 'end_date' => $end,
@ -404,7 +404,8 @@ class BudgetController extends Controller
'currency_symbol' => $noBudgetEntry['currency_symbol'], 'currency_symbol' => $noBudgetEntry['currency_symbol'],
'currency_decimal_places' => $noBudgetEntry['currency_decimal_places'], 'currency_decimal_places' => $noBudgetEntry['currency_decimal_places'],
]; ];
$report['sums'][$noBudgetEntry['currency_id']]['spent'] = bcadd($report['sums'][$noBudgetEntry['currency_id']]['spent'], $noBudgetEntry['sum']); $report['sums'][$noBudgetEntry['currency_id']]['spent']
= bcadd($report['sums'][$noBudgetEntry['currency_id']]['spent'] ?? '0', $noBudgetEntry['sum']);
} }
// make percentages based on total amount. // make percentages based on total amount.