kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 21:23:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #1092

Browse Source
This commit is contained in:
James Cole
2018-01-03 07:35:29 +01:00
parent 30f64af55f
commit 4e0319bacc
8 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Import/Configuration/SpectreConfigurator.php
View File

@@ -66,6 +66,7 @@ class SpectreConfigurator implements ConfiguratorInterface
// update config to tell Firefly the user is redirected.
$config = $this->job->configuration;
$config['is-redirected'] = true;
$config['stage'] = 'redirected';
$this->job->configuration = $config;
$this->job->status = 'configured';
$this->job->save();
@@ -117,7 +118,7 @@ class SpectreConfigurator implements ConfiguratorInterface
*/
public function setJob(ImportJob $job)
{
$defaultConfig = [
$defaultConfig = [
'has-token' => false,
'token' => '',
'token-expires' => 0,
@@ -125,12 +126,17 @@ class SpectreConfigurator implements ConfiguratorInterface
'is-redirected' => false,
'customer' => null,
'login' => null,
'stage' => 'initial',
'accounts' => [],
];
$extendedStatus = $job->extended_status;
$extendedStatus['steps'] = 100;
$config = $job->configuration;
$finalConfig = array_merge($defaultConfig, $config);
$job->configuration = $finalConfig;
$config = $job->configuration;
$finalConfig = array_merge($defaultConfig, $config);
$job->configuration = $finalConfig;
$job->extended_status = $extendedStatus;
$job->save();
$this->job = $job;
}