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

Cleaning up.

Browse Source
This commit is contained in:
James Cole
2015-04-28 15:26:30 +02:00
parent 0683c87e52
commit db4adf399d
15 changed files with 75 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ class AccountController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('mainTitleIcon', 'fa-credit-card');
View::share('title', 'Accounts');
}

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

@@ -29,6 +29,7 @@ class BillController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Bills');
View::share('mainTitleIcon', 'fa-calendar-o');
}

11
app/Http/Controllers/BudgetController.php
View File

@@ -29,8 +29,10 @@ class BudgetController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Budgets');
View::share('mainTitleIcon', 'fa-tasks');
View::share('hideBudgets', true);
}
/**
@@ -185,12 +187,11 @@ class BudgetController extends Controller
return view('error')->with('message', 'Invalid selection.');
}
$hideBudget = true; // used in transaction list.
$journals = $repository->getJournals($budget, $repetition);
$limits = !is_null($repetition->id) ? [$repetition->budgetLimit] : $repository->getBudgetLimits($budget);
$subTitle = !is_null($repetition->id) ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
$journals = $repository->getJournals($budget, $repetition);
$limits = !is_null($repetition->id) ? [$repetition->budgetLimit] : $repository->getBudgetLimits($budget);
$subTitle = !is_null($repetition->id) ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget'));
return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
}
/**

1
app/Http/Controllers/CategoryController.php
View File

@@ -26,6 +26,7 @@ class CategoryController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Categories');
View::share('mainTitleIcon', 'fa-bar-chart');
}

11
app/Http/Controllers/Controller.php
View File

@@ -3,6 +3,7 @@
use Illuminate\Foundation\Bus\DispatchesCommands;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use View;
/**
* Class Controller
@@ -14,4 +15,14 @@ abstract class Controller extends BaseController
use DispatchesCommands, ValidatesRequests;
/**
*
*/
public function __construct()
{
View::share('hideBudgets', false);
View::share('hideCategories', false);
View::share('hideBills', false);
View::share('hideTags', false);
}
}

2
app/Http/Controllers/CurrencyController.php
View File

@@ -27,7 +27,7 @@ class CurrencyController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Currencies');
View::share('mainTitleIcon', 'fa-usd');
}

4
app/Http/Controllers/HelpController.php
View File

@@ -1,12 +1,8 @@
<?php namespace FireflyIII\Http\Controllers;
use Cache;
use ErrorException;
use FireflyIII\Helpers\Help\HelpInterface;
use League\CommonMark\CommonMarkConverter;
use Log;
use Response;
use Route;
/**
* Class HelpController

2
app/Http/Controllers/HomeController.php
View File

@@ -86,7 +86,7 @@ class HomeController extends Controller
}
}
return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal','piggyBankAccounts'));
return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal', 'piggyBankAccounts'));
}

3
app/Http/Controllers/JsonController.php
View File

@@ -1,7 +1,6 @@
<?php namespace FireflyIII\Http\Controllers;
use Amount;
use Auth;
use Carbon\Carbon;
use FireflyIII\Helpers\Report\ReportQueryInterface;
use FireflyIII\Models\Account;
@@ -188,7 +187,7 @@ class JsonController extends Controller
*/
public function tags(TagRepositoryInterface $tagRepository)
{
$list = $tagRepository->get();
$list = $tagRepository->get();
$return = [];
foreach ($list as $entry) {
$return[] = $entry->tag;

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

@@ -32,6 +32,7 @@ class PiggyBankController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Piggy banks');
View::share('mainTitleIcon', 'fa-sort-amount-asc');
}

2
app/Http/Controllers/PreferencesController.php
View File

@@ -20,7 +20,7 @@ class PreferencesController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Preferences');
View::share('mainTitleIcon', 'fa-gear');
}

5
app/Http/Controllers/ProfileController.php
View File

@@ -49,7 +49,8 @@ class ProfileController extends Controller
/**
*
*/
public function postDeleteAccount(DeleteAccountFormRequest $request) {
public function postDeleteAccount(DeleteAccountFormRequest $request)
{
// old, new1, new2
if (!Hash::check($request->get('password'), Auth::user()->password)) {
Session::flash('error', 'Invalid password!');
@@ -60,11 +61,11 @@ class ProfileController extends Controller
// DELETE!
Auth::user()->delete();
Session::flush();
return Redirect::route('index');
}
/**
* @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/

11
app/Http/Controllers/TagController.php
View File

@@ -10,11 +10,11 @@ use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Response;
use Session;
use View;
use URL;
use Redirect;
use View;
/**
* Class TagController
@@ -31,7 +31,7 @@ class TagController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Tags');
View::share('mainTitleIcon', 'fa-tags');
$tagOptions = [
@@ -182,7 +182,7 @@ class TagController extends Controller
];
$repository->store($data);
Session::flash('success','The tag has been created!');
Session::flash('success', 'The tag has been created!');
if (intval(Input::get('create_another')) === 1) {
// set value so create routine will not overwrite URL:
@@ -199,7 +199,8 @@ class TagController extends Controller
/**
* @param Tag $tag
*/
public function update(Tag $tag, TagFormRequest $request, TagRepositoryInterface $repository) {
public function update(Tag $tag, TagFormRequest $request, TagRepositoryInterface $repository)
{
if (Input::get('setTag') == 'true') {
$latitude = strlen($request->get('latitude')) > 0 ? $request->get('latitude') : null;
$longitude = strlen($request->get('longitude')) > 0 ? $request->get('longitude') : null;

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

@@ -28,6 +28,7 @@ class TransactionController extends Controller
*/
public function __construct()
{
parent::__construct();
View::share('title', 'Transactions');
View::share('mainTitleIcon', 'fa-repeat');
}
@@ -162,7 +163,7 @@ class TransactionController extends Controller
$preFilled['account_from_id'] = $transactions[1]->account->id;
$preFilled['account_to_id'] = $transactions[0]->account->id;
Session::flash('preFilled',$preFilled);
Session::flash('preFilled', $preFilled);
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('transactions.edit.fromUpdate') !== true) {