kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix #931

Browse Source
This commit is contained in:
James Cole
2017-11-18 20:26:42 +01:00
parent 6bda5c2d53
commit cd42399c29
9 changed files with 158 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Import/Converter/Amount.php
View File

@@ -88,6 +88,7 @@ class Amount implements ConverterInterface
Log::debug(sprintf('No decimal character found. Converted amount from "%s" to "%s".', $oldValue, $value));
}
return strval(round(floatval($value), 12));
$number = strval(number_format(round(floatval($value), 12), 12));
return $number;
}
}

44
app/Import/Converter/AmountCredit.php Normal file
View File

@@ -0,0 +1,44 @@
<?php
/**
* AmountCredit.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;
/**
* Class AmountCredit
*/
class AmountCredit implements ConverterInterface
{
/**
* @param $value
*
* @return string
*/
public function convert($value): string
{
/** @var ConverterInterface $converter */
$converter = app(Amount::class);
$result = $converter->convert($value);
$result = app('steam')->positive($result);
return $result;
}
}

45
app/Import/Converter/AmountDebet.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
/**
* AmountDebet.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;
/**
* Class AmountDebet
*/
class AmountDebet implements ConverterInterface
{
/**
* @param $value
*
* @return string
*/
public function convert($value): string
{
/** @var ConverterInterface $converter */
$converter = app(Amount::class);
$result = $converter->convert($value);
$result = app('steam')->positive($result);
$result = bcmul($result, '-1');
return $result;
}
}

47
app/Import/Object/ImportJournal.php
View File

@@ -59,8 +59,12 @@ class ImportJournal
public $opposing;
/** @var array */
public $tags = [];
/** @var string */
/** @var array */
private $amount;
/** @var array */
private $amountCredit;
/** @var array */
private $amountDebet;
/** @var string */
private $convertedAmount = null;
/** @var string */
@@ -101,11 +105,40 @@ class ImportJournal
public function getAmount(): string
{
Log::debug('Now in getAmount()');
Log::debug(sprintf('amount is %s', var_export($this->amount, true)));
Log::debug(sprintf('debet amount is %s', var_export($this->amountDebet, true)));
Log::debug(sprintf('credit amount is %s', var_export($this->amountCredit, true)));
if (null === $this->convertedAmount) {
// first check if the amount is set:
Log::debug('convertedAmount is NULL');
$info = [];
$converterClass = '';
if (!is_null($this->amount)) {
Log::debug('Amount value is not NULL, assume this is the correct value.');
$converterClass = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $this->amount['role'])));
$info = $this->amount;
}
if (!is_null($this->amountDebet)) {
Log::debug('Amount DEBET value is not NULL, assume this is the correct value (overrules Amount).');
$converterClass = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $this->amountDebet['role'])));
$info = $this->amountDebet;
}
if (!is_null($this->amountCredit)) {
Log::debug('Amount CREDIT value is not NULL, assume this is the correct value (overrules Amount and AmountDebet).');
$converterClass = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $this->amountCredit['role'])));
$info = $this->amountCredit;
}
if (count($info) === 0) {
throw new FireflyException('No amount information for this row.');
}
Log::debug(sprintf('Converter class is %s', $converterClass));
/** @var ConverterInterface $amountConverter */
$amountConverter = app(Amount::class);
$this->convertedAmount = $amountConverter->convert($this->amount);
$amountConverter = app($converterClass);
$this->convertedAmount = $amountConverter->convert($info['value']);
Log::debug(sprintf('First attempt to convert gives "%s"', $this->convertedAmount));
// modify
foreach ($this->modifiers as $modifier) {
@@ -196,7 +229,13 @@ class ImportJournal
$this->asset->setAccountId($array);
break;
case 'amount':
$this->amount = $array['value'];
$this->amount = $array;
break;
case 'amount_debet':
$this->amountDebet = $array;
break;
case 'amount_credit':
$this->amountCredit = $array;
break;
case 'account-iban':
$this->asset->setAccountIban($array);