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

Further improve import routine

Browse Source
This commit is contained in:
James Cole
2017-06-21 20:04:35 +02:00
parent a905cce2c9
commit cddaccb7f7
7 changed files with 290 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Import/Object/ImportJournal.php
View File

@@ -33,7 +33,7 @@ class ImportJournal
/** @var ImportBudget */
public $budget;
/** @var string */
public $description;
public $description = '';
/** @var Collection */
public $errors;
/** @var string */
@@ -43,7 +43,7 @@ class ImportJournal
/** @var string */
private $amount = '0';
/** @var ImportBill */
private $bill;
public $bill;
/** @var ImportCategory */
public $category;
/** @var ImportCurrency */
@@ -54,11 +54,16 @@ class ImportJournal
private $externalId = '';
/** @var array */
private $modifiers = [];
/** @var array */
private $tags = [];
/** @var string */
public $notes = '';
/** @var string */
private $transactionType = '';
/** @var User */
private $user;
/** @var array */
public $metaDates = [];
/**
* ImportEntry constructor.
@@ -151,6 +156,7 @@ class ImportJournal
$this->opposing->setUser($user);
$this->budget->setUser($user);
$this->category->setUser($user);
$this->bill->setUser($user);
}
/**
@@ -214,6 +220,12 @@ class ImportJournal
case 'description':
$this->description = $array['value'];
break;
case 'sepa-ct-op':
case 'sepa-ct-id':
case 'sepa-db':
$this->notes .= ' '.$array['value'];
$this->notes = trim($this->notes);
break;
case 'external-id':
$this->externalId = $array['value'];
break;
@@ -239,6 +251,16 @@ class ImportJournal
case 'tags-space':
$this->tags[] = $array;
break;
// 'interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date',
case 'date-interest':
$this->metaDates['interest_date'] = $array['value'];
break;
case 'date-book':
$this->metaDates['book_date'] = $array['value'];
break;
case 'date-process':
$this->metaDates['process_date'] = $array['value'];
break;
}
}
}