From e092515dfffd13e4b7f1eb975daf94f4621085da Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 23 Oct 2016 12:55:07 +0200 Subject: [PATCH] Better export. --- app/Export/Entry/Entry.php | 2 +- app/Import/Setup/CsvSetup.php | 5 +++++ config/firefly.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index 3b4ed8f568..9f2ae4dfcd 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -76,7 +76,7 @@ final class Entry // journal information: $entry->journal_id = $object->transaction_journal_id; $entry->description = $object->journal_encrypted === 1 ? Crypt::decrypt($object->journal_description) : $object->journal_description; - $entry->amount = $object->amount; // always positive + $entry->amount = round($object->amount, 2); // always positive $entry->date = $object->date; $entry->transaction_type = $object->transaction_type; $entry->currency_code = $object->transaction_currency_code; diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index 2bb8dca422..a49c5fe070 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -369,6 +369,11 @@ class CsvSetup implements SetupInterface foreach ($results as $rowIndex => $row) { + // skip first row? + if ($rowIndex === 0 && $config['has-headers']) { + continue; + } + // run specifics here: // and this is the point where the specifix go to work. foreach ($config['specifics'] as $name => $enabled) { diff --git a/config/firefly.php b/config/firefly.php index 681baa225a..9f540ab239 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -22,7 +22,7 @@ return [ 'single_user_mode' => true, ], 'chart' => 'chartjs', - 'version' => '4.1.1', + 'version' => '4.1.4', 'csv_import_enabled' => true, 'maxUploadSize' => 5242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],