From 5ab156c7ad7ebcd8e5abba68196c99c7ffa337ea Mon Sep 17 00:00:00 2001 From: Mirko Berger Date: Sat, 13 Mar 2021 15:43:45 +0100 Subject: [PATCH] Fixed amountPerPeriod not respecting bill skips --- app/Http/Controllers/Bill/IndexController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php index 07ccf42f9b..cf1dc14139 100644 --- a/app/Http/Controllers/Bill/IndexController.php +++ b/app/Http/Controllers/Bill/IndexController.php @@ -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']], ''.($bill['skip'] + 1))); + Log::debug(sprintf('Amount per year is %s (%s * %s / %s)', $yearAmount, $avg, $multiplies[$bill['repeat_freq']], ''.($bill['skip'] + 1))); // per period: $division = [