kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 23:50:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop

Browse Source 
# By Robert Horlings
# Via James Cole (2) and Robert Horlings (1)
* 'develop' of https://github.com/JC5/firefly-iii:
  Small bugfix
  Small bugfix in AbnAmroImport specific
This commit is contained in:
James Cole
2016-03-01 21:31:42 +01:00
parent 01be5e3e23 46dc4102e0
commit 4c35d52234
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Csv/Converter/AmountComma.php
View File

@@ -17,7 +17,7 @@ class AmountComma extends BasicConverter implements ConverterInterface
*/ */
public function convert() public function convert()
{ {
$value = str_replace(',', '.', str_val($this->value)); $value = str_replace(',', '.', strval($this->value));
if (is_numeric($value)) { if (is_numeric($value)) {
return strval($value); return strval($value);

8
app/Helpers/Csv/Specifix/AbnAmroDescription.php
View File

@@ -95,8 +95,12 @@ class AbnAmroDescription extends Specifix implements SpecifixInterface
// description and opposing account will be the same. // description and opposing account will be the same.
$this->data['opposing-account-name'] = $matches[4]; $this->data['opposing-account-name'] = $matches[4];
$this->data['description'] = $matches[4];
if( $matches[1] == 'GEA' ) {
$this->data['description'] = 'GEA ' . $matches[4];
} else {
$this->data['description'] = $matches[4];
}
return true; return true;
} }