Code cleanup.

This commit is contained in:
James Cole
2016-08-12 15:10:03 +02:00
parent 955306d877
commit 5c4d010bde
94 changed files with 106 additions and 363 deletions

View File

@@ -133,4 +133,4 @@ class DomainController extends Controller
return $filtered;
}
}
}

View File

@@ -28,10 +28,12 @@ class UserController extends Controller
/**
* @param User $user
*
* @return int
*/
public function edit(User $user)
{
return $user->id;
}

View File

@@ -45,8 +45,7 @@ class ImportController extends Controller
*
* @param ImportJob $job
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws FireflyException
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
*/
public function complete(ImportJob $job)
{
@@ -54,7 +53,6 @@ class ImportController extends Controller
if (!$this->jobInCorrectStep($job, 'complete')) {
return $this->redirectToCorrectStep($job);
}
$importer = $this->makeImporter($job);
$subTitle = trans('firefy.import_complete');
$subTitleIcon = 'fa-star';
@@ -305,14 +303,11 @@ class ImportController extends Controller
case 'configure':
case 'process':
return $job->status === 'import_status_never_started';
break;
case 'settings':
case 'store-settings':
return $job->status === 'import_configuration_saved';
break;
case 'complete':
return $job->status === 'settings_complete';
break;
}
return false;

View File

@@ -230,4 +230,4 @@ class MassController extends Controller
return redirect(session('transactions.mass-edit.url'));
}
}
}

View File

@@ -358,4 +358,4 @@ class SplitController extends Controller
return $return;
}
}
}

View File

@@ -107,6 +107,8 @@ class Range
$ranges['next'] = [$nextStart->format('Y-m-d'), $nextEnd->format('Y-m-d')];
switch ($viewRange) {
default:
throw new FireflyException('The date picker does not yet support "' . $viewRange . '".');
case '1D':
$format = (string)trans('config.month_and_day');
break;
@@ -122,8 +124,6 @@ class Range
case '1M':
$format = (string)trans('config.month');
break;
default:
throw new FireflyException('The date picker does not yet support "' . $viewRange . '".');
case '1W':
$format = (string)trans('config.week_in_year');
break;

View File

@@ -97,4 +97,4 @@ class SplitJournalFormRequest extends Request
'piggy_bank_id.*' => 'between:1,255',
];
}
}
}

View File

@@ -599,4 +599,4 @@ Breadcrumbs::register(
$breadcrumbs->parent('transactions.index', $what);
$breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('split.journal.create', [$what]));
}
);
);