diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php new file mode 100644 index 0000000000..b8602ceb65 --- /dev/null +++ b/app/Http/Controllers/Import/BankController.php @@ -0,0 +1,28 @@ +middleware( + function ($request, $next) { + View::share('mainTitleIcon', 'fa-archive'); + View::share('title', trans('firefly.import_index_title')); + $this->repository = app(ImportJobRepositoryInterface::class); + + return $next($request); + } + ); + } + + + /** + * This is step 1. Upload a file. + * + * @return View + */ + public function index() + { + $subTitle = trans('firefly.import_index_sub_title'); + $subTitleIcon = 'fa-home'; + $importFileTypes = []; + $defaultImportType = config('firefly.default_import_format'); + + foreach (array_keys(config('firefly.import_formats')) as $type) { + $importFileTypes[$type] = trans('firefly.import_file_type_' . $type); + } + + return view('import.file.index', compact('subTitle', 'subTitleIcon', 'importFileTypes', 'defaultImportType')); + } + + /** + * This is step 3. This repeats until the job is configured. + * + * @param ImportJob $job + * + * @return View + * @throws FireflyException + */ + public function configure(ImportJob $job) + { + // create configuration class: + $configurator = $this->makeConfigurator($job); + + // is the job already configured? + if ($configurator->isJobConfigured()) { + $this->repository->updateStatus($job, 'configured'); + + return redirect(route('import.file.status', [$job->key])); + } + $view = $configurator->getNextView(); + $data = $configurator->getNextData(); + $subTitle = trans('firefly.import_config_bread_crumb'); + $subTitleIcon = 'fa-wrench'; + + return view($view, compact('data', 'job', 'subTitle', 'subTitleIcon')); + } + + /** + * Generate a JSON file of the job's configuration and send it to the user. + * + * @param ImportJob $job + * + * @return LaravelResponse + */ + public function download(ImportJob $job) + { + Log::debug('Now in download()', ['job' => $job->key]); + $config = $job->configuration; + + // This is CSV import specific: + $config['column-roles-complete'] = false; + $config['column-mapping-complete'] = false; + $config['initial-config-complete'] = false; + $config['delimiter'] = $config['delimiter'] === "\t" ? 'tab' : $config['delimiter']; + + $result = json_encode($config, JSON_PRETTY_PRINT); + $name = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\')); + + /** @var LaravelResponse $response */ + $response = response($result, 200); + $response->header('Content-disposition', 'attachment; filename=' . $name) + ->header('Content-Type', 'application/json') + ->header('Content-Description', 'File Transfer') + ->header('Connection', 'Keep-Alive') + ->header('Expires', '0') + ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') + ->header('Pragma', 'public') + ->header('Content-Length', strlen($result)); + + return $response; + + + } + + + /** + * This is step 2. It creates an Import Job. Stores the import. + * + * @param ImportUploadRequest $request + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function initialize(ImportUploadRequest $request) + { + Log::debug('Now in initialize()'); + + // create import job: + $type = $request->get('import_file_type'); + $job = $this->repository->create($type); + Log::debug('Created new job', ['key' => $job->key, 'id' => $job->id]); + + // process file: + $this->repository->processFile($job, $request->files->get('import_file')); + + // process config, if present: + if ($request->files->has('configuration_file')) { + $this->repository->processConfiguration($job, $request->files->get('configuration_file')); + } + + $this->repository->updateStatus($job, 'initialized'); + + return redirect(route('import.file.configure', [$job->key])); + } + + + /** + * + * Show status of import job in JSON. + * + * @param ImportJob $job + * + * @return \Illuminate\Http\JsonResponse + */ + public function json(ImportJob $job) + { + $result = [ + 'started' => false, + 'finished' => false, + 'running' => false, + 'errors' => array_values($job->extended_status['errors']), + 'percentage' => 0, + 'show_percentage' => false, + 'steps' => $job->extended_status['steps'], + 'done' => $job->extended_status['done'], + 'statusText' => trans('firefly.import_status_job_' . $job->status), + 'status' => $job->status, + 'finishedText' => '', + ]; + + if ($job->extended_status['steps'] !== 0) { + $result['percentage'] = round(($job->extended_status['done'] / $job->extended_status['steps']) * 100, 0); + $result['show_percentage'] = true; + } + + if ($job->status === 'finished') { + $tagId = $job->extended_status['tag']; + /** @var TagRepositoryInterface $repository */ + $repository = app(TagRepositoryInterface::class); + $tag = $repository->find($tagId); + $result['finished'] = true; + $result['finishedText'] = trans('firefly.import_status_finished_job', ['link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]); + } + + if ($job->status === 'running') { + $result['started'] = true; + $result['running'] = true; + } + + return Response::json($result); + } + + /** + * Step 4. Save the configuration. + * + * @param Request $request + * @param ImportJob $job + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function postConfigure(Request $request, ImportJob $job) + { + Log::debug('Now in postConfigure()', ['job' => $job->key]); + $configurator = $this->makeConfigurator($job); + + // is the job already configured? + if ($configurator->isJobConfigured()) { + return redirect(route('import.file.status', [$job->key])); + } + $data = $request->all(); + $configurator->configureJob($data); + + // get possible warning from configurator: + $warning = $configurator->getWarningMessage(); + + if (strlen($warning) > 0) { + Session::flash('warning', $warning); + } + + // return to configure + return redirect(route('import.file.configure', [$job->key])); + } + + /** + * @param ImportJob $job + * + * @return \Illuminate\Http\JsonResponse + * @throws FireflyException + */ + public function start(ImportJob $job) + { + /** @var ImportRoutine $routine */ + $routine = app(ImportRoutine::class); + $routine->setJob($job); + $result = $routine->run(); + if ($result) { + return Response::json(['run' => 'ok']); + } + + throw new FireflyException('Job did not complete succesfully.'); + } + + /** + * @param ImportJob $job + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View + */ + public function status(ImportJob $job) + { + $statuses = ['configured', 'running', 'finished']; + if (!in_array($job->status, $statuses)) { + return redirect(route('import.file.configure', [$job->key])); + } + $subTitle = trans('firefly.import_status_sub_title'); + $subTitleIcon = 'fa-star'; + + return view('import.file.status', compact('job', 'subTitle', 'subTitleIcon')); + } + + /** + * @param ImportJob $job + * + * @return ConfiguratorInterface + * @throws FireflyException + */ + private function makeConfigurator(ImportJob $job): ConfiguratorInterface + { + $type = $job->file_type; + $key = sprintf('firefly.import_configurators.%s', $type); + $className = config($key); + if (is_null($className)) { + throw new FireflyException('Cannot find configurator class for this job.'); // @codeCoverageIgnore + } + /** @var ConfiguratorInterface $configurator */ + $configurator = app($className); + $configurator->setJob($job); + + + return $configurator; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index 9ddbaa34cd..dd7a9ef8a5 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -12,18 +12,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Http\Requests\ImportUploadRequest; -use FireflyIII\Import\Configurator\ConfiguratorInterface; -use FireflyIII\Import\Routine\ImportRoutine; -use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use Illuminate\Http\Request; -use Illuminate\Http\Response as LaravelResponse; -use Log; -use Response; -use Session; use View; /** @@ -54,72 +43,9 @@ class ImportController extends Controller ); } - /** - * This is step 3. This repeats until the job is configured. - * - * @param ImportJob $job - * - * @return View - * @throws FireflyException - */ - public function configure(ImportJob $job) - { - // create configuration class: - $configurator = $this->makeConfigurator($job); - - // is the job already configured? - if ($configurator->isJobConfigured()) { - $this->repository->updateStatus($job, 'configured'); - - return redirect(route('import.status', [$job->key])); - } - $view = $configurator->getNextView(); - $data = $configurator->getNextData(); - $subTitle = trans('firefly.import_config_bread_crumb'); - $subTitleIcon = 'fa-wrench'; - - return view($view, compact('data', 'job', 'subTitle', 'subTitleIcon')); - } /** - * Generate a JSON file of the job's configuration and send it to the user. - * - * @param ImportJob $job - * - * @return LaravelResponse - */ - public function download(ImportJob $job) - { - Log::debug('Now in download()', ['job' => $job->key]); - $config = $job->configuration; - - // This is CSV import specific: - $config['column-roles-complete'] = false; - $config['column-mapping-complete'] = false; - $config['initial-config-complete'] = false; - $config['delimiter'] = $config['delimiter'] === "\t" ? 'tab' : $config['delimiter']; - - $result = json_encode($config, JSON_PRETTY_PRINT); - $name = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\')); - - /** @var LaravelResponse $response */ - $response = response($result, 200); - $response->header('Content-disposition', 'attachment; filename=' . $name) - ->header('Content-Type', 'application/json') - ->header('Content-Description', 'File Transfer') - ->header('Connection', 'Keep-Alive') - ->header('Expires', '0') - ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') - ->header('Pragma', 'public') - ->header('Content-Length', strlen($result)); - - return $response; - - - } - - /** - * This is step 1. Upload a file. + * General import index * * @return View */ @@ -137,167 +63,4 @@ class ImportController extends Controller return view('import.index', compact('subTitle', 'subTitleIcon', 'importFileTypes', 'defaultImportType')); } - /** - * This is step 2. It creates an Import Job. Stores the import. - * - * @param ImportUploadRequest $request - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function initialize(ImportUploadRequest $request) - { - Log::debug('Now in initialize()'); - - // create import job: - $type = $request->get('import_file_type'); - $job = $this->repository->create($type); - Log::debug('Created new job', ['key' => $job->key, 'id' => $job->id]); - - // process file: - $this->repository->processFile($job, $request->files->get('import_file')); - - // process config, if present: - if ($request->files->has('configuration_file')) { - $this->repository->processConfiguration($job, $request->files->get('configuration_file')); - } - - $this->repository->updateStatus($job, 'initialized'); - - return redirect(route('import.configure', [$job->key])); - } - - /** - * - * Show status of import job in JSON. - * - * @param ImportJob $job - * - * @return \Illuminate\Http\JsonResponse - */ - public function json(ImportJob $job) - { - $result = [ - 'started' => false, - 'finished' => false, - 'running' => false, - 'errors' => array_values($job->extended_status['errors']), - 'percentage' => 0, - 'show_percentage' => false, - 'steps' => $job->extended_status['steps'], - 'done' => $job->extended_status['done'], - 'statusText' => trans('firefly.import_status_job_' . $job->status), - 'status' => $job->status, - 'finishedText' => '', - ]; - - if ($job->extended_status['steps'] !== 0) { - $result['percentage'] = round(($job->extended_status['done'] / $job->extended_status['steps']) * 100, 0); - $result['show_percentage'] = true; - } - - if ($job->status === 'finished') { - $tagId = $job->extended_status['tag']; - /** @var TagRepositoryInterface $repository */ - $repository = app(TagRepositoryInterface::class); - $tag = $repository->find($tagId); - $result['finished'] = true; - $result['finishedText'] = trans('firefly.import_status_finished_job', ['link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]); - } - - if ($job->status === 'running') { - $result['started'] = true; - $result['running'] = true; - } - - return Response::json($result); - } - - /** - * Step 4. Save the configuration. - * - * @param Request $request - * @param ImportJob $job - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function postConfigure(Request $request, ImportJob $job) - { - Log::debug('Now in postConfigure()', ['job' => $job->key]); - $configurator = $this->makeConfigurator($job); - - // is the job already configured? - if ($configurator->isJobConfigured()) { - return redirect(route('import.status', [$job->key])); - } - $data = $request->all(); - $configurator->configureJob($data); - - // get possible warning from configurator: - $warning = $configurator->getWarningMessage(); - - if (strlen($warning) > 0) { - Session::flash('warning', $warning); - } - - // return to configure - return redirect(route('import.configure', [$job->key])); - } - - /** - * @param ImportJob $job - * - * @return \Illuminate\Http\JsonResponse - * @throws FireflyException - */ - public function start(ImportJob $job) - { - /** @var ImportRoutine $routine */ - $routine = app(ImportRoutine::class); - $routine->setJob($job); - $result = $routine->run(); - if ($result) { - return Response::json(['run' => 'ok']); - } - - throw new FireflyException('Job did not complete succesfully.'); - } - - /** - * @param ImportJob $job - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View - */ - public function status(ImportJob $job) - { - $statuses = ['configured', 'running', 'finished']; - if (!in_array($job->status, $statuses)) { - return redirect(route('import.configure', [$job->key])); - } - $subTitle = trans('firefly.import_status_sub_title'); - $subTitleIcon = 'fa-star'; - - return view('import.status', compact('job', 'subTitle', 'subTitleIcon')); - } - - /** - * @param ImportJob $job - * - * @return ConfiguratorInterface - * @throws FireflyException - */ - private function makeConfigurator(ImportJob $job): ConfiguratorInterface - { - $type = $job->file_type; - $key = sprintf('firefly.import_configurators.%s', $type); - $className = config($key); - if (is_null($className)) { - throw new FireflyException('Cannot find configurator class for this job.'); // @codeCoverageIgnore - } - /** @var ConfiguratorInterface $configurator */ - $configurator = app($className); - $configurator->setJob($job); - - - return $configurator; - } } diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 142b3b21ab..5c79e234b5 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -471,16 +471,26 @@ Breadcrumbs::register( } ); +/** + * FILE IMPORT + */ Breadcrumbs::register( - 'import.configure', function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) { + 'import.file.index', function (BreadCrumbGenerator $breadcrumbs) { $breadcrumbs->parent('import.index'); - $breadcrumbs->push(trans('firefly.import_config_sub_title', ['key' => $job->key]), route('import.configure', [$job->key])); + $breadcrumbs->push(trans('firefly.import_file'), route('import.file.index')); +} +); + +Breadcrumbs::register( + 'import.file.configure', function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) { + $breadcrumbs->parent('import.file.index'); + $breadcrumbs->push(trans('firefly.import_config_sub_title', ['key' => $job->key]), route('import.file.configure', [$job->key])); } ); Breadcrumbs::register( - 'import.status', function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) { - $breadcrumbs->parent('import.index'); - $breadcrumbs->push(trans('firefly.import_status_bread_crumb', ['key' => $job->key]), route('import.status', [$job->key])); + 'import.file.status', function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) { + $breadcrumbs->parent('import.file.index'); + $breadcrumbs->push(trans('firefly.import_status_bread_crumb', ['key' => $job->key]), route('import.file.status', [$job->key])); } ); diff --git a/public/images/logos/bunq.png b/public/images/logos/bunq.png new file mode 100644 index 0000000000..c1223bc4fc Binary files /dev/null and b/public/images/logos/bunq.png differ diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 7ffead95b3..961659547d 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -966,7 +966,8 @@ return [ // import index page: 'import_index_title' => 'Import data into Firefly III', 'import_index_sub_title' => 'Index', - 'import_index_intro' => 'Welcome to Firefly\'s import routine. These pages can help you import data from your bank into Firefly III. Please check out the help pages in the top right corner.', + 'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + 'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.', 'import_index_file' => 'Select your file', 'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.', 'import_index_type' => 'Select the type of file you will upload', diff --git a/resources/views/import/csv/initial.twig b/resources/views/import/csv/initial.twig index bbfbc52d95..56a11fc08e 100644 --- a/resources/views/import/csv/initial.twig +++ b/resources/views/import/csv/initial.twig @@ -22,7 +22,7 @@ -
+
diff --git a/resources/views/import/csv/map.twig b/resources/views/import/csv/map.twig index 0d58cfcf51..8f25f984f4 100644 --- a/resources/views/import/csv/map.twig +++ b/resources/views/import/csv/map.twig @@ -22,7 +22,7 @@
- + {% for field in data %} diff --git a/resources/views/import/csv/roles.twig b/resources/views/import/csv/roles.twig index 4513b1b7dd..f87ae66ec9 100644 --- a/resources/views/import/csv/roles.twig +++ b/resources/views/import/csv/roles.twig @@ -21,7 +21,7 @@ - + diff --git a/resources/views/import/file/finished.twig b/resources/views/import/file/finished.twig new file mode 100644 index 0000000000..9f981e3517 --- /dev/null +++ b/resources/views/import/file/finished.twig @@ -0,0 +1,38 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.renderIfExists }} +{% endblock %} +{% block content %} +
+
+
+
+

{{ 'import_finished'|_ }}

+
+
+

+ {{ 'import_finished_intro'|_ }} +

+ {% if tagId > 0 %} +

+ {{ trans('firefly.import_finished_text_with_link', {tag: tagId})|raw }} +

+ {% else %} +

+ {{ 'import_finished_text_without_link'|_ }} +

+ {% endif %} + +

+ {{ 'import_share_configuration'|_ }} +

+
+
+
+
+{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/file/index.twig b/resources/views/import/file/index.twig new file mode 100644 index 0000000000..f579b59eeb --- /dev/null +++ b/resources/views/import/file/index.twig @@ -0,0 +1,53 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.renderIfExists }} +{% endblock %} +{% block content %} +
+
+
+
+

{{ 'import_index_title'|_ }}

+
+
+
+
+

+ {{ 'import_index_intro'|_ }} +

+
+
+ +
+ + + + +
+ + {{ ExpandedForm.file('import_file', {helpText: 'import_index_file'|_}) }} + {{ ExpandedForm.file('configuration_file', {helpText: 'import_index_config'|_|raw}) }} + {{ ExpandedForm.select('import_file_type', importFileTypes, defaultImportType, {'helpText' : 'import_index_type'|_}) }} + +
+ +
+ +
+
+
+ +
+
+
+
+
+{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/file/status.twig b/resources/views/import/file/status.twig new file mode 100644 index 0000000000..c19906a5af --- /dev/null +++ b/resources/views/import/file/status.twig @@ -0,0 +1,157 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.renderIfExists }} +{% endblock %} +{% block content %} + + {# Initial display. Will refresh (and disappear almost immediately. #} + +
+
+
+
+

{{ 'import_status_wait_title'|_ }}

+
+
+

+ {{ 'import_status_wait_text'|_ }} +

+
+
+
+
+ + {# Fatal error display. Will be shown (duh) when something goes horribly wrong. #} + + + {# Box for when the job is ready to start #} + + + {# Box for when the job is running! #} + + + {# displays the finished status of the import #} + + + {# box to show error information. #} + + +{% endblock %} +{% block scripts %} + + +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/index.twig b/resources/views/import/index.twig index c48d31ea6d..1c10f69481 100644 --- a/resources/views/import/index.twig +++ b/resources/views/import/index.twig @@ -14,33 +14,28 @@

- {{ 'import_index_intro'|_ }} + {{ 'import_general_index_intro'|_ }}

-
- - - -
- - {{ ExpandedForm.file('import_file', {helpText: 'import_index_file'|_}) }} - {{ ExpandedForm.file('configuration_file', {helpText: 'import_index_config'|_|raw}) }} - {{ ExpandedForm.select('import_file_type', importFileTypes, defaultImportType, {'helpText' : 'import_index_type'|_}) }} - -
- -
- -
-
-
-
+
+

+ {# file import #} + + + Import a (CSV) file + + {# bunq import #} + {# + + bunq
+ Import from bunq + + #} +

+
diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig index cac68b8aee..ef63a38496 100644 --- a/resources/views/reports/index.twig +++ b/resources/views/reports/index.twig @@ -153,48 +153,6 @@ {{ 'report_all_time_quick'|_ }} - {#

{{ ('quick_link_category_report')|_ }}

#} - - - {# - - {% for type in ['default','audit'] %} - - - - {% endfor %} - #} -

{{ 'reports_can_bookmark'|_ }}

diff --git a/routes/web.php b/routes/web.php index f244a7712b..c0820daae6 100755 --- a/routes/web.php +++ b/routes/web.php @@ -384,23 +384,22 @@ Route::group( ['middleware' => 'user-full-auth', 'prefix' => 'import', 'as' => 'import.'], function () { Route::get('', ['uses' => 'ImportController@index', 'as' => 'index']); - Route::post('initialize', ['uses' => 'ImportController@initialize', 'as' => 'initialize']); - - Route::get('configure/{importJob}', ['uses' => 'ImportController@configure', 'as' => 'configure']); - Route::post('configure/{importJob}', ['uses' => 'ImportController@postConfigure', 'as' => 'process-configuration']); - - Route::get('download/{importJob}', ['uses' => 'ImportController@download', 'as' => 'download']); - Route::get('status/{importJob}', ['uses' => 'ImportController@status', 'as' => 'status']); - Route::get('json/{importJob}', ['uses' => 'ImportController@json', 'as' => 'json']); - Route::post('start/{importJob}', ['uses' => 'ImportController@start', 'as' => 'start']); - //Route::get('settings/{importJob}', ['uses' => 'ImportController@settings', 'as' => 'settings']); - //Route::get('complete/{importJob}', ['uses' => 'ImportController@complete', 'as' => 'complete']); - //Route::get('finished/{importJob}', ['uses' => 'ImportController@finished', 'as' => 'finished']); - //Route::post('settings/{importJob}', ['uses' => 'ImportController@postSettings', 'as' => 'post-settings']); + // file import + Route::get('file', ['uses' => 'Import\FileController@index', 'as' => 'file.index']); + Route::post('file/initialize', ['uses' => 'Import\FileController@initialize', 'as' => 'file.initialize']); + Route::get('file/configure/{importJob}', ['uses' => 'Import\FileController@configure', 'as' => 'file.configure']); + Route::post('file/configure/{importJob}', ['uses' => 'Import\FileController@postConfigure', 'as' => 'file.process-configuration']); + Route::get('file/download/{importJob}', ['uses' => 'Import\FileController@download', 'as' => 'file.download']); + Route::get('file/status/{importJob}', ['uses' => 'Import\FileController@status', 'as' => 'file.status']); + Route::get('file/json/{importJob}', ['uses' => 'Import\FileController@json', 'as' => 'file.json']); + Route::post('file/start/{importJob}', ['uses' => 'Import\FileController@start', 'as' => 'file.start']); + + // banks: + Route::get('bank/{bank}/prerequisites', ['uses' => 'Import\BankController@prerequisites', 'as' => 'bank.prerequisites']); } );