Experimental fix for #2031

This commit is contained in:
James Cole
2019-01-27 21:23:18 +01:00
parent 968505ac0e
commit d905849b71
6 changed files with 98 additions and 218 deletions

View File

@@ -1,7 +1,7 @@
<?php
/**
* RabobankDebitCredit.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
* BankDebitCredit.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
@@ -18,42 +18,41 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Import\Converter;
use Log;
/**
* Class RabobankDebitCredit.
*
* Class BankDebitCredit
*/
class RabobankDebitCredit implements ConverterInterface
class BankDebitCredit implements ConverterInterface
{
/**
* Convert D or A to integer values.
* Convert a value.
*
* @return mixed
*
* @param $value
*
* @return int
*/
public function convert($value): int
{
Log::debug('Going to convert ', ['value' => $value]);
if ('D' === $value) {
Log::debug('Return -1');
$negative = [
'D', // Old style Rabobank (NL). Short for "Debit"
'A', // New style Rabobank (NL). Short for "Af"
'Af', // ING (NL).
'Debet', // Triodos (NL)
];
if (\in_array(trim($value), $negative, true)) {
return -1;
}
// old format:
if ('A' === $value) {
Log::debug('Return -1');
return -1;
}
Log::debug('Return 1');
return 1;
}
}
}

View File

@@ -1,53 +0,0 @@
<?php
/**
* INGDebitCredit.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Import\Converter;
use Log;
/**
* Class INGDebitCredit.
*/
class INGDebitCredit implements ConverterInterface
{
/**
* Convert Af or Bij to correct integer values.
*
* @param $value
*
* @return int
*/
public function convert($value): int
{
Log::debug('Going to convert ing debit credit', ['value' => $value]);
if ('Af' === $value) {
Log::debug('Return -1');
return -1;
}
Log::debug('Return 1');
return 1;
}
}