This commit is contained in:
James Cole 2017-12-21 19:18:53 +01:00
parent 840705f793
commit 707af8bb4e
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 23 additions and 2 deletions

View File

@ -22,8 +22,10 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Logging\CommandHandler;
use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Import\Routine\RoutineInterface;
use FireflyIII\Models\ImportJob;
use Illuminate\Console\Command;
use Illuminate\Support\MessageBag;
@ -81,8 +83,16 @@ class Import extends Command
$handler = new CommandHandler($this);
$monolog->pushHandler($handler);
/** @var ImportRoutine $routine */
$routine = app(ImportRoutine::class);
// actually start job:
$type = $job->file_type === 'csv' ? 'file' : $job->file_type;
$key = sprintf('import.routine.%s', $type);
$className = config($key);
if (null === $className || !class_exists($className)) {
throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
}
/** @var RoutineInterface $routine */
$routine = app($className);
$routine->setJob($job);
$routine->run();

View File

@ -245,6 +245,10 @@ class ImportJournal
$this->notes .= ' ' . $array['value'];
$this->notes = trim($this->notes);
break;
case 'note':
$this->notes .= ' ' . $array['value'];
$this->notes = trim($this->notes);
break;
case 'external-id':
$this->externalId = $array['value'];
break;

View File

@ -89,6 +89,12 @@ return [
'converter' => 'BillId',
'mapper' => 'Bills',
],
'note' => [
'mappable' => false,
'pre-process-map' => false,
'field' => 'note',
'converter' => 'Note',
],
'bill-name' => [
'mappable' => true,
'pre-process-map' => false,

View File

@ -138,6 +138,7 @@ return [
'column_tags-space' => 'Tags (space separated)',
'column_account-number' => 'Asset account (account number)',
'column_opposing-number' => 'Opposing account (account number)',
'column_note' => 'Note(s)',
// bunq
'bunq_prerequisites_title' => 'Prerequisites for an import from bunq',