kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

More code for multi account piggy banks.

Browse Source
This commit is contained in:
James Cole
2024-12-04 06:38:47 +01:00
parent d740814f88
commit 4819b5ac5d
6 changed files with 131 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Factory/PiggyBankFactory.php
View File

@@ -169,9 +169,20 @@ class PiggyBankFactory
}
private function resetOrder(): void
public function resetOrder(): void
{
$set = $this->user->piggyBanks()->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']);
// TODO duplicate code
$set = PiggyBank
::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
->where('accounts.user_id', $this->user->id)
->with(
[
'account',
'objectGroups',
]
)
->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']);
$current = 1;
foreach ($set as $piggyBank) {
if ($piggyBank->order !== $current) {