kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 12:46:39 +00:00
Code Issues Projects Releases Wiki Activity

More code for the new CSV import

Browse Source
This commit is contained in:
James Cole
2016-06-27 15:15:46 +02:00
parent 93a54780ab
commit 18d2741814
9 changed files with 499 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/ImportController.php
View File

@@ -85,7 +85,7 @@ class ImportController extends Controller
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws FireflyException
*/
public function process(Request $request, ImportJob $job)
public function postConfigure(Request $request, ImportJob $job)
{
if (!$this->jobInCorrectStep($job, 'process')) {
return $this->redirectToCorrectStep($job);
@@ -94,7 +94,8 @@ class ImportController extends Controller
// actual code
$importer = $this->makeImporter($job);
$data = $request->all();
$importer->saveImportConfiguration($data);
$files = $request->files;
$importer->saveImportConfiguration($data, $files);
// update job:
$job->status = 'import_configuration_saved';
@@ -121,11 +122,18 @@ class ImportController extends Controller
}
$importer = $this->makeImporter($job);
// now
// now show settings screen to user.
if ($importer->requireUserSettings()) {
$data = $importer->getDataForSettings();
$view = $importer->getViewForSettings();
return view($view, compact('data', 'job'));
}
// if no more settings, save job and continue to process thing.
echo 'now in settings';
echo 'now in settings (done)';
exit;
// actual code

3
app/Http/routes.php
View File

@@ -226,8 +226,9 @@ Route::group(
Route::get('/import', ['uses' => 'ImportController@index', 'as' => 'import.index']);
Route::post('/import/upload', ['uses' => 'ImportController@upload', 'as' => 'import.upload']);
Route::get('/import/configure/{importJob}', ['uses' => 'ImportController@configure', 'as' => 'import.configure']);
Route::post('/import/process/{importJob}', ['uses' => 'ImportController@process', 'as' => 'import.process_configuration']);
Route::post('/import/configure/{importJob}', ['uses' => 'ImportController@postConfigure', 'as' => 'import.process_configuration']);
Route::get('/import/settings/{importJob}', ['uses' => 'ImportController@settings', 'as' => 'import.settings']);
Route::post('/import/settings/{importJob}', ['uses' => 'ImportController@postSettings', 'as' => 'import.postSettings']);
/**