kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix #9882

Browse Source
This commit is contained in:
James Cole
2025-02-21 06:18:11 +01:00
parent 54990308f6
commit 9921c5a925
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/Models/Transaction/StoreController.php
View File

@@ -90,6 +90,7 @@ class StoreController extends Controller
$data['user'] = auth()->user(); $data['user'] = auth()->user();
$data['user_group'] = $this->userGroup; $data['user_group'] = $this->userGroup;
Log::channel('audit')->info('Store new transaction over API.', $data); Log::channel('audit')->info('Store new transaction over API.', $data);
try { try {

1
app/Api/V2/Controllers/Model/Transaction/StoreController.php
View File

@@ -73,6 +73,7 @@ class StoreController extends Controller
$userGroup = $request->getUserGroup(); $userGroup = $request->getUserGroup();
$data['user_group'] = $userGroup; $data['user_group'] = $userGroup;
// overrule user group and see where we end up. // overrule user group and see where we end up.
// what happens when we refer to a budget that is not in this user group? // what happens when we refer to a budget that is not in this user group?

3
app/Console/Commands/Upgrade/UpgradesToGroups.php
View File

@@ -238,7 +238,8 @@ class UpgradesToGroups extends Command
return [ return [
'type' => strtolower($journal->transactionType->type), 'type' => strtolower($journal->transactionType->type),
'date' => $journal->date, 'date' => $journal->date,
'user' => $journal->user_id, 'user' => $journal->user,
'user_group' => $journal->user->userGroup,
'currency_id' => $transaction->transaction_currency_id, 'currency_id' => $transaction->transaction_currency_id,
'foreign_currency_id' => $transaction->foreign_currency_id, 'foreign_currency_id' => $transaction->foreign_currency_id,
'amount' => $transaction->amount, 'amount' => $transaction->amount,

3
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -229,7 +229,8 @@ class ReconcileController extends Controller
'group_title' => null, 'group_title' => null,
'transactions' => [ 'transactions' => [
[ [
'user' => auth()->user()->id, 'user' => auth()->user(),
'user_group' => auth()->user()->userGroup,
'type' => strtolower(TransactionTypeEnum::RECONCILIATION->value), 'type' => strtolower(TransactionTypeEnum::RECONCILIATION->value),
'date' => $end, 'date' => $end,
'order' => 0, 'order' => 0,