kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-04 05:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/JC5/firefly-iii

Browse Source
This commit is contained in:
Sander Dorigo
2014-11-10 11:40:16 +01:00
parent 5d5e308942 4918f1c4cb
commit 754336b3cf
6 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/controllers/AccountController.php
View File

@@ -31,19 +31,22 @@ class AccountController extends BaseController
throw new FireflyException('Cannot handle account type "' . e($what) . '".');
break;
case 'asset':
View::share('subTitleIcon', 'fa-money');
View::share('subTitle', 'Asset accounts');
$subTitleIcon = 'fa-money';
$subTitle = 'Asset accounts';
break;
case 'expense':
View::share('subTitleIcon', 'fa-shopping-cart');
View::share('subTitle', 'Expense accounts');
$subTitleIcon = 'fa-shopping-cart';
$subTitle = 'Expense accounts';
break;
case 'revenue':
View::share('subTitleIcon', 'fa-download');
View::share('subTitle', 'Revenue accounts');
$subTitleIcon = 'fa-download';
$subTitle = 'Revenue accounts';
break;
}
return View::make('accounts.index')->with('what', $what);
return View::make('accounts.index')
->with('what', $what)
->with(compact('subTitleIcon'))
->with(compact('subTitle'));
}
@@ -118,17 +121,20 @@ class AccountController extends BaseController
{
switch ($what) {
case 'asset':
View::share('subTitleIcon', 'fa-money');
$subTitleIcon = 'fa-money';
break;
case 'expense':
View::share('subTitleIcon', 'fa-shopping-cart');
$subTitleIcon = 'fa-shopping-cart';
break;
case 'revenue':
View::share('subTitleIcon', 'fa-download');
$subTitleIcon = 'fa-download';
break;
}
return View::make('accounts.create')->with('subTitle', 'Create a new ' . $what . ' account')->with('what', $what);
return View::make('accounts.create')
->with('subTitle', 'Create a new ' . $what . ' account')
->with('what', $what)
->with(compact('subTitleIcon'));
}
/**
@@ -229,14 +235,14 @@ class AccountController extends BaseController
switch ($account->accountType->type) {
case 'Asset account':
case 'Default account':
View::share('subTitleIcon', 'fa-money');
$subTitleIcon = 'fa-money';
break;
case 'Expense account':
case 'Beneficiary account':
View::share('subTitleIcon', 'fa-shopping-cart');
$subTitleIcon = 'fa-shopping-cart';
break;
case 'Revenue account':
View::share('subTitleIcon', 'fa-download');
$subTitleIcon = 'fa-download';
break;
}
@@ -251,9 +257,11 @@ class AccountController extends BaseController
Session::flash('prefilled', $prefilled);
}
return View::make('accounts.edit')->with('account', $account)->with('openingBalance', $openingBalance)->with(
'subTitle', 'Edit ' . strtolower(
return View::make('accounts.edit')
->with('account', $account)
->with('openingBalance', $openingBalance)
->with(compact('subTitleIcon'))
->with('subTitle', 'Edit ' . strtolower(
$account->accountType->type
) . ' "' . $account->name . '"'
);
@@ -269,14 +277,14 @@ class AccountController extends BaseController
switch ($account->accountType->type) {
case 'Asset account':
case 'Default account':
View::share('subTitleIcon', 'fa-money');
$subTitleIcon = 'fa-money';
break;
case 'Expense account':
case 'Beneficiary account':
View::share('subTitleIcon', 'fa-shopping-cart');
$subTitleIcon = 'fa-shopping-cart';
break;
case 'Revenue account':
View::share('subTitleIcon', 'fa-download');
$subTitleIcon = 'fa-download';
break;
}
@@ -284,7 +292,8 @@ class AccountController extends BaseController
//$data = $this->_accounts->show($account, 40);
return View::make('accounts.show')
->with('account', $account)
->with('subTitle', 'Details for ' . strtolower($account->accountType->type) . ' "' . $account->name . '"');
->with('subTitle', 'Details for ' . strtolower($account->accountType->type) . ' "' . $account->name . '"')
->with(compact('subTitleIcon'));
}
/**

10
app/controllers/PiggybankController.php
View File

@@ -46,11 +46,11 @@ class PiggybankController extends BaseController
*/
public function delete(Piggybank $piggybank)
{
View::share('subTitle', 'Delete "' . $piggybank->name . '"');
View::share('title', 'Piggy banks');
View::share('mainTitleIcon', 'fa-sort-amount-asc');
return View::make('piggybanks.delete')->with('piggybank', $piggybank);
return View::make('piggybanks.delete')
->with('piggybank', $piggybank)
->with('subTitle', 'Delete "' . $piggybank->name . '"')
->with('title', 'Piggy banks')
->with('mainTitleIcon', 'fa-sort-amount-asc');
}
/**

16
app/controllers/ProfileController.php
View File

@@ -22,10 +22,10 @@ class ProfileController extends BaseController
*/
public function index()
{
View::share('title', 'Profile');
View::share('subTitle', Auth::user()->email);
View::share('mainTitleIcon', 'fa-user');
return View::make('profile.index');
return View::make('profile.index')
->with('title', 'Profile')
->with('subTitle', Auth::user()->email)
->with('mainTitleIcon', 'fa-user');
}
/**
@@ -33,10 +33,10 @@ class ProfileController extends BaseController
*/
public function changePassword()
{
View::share('title', Auth::user()->email);
View::share('subTitle', 'Change your password');
View::share('mainTitleIcon', 'fa-user');
return View::make('profile.change-password');
return View::make('profile.change-password')
->with('title', Auth::user()->email)
->with('subTitle', 'Change your password')
->with('mainTitleIcon', 'fa-user');
}
/**

25
app/controllers/RecurringController.php
View File

@@ -32,10 +32,11 @@ class RecurringController extends BaseController
*/
public function create()
{
View::share('subTitle', 'Create new');
$periods = \Config::get('firefly.periods_to_text');
return View::make('recurring.create')->with('periods', $periods);
return View::make('recurring.create')
->with('periods', $periods)
->with('subTitle', 'Create new');
}
/**
@@ -45,8 +46,9 @@ class RecurringController extends BaseController
*/
public function delete(RecurringTransaction $recurringTransaction)
{
View::share('subTitle', 'Delete "' . $recurringTransaction->name . '"');
return View::make('recurring.delete')->with('recurringTransaction', $recurringTransaction);
return View::make('recurring.delete')
->with('recurringTransaction', $recurringTransaction)
->with('subTitle', 'Delete "' . $recurringTransaction->name . '"');
}
/**
@@ -77,11 +79,10 @@ class RecurringController extends BaseController
{
$periods = \Config::get('firefly.periods_to_text');
View::share('subTitle', 'Edit "' . $recurringTransaction->name . '"');
return View::make('recurring.edit')->with('periods', $periods)->with(
'recurringTransaction', $recurringTransaction
);
return View::make('recurring.edit')
->with('periods', $periods)
->with('recurringTransaction', $recurringTransaction)
->with('subTitle', 'Edit "' . $recurringTransaction->name . '"');
}
/**
@@ -97,9 +98,9 @@ class RecurringController extends BaseController
*/
public function show(RecurringTransaction $recurringTransaction)
{
View::share('subTitle', $recurringTransaction->name);
return View::make('recurring.show')->with('recurring', $recurringTransaction);
return View::make('recurring.show')
->with('recurring', $recurringTransaction)
->with('subTitle', $recurringTransaction->name);
}
/**

2
app/models/Limit.php
View File

@@ -104,14 +104,12 @@ class Limit extends Ardent
try {
$repetition->save();
\Log::debug('Created new repetition with id #' . $repetition->id);
// @codeCoverageIgnoreStart
} catch (QueryException $e) {
// do nothing
\Log::error('Trying to save new Limitrepetition failed!');
\Log::error($e->getMessage());
}
// @codeCoverageIgnoreEnd
if (isset($repetition->id)) {
\Event::fire('limits.repetition', [$repetition]);
}

3
composer.json
View File

@@ -24,14 +24,13 @@
"laravel/framework": "4.2.*",
"laravelbook/ardent": "~2.4",
"davejamesmiller/laravel-breadcrumbs": "2.*",
"rcrowe/twigbridge": "0.6.*",
"grumpydictator/gchart": "dev-master"
},
"require-dev": {
"barryvdh/laravel-debugbar": "@stable",
"barryvdh/laravel-ide-helper": "@stable",
"doctrine/dbal": "~2.3",
"pda/pheanstalk": "2.*"
"codeception/codeception": "*"
},
"autoload": {
"classmap": [