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

Fixed some problems.

Browse Source
This commit is contained in:
James Cole
2015-07-06 16:42:19 +02:00
parent d05c165ace
commit 6bdb6db330
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Csv/Importer.php
View File

@@ -128,7 +128,6 @@ class Importer
// post processing and validating. // post processing and validating.
$data = $this->postProcess($data, $row); $data = $this->postProcess($data, $row);
$result = $this->validateData($data); $result = $this->validateData($data);
$journal = null;
if ($result === true) { if ($result === true) {
$journal = $this->createTransactionJournal($data); $journal = $this->createTransactionJournal($data);
} else { } else {
@@ -274,6 +273,7 @@ class Importer
$journal->save(); $journal->save();
} else { } else {
$text = join(',', $errors->all()); $text = join(',', $errors->all());
return $text; return $text;
} }

1
app/Http/Controllers/CsvController.php
View File

@@ -106,7 +106,6 @@ class CsvController extends Controller
'date-format' => Session::get('date-format'), 'date-format' => Session::get('date-format'),
'has-headers' => Session::get('csv-has-headers') 'has-headers' => Session::get('csv-has-headers')
]; ];
// $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-mapped'];
if (Session::has('csv-map')) { if (Session::has('csv-map')) {
$data['map'] = Session::get('csv-map'); $data['map'] = Session::get('csv-map');
} }

1
app/Support/ExpandedForm.php
View File

@@ -349,7 +349,6 @@ class ExpandedForm
/** /**
* @param $name * @param $name
* @param null $value
* @param array $options * @param array $options
* *
* @return string * @return string

2
app/Validation/FireflyValidator.php
View File

@@ -59,7 +59,7 @@ class FireflyValidator extends Validator
* @param $value * @param $value
* @param $parameters * @param $parameters
*/ */
public function validateIban($attribute, $value, $parameters) public function validateIban($attribute, $value)
{ {
$value = strtoupper($value); $value = strtoupper($value);