kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-10-02

Browse Source
This commit is contained in:
JC5
2025-10-02 07:04:45 +02:00
parent c5cf529413
commit d1bae875f7
9 changed files with 101 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -263,13 +263,13 @@ trait PeriodOverview
$entry
= [
'title' => $title,
'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [$start->format('Y-m-d'), $end->format('Y-m-d')]),
'total_transactions' => 0,
'spent' => [],
'earned' => [],
'transferred' => [],
];
'title' => $title,
'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [$start->format('Y-m-d'), $end->format('Y-m-d')]),
'total_transactions' => 0,
'spent' => [],
'earned' => [],
'transferred' => [],
];
$grouped = [];
/** @var PeriodStatistic $statistic */
@@ -515,13 +515,13 @@ trait PeriodOverview
}
$entries[]
= [
'title' => $title,
'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
'total_transactions' => count($spent) + count($earned) + count($transferred),
'spent' => $this->groupByCurrency($spent),
'earned' => $this->groupByCurrency($earned),
'transferred' => $this->groupByCurrency($transferred),
];
'title' => $title,
'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
'total_transactions' => count($spent) + count($earned) + count($transferred),
'spent' => $this->groupByCurrency($spent),
'earned' => $this->groupByCurrency($earned),
'transferred' => $this->groupByCurrency($transferred),
];
++$loops;
}

11
app/Support/System/IsOldVersion.php
View File

@@ -1,4 +1,6 @@
<?php
declare(strict_types=1);
/*
* IsOldVersion.php
* Copyright (c) 2025 james@firefly-iii.org
@@ -27,7 +29,6 @@ use Illuminate\Support\Facades\Log;
trait IsOldVersion
{
/**
* By default, version_compare() returns -1 if the first version is lower than the second, 0 if they are equal, and
* 1 if the second is lower.
@@ -38,18 +39,21 @@ trait IsOldVersion
$latestParts = explode('/', $latest);
if (2 !== count($currentParts) || 2 !== count($latestParts)) {
Log::error(sprintf('Version "%s" or "%s" is not a valid develop-version.', $current, $latest));
return 0;
}
$currentDate = Carbon::createFromFormat('!Y-m-d', $currentParts[1]);
$latestDate = Carbon::createFromFormat('!Y-m-d', $latestParts[1]);
$currentDate = Carbon::createFromFormat('!Y-m-d', $currentParts[1]);
$latestDate = Carbon::createFromFormat('!Y-m-d', $latestParts[1]);
if ($currentDate->lt($latestDate)) {
Log::debug(sprintf('This current version is older, current = %s, latest version %s.', $current, $latest));
return -1;
}
if ($currentDate->gt($latestDate)) {
Log::debug(sprintf('This current version is newer, current = %s, latest version %s.', $current, $latest));
return 1;
}
Log::debug(sprintf('This current version is of the same age, current = %s, latest version %s.', $current, $latest));
@@ -89,6 +93,7 @@ trait IsOldVersion
return true;
}
return false;
}
}