IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.7.1.1' into develop

Browse Source
This commit is contained in:
James Cole 2018-03-04 13:24:07 +01:00
commit 89a56e661d
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Import/Object/ImportAccount.php
View File

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

4
app/Import/Storage/ImportStorage.php
View File

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

6
composer.json
View File

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