Compare commits

...

6 Commits

Author SHA1 Message Date
github-actions
25c1ca2f5d Auto commit for release 'develop' on 2024-11-24 2024-11-24 04:56:25 +01:00
James Cole
6f0bb82f59 Fix missing import 2024-11-24 04:52:33 +01:00
github-actions
22a5184ebe Auto commit for release 'develop' on 2024-11-23 2024-11-23 21:16:06 +01:00
github-actions
17b0b1f43f Auto commit for release 'v6.1.24' on 2024-11-23 2024-11-23 21:07:01 +01:00
James Cole
b61df5ec19 Update changelog 2024-11-23 21:01:58 +01:00
James Cole
1ac7275f83 Fix https://github.com/firefly-iii/firefly-iii/issues/9491 2024-11-23 20:59:08 +01:00
5 changed files with 26 additions and 15 deletions

View File

@@ -173,7 +173,8 @@ class TransactionJournalFactory
$carbon->setTimezone(config('app.timezone'));
// 2024-11-19, overrule timezone with UTC and store it as UTC.
if (FireflyConfig::get('utc', false)) {
if (FireflyConfig::get('utc', false)->data) {
$carbon->setTimezone('UTC');
}
// $carbon->setTimezone('UTC');

View File

@@ -29,6 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\System\OAuthKeys;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
/**
* Class Installer
@@ -46,7 +47,7 @@ class Installer
*/
public function handle($request, \Closure $next)
{
// app('log')->debug(sprintf('Installer middleware for URL %s', $request->url()));
// Log::debug(sprintf('Installer middleware for URL %s', $request->url()));
// ignore installer in test environment.
if ('testing' === config('app.env')) {
return $next($request);
@@ -55,7 +56,7 @@ class Installer
$url = $request->url();
$strpos = stripos($url, '/install');
if (false !== $strpos) {
// app('log')->debug(sprintf('URL is %s, will NOT run installer middleware', $url));
// Log::debug(sprintf('URL is %s, will NOT run installer middleware', $url));
return $next($request);
}
@@ -80,13 +81,13 @@ class Installer
*/
private function hasNoTables(): bool
{
// app('log')->debug('Now in routine hasNoTables()');
// Log::debug('Now in routine hasNoTables()');
try {
\DB::table('users')->count();
} catch (QueryException $e) {
$message = $e->getMessage();
app('log')->error(sprintf('Error message trying to access users-table: %s', $message));
Log::error(sprintf('Error message trying to access users-table: %s', $message));
if ($this->isAccessDenied($message)) {
throw new FireflyException(
'It seems your database configuration is not correct. Please verify the username and password in your .env file.',
@@ -96,7 +97,7 @@ class Installer
}
if ($this->noTablesExist($message)) {
// redirect to UpdateController
app('log')->warning('There are no Firefly III tables present. Redirect to migrate routine.');
Log::warning('There are no Firefly III tables present. Redirect to migrate routine.');
return true;
}
@@ -104,7 +105,7 @@ class Installer
throw new FireflyException(sprintf('Could not access the database: %s', $message), 0, $e);
}
// app('log')->debug('Everything seems OK with the tables.');
// Log::debug('Everything seems OK with the tables.');
return false;
}
@@ -134,7 +135,7 @@ class Installer
$configVersion = (int)config('firefly.db_version');
$dbVersion = (int)app('fireflyconfig')->getFresh('db_version', 1)->data;
if ($configVersion > $dbVersion) {
app('log')->warning(
Log::warning(
sprintf(
'The current configured version (%d) is older than the required version (%d). Redirect to migrate routine.',
$dbVersion,
@@ -145,7 +146,7 @@ class Installer
return true;
}
// app('log')->info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion));
// Log::info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion));
return false;
}
@@ -158,8 +159,13 @@ class Installer
// version compare thing.
$configVersion = (string)config('firefly.version');
$dbVersion = (string)app('fireflyconfig')->getFresh('ff3_version', '1.0')->data;
if (str_starts_with($configVersion, 'develop')) {
Log::debug('Skipping version check for develop version.');
return false;
}
if (1 === version_compare($configVersion, $dbVersion)) {
app('log')->warning(
Log::warning(
sprintf(
'The current configured Firefly III version (%s) is older than the required version (%s). Redirect to migrate routine.',
$dbVersion,
@@ -170,7 +176,7 @@ class Installer
return true;
}
// app('log')->info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion));
// Log::info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion));
return false;
}

View File

@@ -489,7 +489,7 @@ class JournalUpdateService
$value->setTimezone(config('app.timezone'));
// 2024-11-22, overrule timezone with UTC and store it as UTC.
if (FireflyConfig::get('utc', false)) {
if (FireflyConfig::get('utc', false)->data) {
$value->setTimezone('UTC');
}

View File

@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## 6.1.24 - 2024-11-24
### Fixed
- [Issue 9491](https://github.com/firefly-iii/firefly-iii/issues/9491) (Transactions created at midnight on the first day of a month are not listed correctly) reported by @Neroxeles
## 6.1.23 - 2024-11-23
### Added
@@ -15,8 +21,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- [Issue 9477](https://github.com/firefly-iii/firefly-iii/issues/9477) (Default Financial report: Income vs Expense has missing months when multiple currencies are used) reported by @thomase1234
- [PR 9488](https://github.com/firefly-iii/firefly-iii/pull/9488) (fix: set dest foreign_amount and foreign_currency_id for foreign transfers) reported by @antoniomrfranco
- [PR 9483](https://github.com/firefly-iii/firefly-iii/pull/9483) (fix: include foreign_amount in transaction sum calculation) reported by @antoniomrfranco
-
- Broken links in readme.
## 6.1.22 - 2024-11-07

View File

@@ -110,7 +110,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag.
],
'version' => '6.1.23',
'version' => 'develop/2024-11-24',
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 25,