kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

Fixed all problems related to strict types.

Browse Source
This commit is contained in:
James Cole
2016-02-05 13:09:18 +01:00
parent aa1193a9eb
commit df918e8529
18 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -185,26 +185,26 @@ class BudgetController extends Controller
$currentStart = clone $start;
$currentEnd = clone $end;
$expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
$amount = 0;
$left = 0;
$amount = '0';
$left = '0';
$spent = $expenses;
$overspent = 0;
$overspent = '0';
} else {
$currentStart = clone $budget->startdate;
$currentEnd = clone $budget->enddate;
$expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
$amount = $budget->amount;
// smaller than 1 means spent MORE than budget allows.
$left = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? 0 : bcadd($budget->amount, $expenses);
$spent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? ($amount * -1) : $expenses;
$overspent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcadd($budget->amount, $expenses) : 0;
$left = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? '0' : bcadd($budget->amount, $expenses);
$spent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcmul($amount, '-1') : $expenses;
$overspent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcadd($budget->amount, $expenses) : '0';
}
$allEntries->push([$name, $left, $spent, $overspent, $amount, $expenses]);
}
$noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end);
$allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses, 0, 0]);
$allEntries->push([trans('firefly.noBudget'), '0', '0', $noBudgetExpenses, '0', '0']);
$data = $this->generator->frontpage($allEntries);
$cache->store($data);

4
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -406,8 +406,8 @@ class CategoryController extends Controller
while ($start <= $end) {
$str = $start->format('Y-m-d');
$spent = $spentArray[$str] ?? 0;
$earned = $earnedArray[$str] ?? 0;
$spent = $spentArray[$str] ?? '0';
$earned = $earnedArray[$str] ?? '0';
$date = Navigation::periodShow($start, '1D');
$entries->push([clone $start, $date, $spent, $earned]);
$start->addDay();