Greatly expanded the CSV routine.

app/Helpers/Csv/Converter/AccountIban.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 05/07/15
+ * Time: 05:49
+ */
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+use Auth;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+
+/**
+ * Class AccountIban
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+class AccountIban extends BasicConverter implements ConverterInterface
+{
+
+    /**
+     * @return Account|null
+     */
+    public function convert()
+    {
+        // is mapped? Then it's easy!
+        if (isset($this->mapped[$this->index][$this->value])) {
+            $account = Auth::user()->accounts()->find($this->mapped[$this->index][$this->value]);
+        } else {
+            // find or create new account:
+            $accountType = AccountType::where('type', 'Asset account')->first();
+            $account     = Account::firstOrCreateEncrypted(
+                [
+                    'name'            => $this->value,
+                    //'iban'            => $this->value,
+                    'user_id'         => Auth::user()->id,
+                    'account_type_id' => $accountType->id
+                ]
+            );
+        }
+
+        return $account;
+    }
+}

app/Helpers/Csv/Converter/Amount.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 05/07/15
+ * Time: 05:49
+ */
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+use FireflyIII\Models\Account;
+
+/**
+ * Class Amount
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+class Amount extends BasicConverter implements ConverterInterface
+{
+
+    /**
+     * @return Account|null
+     */
+    public function convert()
+    {
+        if (is_numeric($this->value)) {
+            return $this->value;
+        }
+
+        return 0;
+    }
+}

app/Helpers/Csv/Converter/BasicConverter.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+/**
+ * Class BasicConverter
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+class BasicConverter
+{
+    /** @var  array */
+    protected $data;
+    protected $index;
+    /** @var  array */
+    protected $mapped;
+    protected $role;
+    protected $value;
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * @param array $data
+     */
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+
+    /**
+     * @param mixed $index
+     */
+    public function setIndex($index)
+    {
+        $this->index = $index;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMapped()
+    {
+        return $this->mapped;
+    }
+
+    /**
+     * @param array $mapped
+     */
+    public function setMapped($mapped)
+    {
+        $this->mapped = $mapped;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRole()
+    {
+        return $this->role;
+    }
+
+    /**
+     * @param mixed $role
+     */
+    public function setRole($role)
+    {
+        $this->role = $role;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
+
+
+}

app/Helpers/Csv/Converter/ConverterInterface.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 05/07/15
+ * Time: 05:42
+ */
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+/**
+ * Interface ConverterInterface
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+interface ConverterInterface
+{
+
+    /**
+     * @return mixed
+     */
+    public function convert();
+
+    /**
+     * @param $index
+     */
+    public function setIndex($index);
+
+    /**
+     * @param $mapped
+     */
+    public function setMapped($mapped);
+
+    /**
+     * @param $role
+     */
+    public function setRole($role);
+
+    /**
+     * @param $value
+     */
+    public function setValue($value);
+
+    /**
+     * @param array $data
+     *
+     * @return mixed
+     */
+    public function setData(array $data);
+
+}

app/Helpers/Csv/Converter/CurrencyCode.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace FireflyIII\Helpers\Csv\Converter;
+use FireflyIII\Models\TransactionCurrency;
+
+/**
+ * Class CurrencyCode
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+class CurrencyCode extends BasicConverter implements ConverterInterface
+{
+
+    /**
+     * @return mixed|static
+     */
+    public function convert()
+    {
+        if (isset($this->mapped[$this->index][$this->value])) {
+            $currency = TransactionCurrency::find($this->mapped[$this->index][$this->value]);
+        } else {
+            $currency = TransactionCurrency::whereCode($this->value)->first();
+        }
+
+        return $currency;
+    }
+}

app/Helpers/Csv/Converter/Date.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 05/07/15
+ * Time: 05:49
+ */
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+use Carbon\Carbon;
+use Session;
+
+/**
+ * Class Date
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+class Date extends BasicConverter implements ConverterInterface
+{
+
+    /**
+     * @return Carbon
+     */
+    public function convert()
+    {
+        $format = Session::get('csv-date-format');
+
+        $date = Carbon::createFromFormat($format, $this->value);
+
+        return $date;
+    }
+}

app/Helpers/Csv/Converter/Ignore.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+use FireflyIII\Models\Account;
+
+/**
+ * Class Amount
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+class Ignore extends BasicConverter implements ConverterInterface
+{
+
+    /**
+     * @return Account|null
+     */
+    public function convert()
+    {
+        return null;
+    }
+}

app/Helpers/Csv/Converter/RabobankDebetCredit.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 05/07/15
+ * Time: 06:12
+ */
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+
+class RabobankDebetCredit extends BasicConverter implements ConverterInterface
+{
+
+
+    /**
+     * @return mixed
+     */
+    public function convert()
+    {
+        if ($this->value == 'D') {
+            return -1;
+        }
+
+        return 1;
+    }
+}