kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 08:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug in bill name import routine

Browse Source
This commit is contained in:
James Cole
2016-04-17 20:40:26 +02:00
parent 0c0cc417ee
commit d02df46517
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Csv/Converter/BillName.php
View File

@@ -21,7 +21,7 @@ class BillName extends BasicConverter implements ConverterInterface
/** @var BillRepositoryInterface $repository */ /** @var BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface'); $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$bill = null; $bill = new Bill;
// is mapped? Then it's easy! // is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) { if (isset($this->mapped[$this->index][$this->value])) {
$bill = $repository->find($this->mapped[$this->index][$this->value]); $bill = $repository->find($this->mapped[$this->index][$this->value]);

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

@@ -147,8 +147,15 @@ class Importer
$transactionType = $this->getTransactionType(); // defaults to deposit $transactionType = $this->getTransactionType(); // defaults to deposit
$errors = new MessageBag; $errors = new MessageBag;
$journal = TransactionJournal::create( $journal = TransactionJournal::create(
['user_id' => Auth::user()->id, 'transaction_type_id' => $transactionType->id, 'transaction_currency_id' => $this->importData['currency']->id, [
'description' => $this->importData['description'], 'completed' => 0, 'date' => $date, 'bill_id' => $this->importData['bill-id'],] 'user_id' => Auth::user()->id,
'transaction_type_id' => $transactionType->id,
'transaction_currency_id' => $this->importData['currency']->id,
'description' => $this->importData['description'],
'completed' => 0,
'date' => $date,
'bill_id' => $this->importData['bill-id'],
]
); );
if ($journal->getErrors()->count() == 0) { if ($journal->getErrors()->count() == 0) {
// first transaction // first transaction

2
app/Helpers/Csv/PostProcessing/Bill.php
View File

@@ -20,7 +20,7 @@ class Bill implements PostProcessorInterface
{ {
// get bill id. // get bill id.
if (!is_null($this->data['bill'])) { if (!is_null($this->data['bill']->id)) {
$this->data['bill-id'] = $this->data['bill']->id; $this->data['bill-id'] = $this->data['bill']->id;
} }