kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-02-14 15:55:45 +00:00
Code Issues Projects Releases Wiki Activity

Import routine can handle new SEPA fields and many new date fields. See #1248

Browse Source
This commit is contained in:
James Cole
2018-03-19 19:38:17 +01:00
parent 4e69bc0e32
commit aecffe10d9
6 changed files with 113 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Import/Storage/ImportStorage.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\Note;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Support\Collection;
use Log;
use Preferences;
@@ -61,9 +62,11 @@ class ImportStorage
/** @var Collection */
protected $bills;
/** @var int */
protected $defaultCurrencyId = 1; // yes, hard coded
protected $defaultCurrencyId = 1;
/** @var ImportJob */
protected $job;
protected $job; // yes, hard coded
/** @var JournalRepositoryInterface */
protected $journalRepository;
/** @var ImportJobRepositoryInterface */
protected $repository;
/** @var Collection */
@@ -104,8 +107,10 @@ class ImportStorage
*/
public function setJob(ImportJob $job)
{
$this->repository = app(ImportJobRepositoryInterface::class);
$this->repository = app(ImportJobRepositoryInterface::class);
$this->journalRepository = app(JournalRepositoryInterface::class);
$this->repository->setUser($job->user);
$this->journalRepository->setUser($job->user);
$config = $this->repository->getConfiguration($job);
$currency = app('amount')->getDefaultCurrencyByUser($job->user);
@@ -232,9 +237,13 @@ class ImportStorage
$importJournal->bill->setAmount($amount);
$this->storeBill($journal, $importJournal->bill->getBill());
$this->storeMeta($journal, $importJournal->metaDates);
$this->storeMetaDates($journal, $importJournal->metaDates);
$this->storeTags($importJournal->tags, $journal);
foreach ($importJournal->metaFields as $field => $value) {
$this->journalRepository->setMetaString($journal, $field, $value);
}
// set notes for journal:
$dbNote = new Note();
$dbNote->noteable()->associate($journal);