mintable
Advanced tools
Comparing version 2.0.0-beta.45 to 2.0.0-beta.46
@@ -108,3 +108,4 @@ "use strict"; | ||
else { | ||
outputRow[CSVAccountConfig.transformer[inputColumn]] = inputRow[inputColumn]; | ||
outputRow[CSVAccountConfig.transformer[inputColumn]] = | ||
inputRow[inputColumn]; | ||
} | ||
@@ -115,7 +116,7 @@ }); | ||
var pattern = new RegExp("[^0-9.-]*", 'gi'); | ||
outputRow['amount'] = outputRow['amount'].toString().replace(pattern, ''); | ||
outputRow['amount'] = parseFloat(outputRow['amount'].toString().replace(pattern, '')); | ||
} | ||
// Parse dates | ||
if (outputRow.hasOwnProperty('date')) { | ||
outputRow['date'] = dateFns.parse(outputRow['date'], CSVAccountConfig.dateFormat, new Date()); | ||
outputRow['date'] = dateFns.parse(outputRow['date'].toString(), CSVAccountConfig.dateFormat, new Date()); | ||
} | ||
@@ -128,2 +129,5 @@ if (CSVAccountConfig.negateValues === true && outputRow.hasOwnProperty('amount')) { | ||
} | ||
if (!outputRow.hasOwnProperty('pending')) { | ||
outputRow.pending = false; | ||
} | ||
return outputRow; | ||
@@ -130,0 +134,0 @@ }); |
@@ -5,3 +5,3 @@ { | ||
"license": "MIT", | ||
"version": "2.0.0-beta.45", | ||
"version": "2.0.0-beta.46", | ||
"bin": "./lib/scripts/cli.js", | ||
@@ -8,0 +8,0 @@ "preferGlobal": true, |
@@ -49,3 +49,3 @@ import { Config } from '../../common/config' | ||
const transactions: Transaction[] = rows.map(inputRow => { | ||
const outputRow = {} as Account | ||
const outputRow = {} as Transaction | ||
@@ -55,3 +55,3 @@ Object.keys(CSVAccountConfig.transformer).map(inputColumn => { | ||
if (inputColumn.includes('+')) { | ||
outputRow[CSVAccountConfig.transformer[inputColumn]] = inputColumn | ||
outputRow[CSVAccountConfig.transformer[inputColumn] as string] = inputColumn | ||
.split('+') | ||
@@ -61,3 +61,4 @@ .map(c => inputRow[c]) | ||
} else { | ||
outputRow[CSVAccountConfig.transformer[inputColumn]] = inputRow[inputColumn] | ||
outputRow[CSVAccountConfig.transformer[inputColumn] as string] = | ||
inputRow[inputColumn] | ||
} | ||
@@ -69,3 +70,3 @@ }) | ||
const pattern = new RegExp(`[^0-9\.\-]*`, 'gi') | ||
outputRow['amount'] = outputRow['amount'].toString().replace(pattern, '') | ||
outputRow['amount'] = parseFloat(outputRow['amount'].toString().replace(pattern, '')) | ||
} | ||
@@ -76,3 +77,3 @@ | ||
outputRow['date'] = dateFns.parse( | ||
outputRow['date'], | ||
outputRow['date'].toString(), | ||
CSVAccountConfig.dateFormat, | ||
@@ -91,2 +92,6 @@ new Date() | ||
if (!outputRow.hasOwnProperty('pending')) { | ||
outputRow.pending = false | ||
} | ||
return outputRow | ||
@@ -93,0 +98,0 @@ }) |
9138439
4482