diff --git a/app/Http/routes.php b/app/Http/routes.php index 955af396a3..6516c1d5d3 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -232,6 +232,10 @@ Route::group( Route::get('/import/complete/{importJob}', ['uses' => 'ImportController@complete', 'as' => 'import.complete']); Route::get('/import/download/{importJob}', ['uses' => 'ImportController@download', 'as' => 'import.download']); + Route::get('/import/status/{importJob}', ['uses' => 'ImportController@status', 'as' => 'import.status']); + Route::get('/import/json/{importJob}', ['uses' => 'ImportController@json', 'as' => 'import.json']); + Route::get('/import/start/{importJob}', ['uses' => 'ImportController@run', 'as' => 'import.start']); + /** * Help Controller @@ -269,13 +273,10 @@ Route::group( Route::get('/piggy-banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy-banks.index']); Route::get('/piggy-banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add', 'as' => 'piggy-banks.addMoney']); Route::get('/piggy-banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'piggy-banks.removeMoney']); - Route::get('/piggy-banks/add-money/{piggyBank}', ['uses' => 'PiggyBankController@addMobile', 'as' => 'piggy-banks.add-money-mobile']); Route::get('/piggy-banks/remove-money/{piggyBank}', ['uses' => 'PiggyBankController@removeMobile', 'as' => 'piggy-banks.remove-money-mobile']); - Route::post('/piggy-banks/add-money/{piggyBank}', ['uses' => 'PiggyBankController@postAddMobile', 'as' => 'piggy-banks.post-add-mobile']); Route::post('/piggy-banks/remove-money/{piggyBank}', ['uses' => 'PiggyBankController@postRemoveMobile', 'as' => 'piggy-banks.post-remove-mobile']); - Route::get('/piggy-banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy-banks.create']); Route::get('/piggy-banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy-banks.edit']); Route::get('/piggy-banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy-banks.delete']); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 08238377e7..446a452766 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -768,7 +768,7 @@ return [ 'import_finish_configuration' => 'Finish configuration', 'settings_for_import' => 'Settings', 'import_complete' => 'Import configuration complete!', - 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you need to execute the following command in your console. Unfortunately, a web-based import is not yet possible.', + 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.', 'import_download_config' => 'Download configuration', 'import_start_import' => 'Start import', 'import_intro_beta' => 'The import function of Firefly III is in beta. Many users of Firefly III have tried many different files. Although each individual compontent of this import routine works (really), the combination might break. If your file cannot be imported by Firefly, please read this wiki page so I can fix the problem you have run into.', diff --git a/resources/views/import/complete.twig b/resources/views/import/complete.twig index 2f9d96cb26..f0127faf8e 100644 --- a/resources/views/import/complete.twig +++ b/resources/views/import/complete.twig @@ -22,7 +22,7 @@ {{ 'import_download_config'|_ }}
- + {{ 'import_start_import'|_ }}