IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 09:51:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix various small issues.

Browse Source
This commit is contained in:
James Cole 2016-03-14 20:38:23 +01:00
parent a508ac9dda
commit be58da539e
5 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,20 +140,14 @@ class TransactionController extends Controller
*/ */
public function edit(ARI $repository, TransactionJournal $journal) public function edit(ARI $repository, TransactionJournal $journal)
{ {
// cannot edit opening balance
if ($journal->isOpeningBalance()) {
throw new FireflyException('Cannot edit this transaction (#' . $journal->id . '). Edit the account instead!');
}
$maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize')); $maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = Steam::phpBytes(ini_get('post_max_size')); $maxPostSize = Steam::phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize); $uploadSize = min($maxFileSize, $maxPostSize);
$what = strtolower(TransactionJournal::transactionTypeStr($journal)); $what = strtolower(TransactionJournal::transactionTypeStr($journal));
$accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account'])); $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
$budgets = ExpandedForm::makeSelectList(Auth::user()->budgets()->get()); // TODO this must be a repository call $budgets = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
$budgets[0] = trans('form.noBudget'); $budgets[0] = trans('form.noBudget');
$piggies = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get()); // TODO this must be a repository call $piggies = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
$piggies[0] = trans('form.noPiggybank'); $piggies[0] = trans('form.noPiggybank');
$subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
$preFilled = [ $preFilled = [
@ -164,11 +158,10 @@ class TransactionController extends Controller
'category' => '', 'category' => '',
'budget_id' => 0, 'budget_id' => 0,
'piggy_bank_id' => 0, 'piggy_bank_id' => 0,
'tags' => join(',', $journal->tags->pluck('tag')->toArray()),
]; ];
// get tags:
$preFilled['tags'] = join(',', $journal->tags->pluck('tag')->toArray());
$category = $journal->categories()->first(); $category = $journal->categories()->first();
if (!is_null($category)) { if (!is_null($category)) {
$preFilled['category'] = $category->name; $preFilled['category'] = $category->name;
} }
@ -286,7 +279,7 @@ class TransactionController extends Controller
} }
); );
$what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = trans('firefly.' . $journal->transaction_type_type ?? $journal->transactionType->type) . ' "' . e($journal->description) . '"'; $subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
return view('transactions.show', compact('journal', 'events', 'subTitle', 'what')); return view('transactions.show', compact('journal', 'events', 'subTitle', 'what'));
} }

3
app/Http/breadcrumbs.php
View File

@ -573,7 +573,8 @@ Breadcrumbs::register(
Breadcrumbs::register( Breadcrumbs::register(
'transactions.show', function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) { 'transactions.show', function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
$breadcrumbs->parent('transactions.index', strtolower($journal->getTransactionType())); $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$breadcrumbs->parent('transactions.index', $what);
$breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id]));
} }

1
app/Repositories/Journal/JournalRepository.php
View File

@ -217,7 +217,6 @@ class JournalRepository implements JournalRepositoryInterface
'process_date' => $data['process_date'], 'process_date' => $data['process_date'],
] ]
); );
// TODO catch errors here. Match rules with JournalFormRequest
$journal->save(); $journal->save();

2
app/Repositories/User/UserRepository.php
View File

@ -42,4 +42,4 @@ class UserRepository implements UserRepositoryInterface
{ {
return User::count(); return User::count();
} }
} }

2
app/Repositories/User/UserRepositoryInterface.php
View File

@ -31,4 +31,4 @@ interface UserRepositoryInterface
* @return int * @return int
*/ */
public function count(): int; public function count(): int;
} }