Fix import problem in 4.7.1

This commit is contained in:
James Cole 2018-03-04 13:23:44 +01:00
parent 03f46638e1
commit d5aeca6222
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 12 additions and 9 deletions

View File

@ -382,11 +382,12 @@ class ImportAccount
Log::debug(sprintf('Found no account of type %s so must create one ourselves.', $this->expectedType));
$data = [
'accountType' => config('firefly.shortNamesByFullName.' . $this->expectedType),
'name' => $this->accountName['value'] ?? '(no name)',
'iban' => $this->accountIban['value'] ?? null,
'active' => true,
'virtualBalance' => '0',
'accountType' => config('firefly.shortNamesByFullName.' . $this->expectedType),
'name' => $this->accountName['value'] ?? '(no name)',
'iban' => $this->accountIban['value'] ?? null,
'active' => true,
'virtualBalance' => '0',
'account_type_id' => null,
];
$this->account = $this->repository->store($data);

View File

@ -57,11 +57,11 @@ class ImportStorage
/** @var Collection */
public $journals;
/** @var BillRepositoryInterface */
protected $billRepository; // yes, hard coded
protected $billRepository;
/** @var Collection */
protected $bills;
/** @var int */
protected $defaultCurrencyId = 1;
protected $defaultCurrencyId = 1; // yes, hard coded
/** @var ImportJob */
protected $job;
/** @var ImportJobRepositoryInterface */

View File

@ -113,11 +113,13 @@
"php artisan firefly:upgrade-database",
"php artisan firefly:verify",
"php artisan firefly:instructions update",
"php artisan optimize"
"php artisan optimize",
"php artisan passport:install"
],
"post-install-cmd": [
"php artisan optimize",
"php artisan firefly:instructions install"
"php artisan firefly:instructions install",
"php artisan passport:install"
]
},
"config": {