kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 10:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Code for #660

Browse Source
This commit is contained in:
James Cole
2017-06-09 11:52:20 +02:00
parent 762d7bcc34
commit 1f9b7faa60
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Import/ImportStorage.php
View File

@@ -363,12 +363,14 @@ class ImportStorage
$sourceData = [ $sourceData = [
'account_id' => $accounts['source']->id, 'account_id' => $accounts['source']->id,
'transaction_journal_id' => $journal->id, 'transaction_journal_id' => $journal->id,
'transaction_currency_id' => $journal->transaction_currency_id,
'description' => null, 'description' => null,
'amount' => bcmul($amount, '-1'), 'amount' => bcmul($amount, '-1'),
]; ];
$destinationData = [ $destinationData = [
'account_id' => $accounts['destination']->id, 'account_id' => $accounts['destination']->id,
'transaction_currency_id' => $journal->transaction_currency_id,
'transaction_journal_id' => $journal->id, 'transaction_journal_id' => $journal->id,
'description' => null, 'description' => null,
'amount' => $amount, 'amount' => $amount,
@@ -383,7 +385,7 @@ class ImportStorage
} }
if (is_null($two->id)) { if (is_null($two->id)) {
Log::error('Could not create transaction 1.', $two->getErrors()->all()); Log::error('Could not create transaction 2.', $two->getErrors()->all());
$error = true; $error = true;
} }

3
app/Support/Import/CsvImportSupportTrait.php
View File

@@ -16,12 +16,15 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Mapper\MapperInterface; use FireflyIII\Import\Mapper\MapperInterface;
use FireflyIII\Import\MapperPreProcess\PreProcessorInterface; use FireflyIII\Import\MapperPreProcess\PreProcessorInterface;
use FireflyIII\Import\Specifics\SpecificInterface; use FireflyIII\Import\Specifics\SpecificInterface;
use FireflyIII\Models\ImportJob;
use League\Csv\Reader; use League\Csv\Reader;
use Log; use Log;
/** /**
* Trait CsvImportSupportTrait * Trait CsvImportSupportTrait
* *
* @property ImportJob $job
*
* @package FireflyIII\Support\Import * @package FireflyIII\Support\Import
*/ */
trait CsvImportSupportTrait trait CsvImportSupportTrait