From 977946064d01d8c17e45679cbcbaad4c6d5d08ef Mon Sep 17 00:00:00 2001 From: JC5 Date: Sat, 11 Oct 2025 07:11:46 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20release=20?= =?UTF-8?q?'develop'=20on=202025-10-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Api/V1/Controllers/Summary/BasicController.php | 13 ++++++------- .../TransactionCurrency/CurrencyCodeRequest.php | 3 ++- app/Api/V1/Requests/Summary/BasicRequest.php | 2 ++ app/Support/System/IsOldVersion.php | 10 ++++++---- config/firefly.php | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php index 9c44083daa..86b65b9e34 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers\Summary; use Carbon\Carbon; use Exception; use FireflyIII\Api\V1\Controllers\Controller; -use FireflyIII\Api\V1\Requests\DateRangeRequest; use FireflyIII\Api\V1\Requests\Summary\BasicRequest; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; @@ -94,18 +93,18 @@ class BasicController extends Controller // parameters for boxes: ['start' => $start, 'end' => $end, 'code' => $code] = $request->attributes->all(); // balance information: - $balanceData = $this->getBalanceInformation($start, $end); - $billData = $this->getSubscriptionInformation($start, $end); - $spentData = $this->getLeftToSpendInfo($start, $end); - $netWorthData = $this->getNetWorthInfo($end); + $balanceData = $this->getBalanceInformation($start, $end); + $billData = $this->getSubscriptionInformation($start, $end); + $spentData = $this->getLeftToSpendInfo($start, $end); + $netWorthData = $this->getNetWorthInfo($end); // $balanceData = []; // $billData = []; // $spentData = []; // $netWorthData = []; - $total = array_merge($balanceData, $billData, $spentData, $netWorthData); + $total = array_merge($balanceData, $billData, $spentData, $netWorthData); // give new keys - $return = []; + $return = []; foreach ($total as $entry) { if ('' === $code || ($code === $entry['currency_code'])) { $return[$entry['key']] = $entry; diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/CurrencyCodeRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/CurrencyCodeRequest.php index 56d434b57a..72a2c6bc59 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/CurrencyCodeRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/CurrencyCodeRequest.php @@ -1,4 +1,6 @@ lt($latestDate)) { Log::debug(sprintf('This current version is older, current = %s, latest version %s.', $current, $latest)); @@ -72,10 +72,12 @@ trait IsOldVersion $configTime = Carbon::createFromTimestamp($configBuildTime, config('app.timezone')); $dbTime = Carbon::createFromTimestamp($dbBuildTime, config('app.timezone')); if ($dbBuildTime < $configBuildTime) { - Log::warning(sprintf('Your database was last managed by an older version of Firefly III (I see %s, I expect %s). Redirect to migrate routine.', $dbTime->format('Y-m-d H:i:s'), $configTime->format('Y-m-d H:i:s'),)); + Log::warning(sprintf('Your database was last managed by an older version of Firefly III (I see %s, I expect %s). Redirect to migrate routine.', $dbTime->format('Y-m-d H:i:s'), $configTime->format('Y-m-d H:i:s'))); + return true; } - Log::debug(sprintf('Your database is up to date (I see %s, I expect %s).', $dbTime->format('Y-m-d H:i:s'), $configTime->format('Y-m-d H:i:s'),)); + Log::debug(sprintf('Your database is up to date (I see %s, I expect %s).', $dbTime->format('Y-m-d H:i:s'), $configTime->format('Y-m-d H:i:s'))); + return false; } } diff --git a/config/firefly.php b/config/firefly.php index 874bbfee6d..dc7f378c56 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -79,7 +79,7 @@ return [ // see cer.php for exchange rates feature flag. ], 'version' => 'develop/2025-10-11', - 'build_time' => 1760157052, + 'build_time' => 1760159380, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used.