kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 10:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug in create transaction with cash account.

Browse Source
This commit is contained in:
James Cole
2014-12-18 19:51:08 +01:00
parent eed6107ce7
commit f5edb15f43
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/lib/FireflyIII/Database/Account/Account.php
View File

@@ -221,7 +221,7 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
{ {
// delete journals: // delete journals:
\TransactionJournal::whereIn( $journals = \TransactionJournal::whereIn(
'id', function ($query) use ($model) { 'id', function ($query) use ($model) {
$query->select('transaction_journal_id') $query->select('transaction_journal_id')
->from('transactions')->whereIn( ->from('transactions')->whereIn(
@@ -245,7 +245,22 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
} }
)->get(); )->get();
} }
)->delete(); )->get();
/*
* Get all transactions.
*/
$transactions = [];
/** @var \TransactionJournal $journal */
foreach ($journals as $journal) {
/** @var \Transaction $t */
foreach ($journal->transactions as $t) {
$transactions[] = intval($t->id);
}
$journal->delete();
}
// also delete transactions.
\Transaction::whereIn('id', $transactions)->delete();
/* /*
* Trigger deletion: * Trigger deletion:
@@ -506,7 +521,7 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
// find or create cash account: // find or create cash account:
return \Account::firstOrCreate( return \Account::firstOrCreate(
['name' => 'Cash account', 'account_type_id' => $cashAccountType->id, 'active' => 1, 'user_id' => $this->getUser()->id,] ['name' => 'Cash account', 'account_type_id' => $cashAccountType->id, 'active' => 0, 'user_id' => $this->getUser()->id,]
); );
} }