kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Restore old behavior

Browse Source
This commit is contained in:
James Cole
2024-03-17 12:00:28 +01:00
parent ab2772abe0
commit 3913fa5086
18 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Http/Controllers/DateCalculation.php
View File

@@ -39,7 +39,7 @@ trait DateCalculation
*/
public function activeDaysLeft(Carbon $start, Carbon $end): int
{
$difference = $start->diffInDays($end) + 1;
$difference = (int)($start->diffInDays($end, true) + 1);
$today = today(config('app.timezone'))->startOfDay();
if ($start->lte($today) && $end->gte($today)) {
@@ -56,11 +56,11 @@ trait DateCalculation
*/
protected function activeDaysPassed(Carbon $start, Carbon $end): int
{
$difference = $start->diffInDays($end) + 1;
$difference = $start->diffInDays($end, true) + 1;
$today = today(config('app.timezone'))->startOfDay();
if ($start->lte($today) && $end->gte($today)) {
$difference = $start->diffInDays($today) + 1;
$difference = $start->diffInDays($today, true) + 1;
}
return (int) $difference;
@@ -69,7 +69,7 @@ trait DateCalculation
protected function calculateStep(Carbon $start, Carbon $end): string
{
$step = '1D';
$months = $start->diffInMonths($end);
$months = $start->diffInMonths($end, true);
if ($months > 3) {
$step = '1W';
}