IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-05 21:53:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better export.

Browse Source
This commit is contained in:
James Cole 2016-10-23 12:55:07 +02:00
parent 81f6fef978
commit e092515dff
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/Entry/Entry.php
View File

@ -76,7 +76,7 @@ final class Entry
// journal information: // journal information:
$entry->journal_id = $object->transaction_journal_id; $entry->journal_id = $object->transaction_journal_id;
$entry->description = $object->journal_encrypted === 1 ? Crypt::decrypt($object->journal_description) : $object->journal_description; $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->date = $object->date;
$entry->transaction_type = $object->transaction_type; $entry->transaction_type = $object->transaction_type;
$entry->currency_code = $object->transaction_currency_code; $entry->currency_code = $object->transaction_currency_code;

5
app/Import/Setup/CsvSetup.php
View File

@ -369,6 +369,11 @@ class CsvSetup implements SetupInterface
foreach ($results as $rowIndex => $row) { foreach ($results as $rowIndex => $row) {
// skip first row?
if ($rowIndex === 0 && $config['has-headers']) {
continue;
}
// run specifics here: // run specifics here:
// and this is the point where the specifix go to work. // and this is the point where the specifix go to work.
foreach ($config['specifics'] as $name => $enabled) { foreach ($config['specifics'] as $name => $enabled) {

2
config/firefly.php
View File

@ -22,7 +22,7 @@ return [
'single_user_mode' => true, 'single_user_mode' => true,
], ],
'chart' => 'chartjs', 'chart' => 'chartjs',
'version' => '4.1.1', 'version' => '4.1.4',
'csv_import_enabled' => true, 'csv_import_enabled' => true,
'maxUploadSize' => 5242880, 'maxUploadSize' => 5242880,
'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],