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

Removed some old configuration values.

Browse Source
This commit is contained in:
James Cole
2016-05-20 17:28:07 +02:00
parent d54e264a91
commit 87f9ca3bb2
3 changed files with 11 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/BillController.php
View File

@@ -44,7 +44,10 @@ class BillController extends Controller
*/
public function create()
{
$periods = config('firefly.periods_to_text');
$periods = [];
foreach (config('firefly.bill_periods') as $current) {
$periods[$current] = trans('firefly.' . $current);
}
$subTitle = trans('firefly.create_new_bill');
@@ -99,7 +102,10 @@ class BillController extends Controller
*/
public function edit(Bill $bill)
{
$periods = config('firefly.periods_to_text');
$periods = [];
foreach (config('firefly.bill_periods') as $current) {
$periods[$current] = trans('firefly.' . $current);
}
$subTitle = trans('firefly.edit_bill', ['name' => $bill->name]);
// put previous url in session if not redirect from store (not "return_to_edit").

7
app/Http/Controllers/PiggyBankController.php
View File

@@ -75,8 +75,6 @@ class PiggyBankController extends Controller
*/
public function create(AccountCrudInterface $crud)
{
$periods = config('firefly.piggy_bank_periods');
$accounts = ExpandedForm::makeSelectList($crud->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
$subTitle = trans('firefly.new_piggy_bank');
$subTitleIcon = 'fa-plus';
@@ -89,7 +87,7 @@ class PiggyBankController extends Controller
Session::flash('gaEventCategory', 'piggy-banks');
Session::flash('gaEventAction', 'create');
return view('piggy-banks.create', compact('accounts', 'periods', 'subTitle', 'subTitleIcon'));
return view('piggy-banks.create', compact('accounts', 'subTitle', 'subTitleIcon'));
}
/**
@@ -135,7 +133,6 @@ class PiggyBankController extends Controller
public function edit(AccountCrudInterface $crud, PiggyBank $piggyBank)
{
$periods = config('firefly.piggy_bank_periods');
$accounts = ExpandedForm::makeSelectList($crud->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
$subTitle = trans('firefly.update_piggy_title', ['name' => $piggyBank->name]);
$subTitleIcon = 'fa-pencil';
@@ -162,7 +159,7 @@ class PiggyBankController extends Controller
}
Session::forget('piggy-banks.edit.fromUpdate');
return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'accounts', 'periods', 'preFilled'));
return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'accounts', 'preFilled'));
}
/**