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 check for column roles.

Browse Source
This commit is contained in:
James Cole
2018-01-10 19:06:27 +01:00
parent 91178d2604
commit 61f5ed3874
6 changed files with 106 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Import/Routine/SpectreRoutine.php
View File

@@ -412,8 +412,27 @@ class SpectreRoutine implements RoutineInterface
$notes = '';
$notes .= strval(trans('import.imported_from_account', ['account' => $account->getName()])) . ' '
. "\n"; // double space for newline in Markdown.
foreach ($extra as $key => $value) {
switch ($key) {
case 'account_number':
$importJournal->setValue(['role' => 'account-number', 'value' => $value]);
break;
case 'original_category':
case 'original_subcategory':
case 'customer_category_code':
case 'customer_category_name':
$tags[] = $value;
break;
case 'payee':
$importJournal->setValue(['role' => 'opposing-name', 'value' => $value]);
break;
case 'original_amount':
$importJournal->setValue(['role' => 'amount_foreign', 'value' => $value]);
break;
case 'original_currency_code':
$importJournal->setValue(['role' => 'foreign-currency-code', 'value' => $value]);
break;
default:
$notes .= $key . ': ' . $value . ' '; // for newline in Markdown.
}
@@ -494,7 +513,8 @@ class SpectreRoutine implements RoutineInterface
*/
private function runStageHaveMapping()
{
$accounts = $this->getConfig()['accounts'] ?? [];
$config = $this->getConfig();
$accounts = $config['accounts'] ?? [];
$all = [];
$count = 0;
/** @var array $accountArray */
@@ -503,7 +523,7 @@ class SpectreRoutine implements RoutineInterface
$importId = intval($config['accounts-mapped'][$account->getid()] ?? 0);
$doImport = $importId !== 0 ? true : false;
if (!$doImport) {
Log::debug('Will NOT import from Spectre account #%d ("%s")', $account->getId(), $account->getName());
Log::debug(sprintf('Will NOT import from Spectre account #%d ("%s")', $account->getId(), $account->getName()));
continue;
}
// grab all transactions