kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

All code for bunq.

Browse Source
This commit is contained in:
James Cole
2018-05-23 12:36:12 +02:00
parent 4db2ec60e0
commit 2b2f37a8c9
56 changed files with 1168 additions and 4484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Import/JobStatusController.php
View File

@@ -94,7 +94,7 @@ class JobStatusController extends Controller
if ($count === 0) {
$json['report_txt'] = trans('import.result_no_transactions');
}
if ($count === 1) {
if ($count === 1 && null !== $importJob->tag_id) {
$json['report_txt'] = trans('import.result_one_transaction', ['route' => route('tags.show', [$importJob->tag_id]), 'tag' => $importJob->tag->tag]);
}
if ($count > 1 && null !== $importJob->tag_id) {

4
app/Http/Controllers/Import/PrerequisitesController.php
View File

@@ -151,8 +151,8 @@ class PrerequisitesController extends Controller
if ($result->count() > 0) {
$request->session()->flash('error', $result->first());
// redirect back:
return redirect(route('import.prerequisites.index', [$importProvider, $importJob->key]))->withInput();
// redirect back to job, if has job:
return redirect(route('import.prerequisites.index', [$importProvider, $importJob->key ?? '']))->withInput();
}
// session flash!