kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +00:00
Code Issues Projects Releases Wiki Activity

Lots of new code for the import routine part 2

Browse Source
This commit is contained in:
James Cole
2017-12-16 17:19:10 +01:00
parent 84b6708260
commit 66ee382da0
32 changed files with 351 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Import/FileController.php
View File

@@ -81,7 +81,7 @@ class FileController extends Controller
if ($configurator->isJobConfigured()) {
$this->repository->updateStatus($job, 'configured');
return redirect(route('import.file.status', [$job->key]));
return redirect(route('import.status', [$job->key]));
}
$view = $configurator->getNextView();
$data = $configurator->getNextData();
@@ -227,6 +227,7 @@ class FileController extends Controller
* @param ImportJob $job
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws FireflyException
*/
public function postConfigure(Request $request, ImportJob $job)
{
@@ -235,7 +236,7 @@ class FileController extends Controller
// is the job already configured?
if ($configurator->isJobConfigured()) {
return redirect(route('import.file.status', [$job->key]));
return redirect(route('import.status', [$job->key]));
}
$data = $request->all();
$configurator->configureJob($data);
@@ -248,7 +249,7 @@ class FileController extends Controller
}
// return to configure
return redirect(route('import.file.configure', [$job->key]));
return redirect(route('import.configure', [$job->key]));
}
/**
@@ -285,7 +286,7 @@ class FileController extends Controller
$subTitle = trans('firefly.import_status_sub_title');
$subTitleIcon = 'fa-star';
return view('import.file.status', compact('job', 'subTitle', 'subTitleIcon'));
return view('import.status', compact('job', 'subTitle', 'subTitleIcon'));
}
/**