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

More translations.

Browse Source
This commit is contained in:
James Cole
2015-07-06 10:39:44 +02:00
parent 5b50abb2c7
commit 39af9e4414
7 changed files with 126 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Helpers/Csv/Importer.php
View File

@@ -30,7 +30,7 @@ class Importer
/** @var array */
protected $errors;
/** @var int */
protected $imported;
protected $imported = 0;
/** @var array */
protected $map;
/** @var array */
@@ -131,12 +131,14 @@ class Importer
$journal = null;
if ($result === true) {
$journal = $this->createTransactionJournal($data);
} else {
return $result;
}
if ($journal instanceof TransactionJournal) {
return true;
}
return 'Not a journal.';
return $journal;
}
@@ -278,6 +280,9 @@ class Importer
if ($errors->count() == 0) {
$journal->completed = 1;
$journal->save();
} else {
$text = join(',', $errors->all());
return $text;
}
// add budget: