From d211555beb450fd059afbe749250d6a8a04e6921 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 20 Jan 2016 21:24:27 +0100 Subject: [PATCH] Only fire post-processing specifix in the import routine. See issue #145 --- app/Helpers/Csv/Importer.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Helpers/Csv/Importer.php b/app/Helpers/Csv/Importer.php index 2aa4274b26..8f139d8bc8 100644 --- a/app/Helpers/Csv/Importer.php +++ b/app/Helpers/Csv/Importer.php @@ -246,6 +246,8 @@ class Importer Log::debug('Column #' . $index . ' (role: ' . $role . ') : converter ' . $class . ' stores its data into field ' . $field . ':'); + // here would be the place where preprocessors would fire. + /** @var ConverterInterface $converter */ $converter = app('FireflyIII\Helpers\Csv\Converter\\' . $class); $converter->setData($data); // the complete array so far. @@ -294,10 +296,12 @@ class Importer foreach ($this->getSpecifix() as $className) { /** @var SpecifixInterface $specifix */ $specifix = app('FireflyIII\Helpers\Csv\Specifix\\' . $className); - $specifix->setData($this->importData); - $specifix->setRow($this->importRow); - Log::debug('Now post-process specifix named ' . $className . ':'); - $this->importData = $specifix->fix(); + if ($specifix->getProcessorType() == SpecifixInterface::POST_PROCESSOR) { + $specifix->setData($this->importData); + $specifix->setRow($this->importRow); + Log::debug('Now post-process specifix named ' . $className . ':'); + $this->importData = $specifix->fix(); + } }