kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +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;
}
}