More debug, some bug fixes.

This commit is contained in:
James Cole
2015-07-09 19:36:14 +02:00
parent 20cffd0502
commit 8e61e129ab
8 changed files with 15 additions and 11 deletions

View File

@@ -27,7 +27,9 @@ class AnyAccount implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
$list = [0 => trans('firefly.csv_do_not_map')] + $list;
//array_unshift($list, );
return $list;
}

View File

@@ -38,7 +38,7 @@ class AssetAccount implements MapperInterface
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
$list = [0 => trans('firefly.csv_do_not_map')] + $list;
return $list;
}

View File

@@ -27,7 +27,7 @@ class Bill implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
$list = [0 => trans('firefly.csv_do_not_map')] + $list;
return $list;
}

View File

@@ -27,7 +27,7 @@ class Budget implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
$list = [0 => trans('firefly.csv_do_not_map')] + $list;
return $list;
}

View File

@@ -27,7 +27,7 @@ class Category implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
$list = [0 => trans('firefly.csv_do_not_map')] + $list;
return $list;
}

View File

@@ -27,7 +27,7 @@ class Tag implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
$list = [0 => trans('firefly.csv_do_not_map')] + $list;
return $list;
}

View File

@@ -25,7 +25,7 @@ class TransactionCurrency implements MapperInterface
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
$list = [0 => trans('firefly.csv_do_not_map')] + $list;
return $list;
}

View File

@@ -35,13 +35,15 @@ class RabobankDescription
protected function rabobankFixEmptyOpposing()
{
Log::debug('RaboSpecifix: Opposing account name is "' . $this->data['opposing-account-name'] . '".');
if (strlen($this->data['opposing-account-name']) == 0) {
if (is_string($this->data['opposing-account-name']) && strlen($this->data['opposing-account-name']) == 0) {
Log::debug('RaboSpecifix: opp-name is zero length, changed to: "' . $this->row[10] . '"');
$this->data['opposing-account-name'] = $this->row[10];
Log::debug('Description was: "' . $this->data['description'] . '".');
$this->data['description'] = trim(str_replace($this->row[10], '', $this->data['description']));
Log::debug('Description is now: "' . $this->data['description'] . '".');
}
Log::debug('Description was: "' . $this->data['description'] . '".');
$this->data['description'] = trim(str_replace($this->row[10], '', $this->data['description']));
Log::debug('Description is now: "' . $this->data['description'] . '".');
}
/**