kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-27 16:07:45 -07:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-01-24

Browse Source
This commit is contained in:
JC5
2026-01-24 13:57:28 +01:00
parent 844470bf08
commit 4a4f1ff055
50 changed files with 795 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Internal/Update/GroupUpdateService.php
+7 -7
View File
@@ -81,8 +81,8 @@ class GroupUpdateService
Log::debug('Going to update split group.');
$existing = $transactionGroup->transactionJournals->pluck('id')->toArray();
$updated = $this->updateTransactions($transactionGroup, $transactions);
$existing = $transactionGroup->transactionJournals->pluck('id')->toArray();
$updated = $this->updateTransactions($transactionGroup, $transactions);
Log::debug('Array of updated IDs: ', $updated);
if (0 === count($updated)) {
@@ -94,13 +94,13 @@ class GroupUpdateService
return $transactionGroup;
}
$result = array_diff($existing, $updated);
$result = array_diff($existing, $updated);
Log::debug('Result of DIFF: ', $result);
/** @var string $deletedId */
foreach ($result as $deletedId) {
/** @var TransactionJournal $journal */
$journal = $transactionGroup->transactionJournals()->find((int)$deletedId);
$journal = $transactionGroup->transactionJournals()->find((int) $deletedId);
/** @var JournalDestroyService $service */
$service = app(JournalDestroyService::class);
@@ -151,10 +151,10 @@ class GroupUpdateService
*/
foreach ($transactions as $index => $transaction) {
Log::debug(sprintf('Now at #%d of %d', $index + 1, count($transactions)), $transaction);
$journalId = (int)($transaction['transaction_journal_id'] ?? 0);
$journalId = (int) ($transaction['transaction_journal_id'] ?? 0);
/** @var null|TransactionJournal $journal */
$journal = $transactionGroup->transactionJournals()->find($journalId);
$journal = $transactionGroup->transactionJournals()->find($journalId);
if (null === $journal) {
Log::debug('This entry has no existing journal: make a new split.');
// force the transaction type on the transaction data.
@@ -199,7 +199,7 @@ class GroupUpdateService
$submission = ['transactions' => [$data]];
/** @var TransactionJournalFactory $factory */
$factory = app(TransactionJournalFactory::class);
$factory = app(TransactionJournalFactory::class);
$factory->setUser($transactionGroup->user);
try {