From 1884746233b4219da6a370026d0cd9a39ef2aae6 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 2 Jan 2021 14:09:02 +0100 Subject: [PATCH 1/3] Fix 'spent per day' budget box --- app/Http/Controllers/Json/BoxController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 13ef000073..010e33d4fa 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -97,7 +97,8 @@ class BoxController extends Controller // also calculate spent per day. $spent = $opsRepository->sumExpenses($start, $end, null, null, $currency); $spentAmount = $spent[(int) $currency->id]['sum'] ?? '0'; - $spentPerDay = '-1'; + $days = $today->diffInDays($start) + 1; + $spentPerDay = bcdiv($spentAmount, (string) $days); if ($availableBudgets->count() > 0) { $display = 0; // assume user overspent $boxTitle = (string) trans('firefly.overspent'); From e848c7372c1ab375bc79ca1d0fabf8e31d863586 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 2 Jan 2021 14:24:31 +0100 Subject: [PATCH 2/3] Fix 'spent per day' budget box --- app/Http/Controllers/Json/BoxController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 010e33d4fa..c0239bfde6 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -97,7 +97,7 @@ class BoxController extends Controller // also calculate spent per day. $spent = $opsRepository->sumExpenses($start, $end, null, null, $currency); $spentAmount = $spent[(int) $currency->id]['sum'] ?? '0'; - $days = $today->diffInDays($start) + 1; + $days = min( $today->diffInDays($start), $end->diffInDays($start) ) + 1; $spentPerDay = bcdiv($spentAmount, (string) $days); if ($availableBudgets->count() > 0) { $display = 0; // assume user overspent From 5dddb5e0df822fb055140389087a9388b51ef72e Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 2 Jan 2021 14:33:19 +0100 Subject: [PATCH 3/3] Fix 'spent per day' budget box --- app/Http/Controllers/Json/BoxController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index c0239bfde6..31fd5e9d4b 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -97,7 +97,8 @@ class BoxController extends Controller // also calculate spent per day. $spent = $opsRepository->sumExpenses($start, $end, null, null, $currency); $spentAmount = $spent[(int) $currency->id]['sum'] ?? '0'; - $days = min( $today->diffInDays($start), $end->diffInDays($start) ) + 1; + + $days = $today->between($start, $end) ? $today->diffInDays($start) + 1 : $end->diffInDays($start) + 1; $spentPerDay = bcdiv($spentAmount, (string) $days); if ($availableBudgets->count() > 0) { $display = 0; // assume user overspent