mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-02-03 11:02:54 +00:00
Compare commits
4 Commits
develop-20
...
develop-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4a3cbc9da | ||
|
|
18734b0edd | ||
|
|
f52b3bf5f5 | ||
|
|
3abba71f8d |
@@ -68,7 +68,7 @@ class ProcessesNewTransactionGroup implements ShouldQueue
|
||||
}
|
||||
Log::debug(sprintf('Will (joined with group #%d) collect all open transaction groups and process them.', $groupId));
|
||||
$repository = app(JournalRepositoryInterface::class);
|
||||
$set = $collection->merge($repository->getUncompletedJournals());
|
||||
$set = $collection->merge($repository->getAllUncompletedJournals());
|
||||
if (0 === $set->count()) {
|
||||
Log::debug('Set is empty, never mind.');
|
||||
|
||||
@@ -141,11 +141,13 @@ class ProcessesNewTransactionGroup implements ShouldQueue
|
||||
|
||||
private function removePeriodStatistics(Collection $set): void
|
||||
{
|
||||
Log::debug('Always remove period statistics');
|
||||
if (auth()->check()) {
|
||||
Log::debug('Always remove period statistics');
|
||||
|
||||
/** @var PeriodStatisticRepositoryInterface $repository */
|
||||
$repository = app(PeriodStatisticRepositoryInterface::class);
|
||||
$repository->deleteStatisticsForCollection($set);
|
||||
/** @var PeriodStatisticRepositoryInterface $repository */
|
||||
$repository = app(PeriodStatisticRepositoryInterface::class);
|
||||
$repository->deleteStatisticsForCollection($set);
|
||||
}
|
||||
}
|
||||
|
||||
private function fireWebhooks(Collection $set): void
|
||||
|
||||
@@ -262,6 +262,12 @@ class JournalRepository implements JournalRepositoryInterface, UserGroupInterfac
|
||||
;
|
||||
}
|
||||
|
||||
#[Override]
|
||||
public function getAllUncompletedJournals(): Collection
|
||||
{
|
||||
return TransactionJournal::where('completed', false)->get(['transaction_journals.*']);
|
||||
}
|
||||
|
||||
#[Override]
|
||||
public function markAsCompleted(Collection $set): void
|
||||
{
|
||||
|
||||
@@ -54,6 +54,8 @@ interface JournalRepositoryInterface
|
||||
|
||||
public function getUncompletedJournals(): Collection;
|
||||
|
||||
public function getAllUncompletedJournals(): Collection;
|
||||
|
||||
public function markAsCompleted(Collection $set): void;
|
||||
|
||||
/**
|
||||
|
||||
@@ -198,6 +198,9 @@
|
||||
"composer/package-versions-deprecated": true,
|
||||
"phpstan/extension-installer": true,
|
||||
"php-http/discovery": true
|
||||
},
|
||||
"platform": {
|
||||
"php": "8.4"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
29
composer.lock
generated
29
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "1de93b568d1a9a4847285e5b5bc6695b",
|
||||
"content-hash": "72404106289a876b0046dceacbaccf24",
|
||||
"packages": [
|
||||
{
|
||||
"name": "bacon/bacon-qr-code",
|
||||
@@ -11651,16 +11651,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
"version": "6.0.0",
|
||||
"version": "6.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
|
||||
"reference": "961bc913d42fe24a257bfff826a5068079ac7782"
|
||||
"reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/961bc913d42fe24a257bfff826a5068079ac7782",
|
||||
"reference": "961bc913d42fe24a257bfff826a5068079ac7782",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
|
||||
"reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -11700,15 +11700,27 @@
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
|
||||
"security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
|
||||
"source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.0"
|
||||
"source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/sebastianbergmann",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://liberapay.com/sebastianbergmann",
|
||||
"type": "liberapay"
|
||||
},
|
||||
{
|
||||
"url": "https://thanks.dev/u/gh/sebastianbergmann",
|
||||
"type": "thanks_dev"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-02-07T04:58:37+00:00"
|
||||
"time": "2026-02-02T14:04:18+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-invoker",
|
||||
@@ -13199,5 +13211,8 @@
|
||||
"ext-xmlwriter": "*"
|
||||
},
|
||||
"platform-dev": {},
|
||||
"platform-overrides": {
|
||||
"php": "8.4"
|
||||
},
|
||||
"plugin-api-version": "2.9.0"
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ return [
|
||||
// see cer.php for exchange rates feature flag.
|
||||
],
|
||||
'version' => 'develop/2026-02-02',
|
||||
'build_time' => 1770040199,
|
||||
'build_time' => 1770044049,
|
||||
'api_version' => '2.1.0', // field is no longer used.
|
||||
'db_version' => 28, // field is no longer used.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user