IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where deposits and withdrawals might show the wrong accounts when editing.

Browse Source
This commit is contained in:
James Cole 2014-11-25 21:09:52 +01:00
parent f05d626e38
commit f9dfdeafb3
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/controllers/TransactionController.php
View File

@ -55,7 +55,7 @@ class TransactionController extends BaseController
$budgets[0] = '(no budget)'; $budgets[0] = '(no budget)';
// get the piggy banks. // get the piggy banks.
$list = $piggyRepository->get()->merge($repRepository->get()); $list = $piggyRepository->get()->merge($repRepository->get());
$piggies = FFForm::makeSelectList($list); $piggies = FFForm::makeSelectList($list);
$piggies[0] = '(no piggy bank)'; $piggies[0] = '(no piggy bank)';
@ -196,18 +196,38 @@ class TransactionController extends BaseController
*/ */
switch ($what) { switch ($what) {
case 'withdrawal': case 'withdrawal':
$prefilled['account_id'] = $journal->transactions[0]->account->id; if (floatval($journal->transactions[0]->amount) < 0) {
$prefilled['expense_account'] = $journal->transactions[1]->account->name; // transactions[0] is the asset account that paid for the withdrawal.
$prefilled['amount'] = floatval($journal->transactions[1]->amount); $prefilled['account_id'] = $journal->transactions[0]->account->id;
$budget = $journal->budgets()->first(); $prefilled['expense_account'] = $journal->transactions[1]->account->name;
$prefilled['amount'] = floatval($journal->transactions[1]->amount);
} else {
// transactions[1] is the asset account that paid for the withdrawal.
$prefilled['account_id'] = $journal->transactions[1]->account->id;
$prefilled['expense_account'] = $journal->transactions[0]->account->name;
$prefilled['amount'] = floatval($journal->transactions[0]->amount);
}
$budget = $journal->budgets()->first();
if (!is_null($budget)) { if (!is_null($budget)) {
$prefilled['budget_id'] = $budget->id; $prefilled['budget_id'] = $budget->id;
} }
break; break;
case 'deposit': case 'deposit':
$prefilled['account_id'] = $journal->transactions[1]->account->id; if (floatval($journal->transactions[0]->amount) < 0) {
$prefilled['revenue_account'] = $journal->transactions[0]->account->name; // transactions[0] contains the account the money came from.
$prefilled['amount'] = floatval($journal->transactions[1]->amount); $prefilled['account_id'] = $journal->transactions[1]->account->id;
$prefilled['revenue_account'] = $journal->transactions[0]->account->name;
$prefilled['amount'] = floatval($journal->transactions[1]->amount);
} else {
// transactions[1] contains the account the money came from.
$prefilled['account_id'] = $journal->transactions[0]->account->id;
$prefilled['revenue_account'] = $journal->transactions[1]->account->name;
$prefilled['amount'] = floatval($journal->transactions[0]->amount);
}
break; break;
case 'transfer': case 'transfer':
if (floatval($journal->transactions[0]->amount) < 0) { if (floatval($journal->transactions[0]->amount) < 0) {
@ -282,7 +302,7 @@ class TransactionController extends BaseController
public function show(TransactionJournal $journal) public function show(TransactionJournal $journal)
{ {
$journal->transactions->each( $journal->transactions->each(
function(\Transaction $t) use ($journal) { function (\Transaction $t) use ($journal) {
$t->before = floatval( $t->before = floatval(
$t->account->transactions()->leftJoin( $t->account->transactions()->leftJoin(
'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id' 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
@ -290,12 +310,11 @@ class TransactionController extends BaseController
'transaction_journals.created_at', '<=', $journal->created_at->format('Y-m-d H:i:s') 'transaction_journals.created_at', '<=', $journal->created_at->format('Y-m-d H:i:s')
)->where('transaction_journals.id', '!=', $journal->id)->sum('transactions.amount') )->where('transaction_journals.id', '!=', $journal->id)->sum('transactions.amount')
); );
$t->after = $t->before + $t->amount; $t->after = $t->before + $t->amount;
} }
); );
return View::make('transactions.show')->with('journal', $journal)->with( return View::make('transactions.show')->with('journal', $journal)->with(
'subTitle', $journal->transactionType->type . ' "' . $journal->description . '"' 'subTitle', $journal->transactionType->type . ' "' . $journal->description . '"'
); );