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

Mainly layout improvements.

Browse Source
This commit is contained in:
James Cole
2015-07-06 08:14:19 +02:00
parent 1658c666ab
commit 13bda0a264
13 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,14 +126,13 @@ class Importer
}
// post processing and validating.
$data = $this->postProcess($data, $row);
$result = $this->validateData($data);
$data = $this->postProcess($data, $row);
$result = $this->validateData($data);
$journal = null;
if ($result === true) {
$result = $this->createTransactionJournal($data);
} else {
Log::error('Validator: ' . $result);
$journal = $this->createTransactionJournal($data);
}
if ($result instanceof TransactionJournal) {
if ($journal instanceof TransactionJournal) {
return true;
}

4
app/Helpers/Csv/Mapper/AnyAccount.php
View File

@@ -20,13 +20,15 @@ class AnyAccount implements MapperInterface
{
$result = Auth::user()->accounts()->with('accountType')->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
$list = [];
$list = [];
/** @var Account $account */
foreach ($result as $account) {
$list[$account->id] = $account->name . ' (' . $account->accountType->type . ')';
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
return $list;
}
}

9
app/Helpers/Csv/Mapper/AssetAccount.php
View File

@@ -26,13 +26,20 @@ class AssetAccount implements MapperInterface
)->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
$list = [];
/** @var Account $account */
foreach ($result as $account) {
$list[$account->id] = $account->name;
$name = $account->name;
if (strlen($account->iban) > 0) {
$name .= ' (' . $account->iban . ')';
}
$list[$account->id] = $name;
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
return $list;
}
}

2
app/Helpers/Csv/Mapper/Bill.php
View File

@@ -27,6 +27,8 @@ class Bill implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
return $list;
}
}

2
app/Helpers/Csv/Mapper/Budget.php
View File

@@ -27,6 +27,8 @@ class Budget implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
return $list;
}
}

2
app/Helpers/Csv/Mapper/Category.php
View File

@@ -27,6 +27,8 @@ class Category implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
return $list;
}
}

2
app/Helpers/Csv/Mapper/Tag.php
View File

@@ -27,6 +27,8 @@ class Tag implements MapperInterface
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
return $list;
}
}

4
app/Helpers/Csv/Mapper/TransactionCurrency.php
View File

@@ -23,6 +23,10 @@ class TransactionCurrency implements MapperInterface
$list[$currency->id] = $currency->name . ' (' . $currency->code . ')';
}
asort($list);
array_unshift($list, trans('firefly.csv_do_not_map'));
return $list;
}
}