IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-12 16:32:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4503 from Aethiran/develop

Browse Source 
Fixed amountPerPeriod not respecting bill skips
This commit is contained in:
James Cole authored and GitHub committed 2021-03-13 19:39:52 +00:00
2 parents 07f62b0d5c 2a4486a8dc
commit e113225b37
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Bill/IndexController.php
+2 -2
View File
@@ -211,8 +211,8 @@ class IndexController extends Controller
'monthly' => '12',
'weekly' => '52.17',
];
$yearAmount = bcmul($avg, $multiplies[$bill['repeat_freq']]);
Log::debug(sprintf('Amount per year is %s (%s * %s)', $yearAmount, $avg, $multiplies[$bill['repeat_freq']]));
$yearAmount = bcmul($avg, bcdiv($multiplies[$bill['repeat_freq']], (string)($bill['skip'] + 1)));
Log::debug(sprintf('Amount per year is %s (%s * %s / %s)', $yearAmount, $avg, $multiplies[$bill['repeat_freq']], (string)($bill['skip'] + 1)));
// per period:
$division = [