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

Account show didn't show anything.

Browse Source
This commit is contained in:
James Cole
2015-03-01 10:44:10 +01:00
parent 19e34b460f
commit 675530458c
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/AccountController.php
View File

@@ -74,6 +74,12 @@ class AccountController extends Controller
return Redirect::route('accounts.index', $typeName); return Redirect::route('accounts.index', $typeName);
} }
/**
* @param Account $account
* @param AccountRepositoryInterface $repository
*
* @return View
*/
public function edit(Account $account, AccountRepositoryInterface $repository) public function edit(Account $account, AccountRepositoryInterface $repository)
{ {
$what = Config::get('firefly.shortNamesByFullName')[$account->accountType->type]; $what = Config::get('firefly.shortNamesByFullName')[$account->accountType->type];

8
app/Http/Controllers/TransactionController.php
View File

@@ -268,6 +268,9 @@ class TransactionController extends Controller
event(new JournalSaved($journal)); event(new JournalSaved($journal));
Session::flash('success', 'New transaction "' . $journal->description . '" stored!'); Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
if (intval(Input::get('create_another')) === 1) {
return Redirect::route('transactions.create', $request->input('what'));
}
return Redirect::route('transactions.index', $request->input('what')); return Redirect::route('transactions.index', $request->input('what'));
@@ -284,6 +287,7 @@ class TransactionController extends Controller
public function update(TransactionJournal $journal, JournalFormRequest $request, JournalRepositoryInterface $repository) public function update(TransactionJournal $journal, JournalFormRequest $request, JournalRepositoryInterface $repository)
{ {
$journalData = [ $journalData = [
'what' => $request->get('what'), 'what' => $request->get('what'),
'description' => $request->get('description'), 'description' => $request->get('description'),
@@ -306,6 +310,10 @@ class TransactionController extends Controller
Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.'); Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');
if (intval(Input::get('return_to_edit')) === 1) {
return Redirect::route('transactions.edit', $journal->id);
}
return Redirect::route('transactions.index', $journalData['what']); return Redirect::route('transactions.index', $journalData['what']);
} }

4
app/Repositories/Account/AccountRepository.php
View File

@@ -46,7 +46,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function getJournals(Account $account, $page, $range = 'session') public function getJournals(Account $account, $page, $range = 'session')
{ {
$offset = $page * 50; $offset = ($page-1) * 50;
$query = Auth::user() $query = Auth::user()
->transactionJournals() ->transactionJournals()
->withRelevantData() ->withRelevantData()
@@ -55,7 +55,7 @@ class AccountRepository implements AccountRepositoryInterface
->orderBy('date', 'DESC'); ->orderBy('date', 'DESC');
if ($range == 'session') { if ($range == 'session') {
$query->before(Session::get('end', Carbon::now()->startOfMonth())); $query->before(Session::get('end', Carbon::now()->endOfMonth()));
$query->after(Session::get('start', Carbon::now()->startOfMonth())); $query->after(Session::get('start', Carbon::now()->startOfMonth()));
} }
$count = $query->count(); $count = $query->count();