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

Push some more fixes for #1378

Browse Source
This commit is contained in:
James Cole 2018-04-25 17:02:43 +02:00
parent 490c817fc1
commit 71f39f55f2
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Import/Routine/BunqRoutine.php
View File

@ -810,7 +810,7 @@ class BunqRoutine implements RoutineInterface
$this->addStep();
$account = new MonetaryAccountBank($accountData);
$importId = $account->getId();
if (1 === $mapping[$importId]) {
if (isset($mapping[$importId])) {
Log::debug(sprintf('Will grab payments for account %s', $account->getDescription()));
$request = new ListPaymentRequest();
$request->setPrivateKey($this->getPrivateKey());

7
app/Services/Bunq/Object/LabelMonetaryAccount.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Services\Bunq\Object;
use FireflyIII\Exceptions\FireflyException;
/**
* Class LabelMonetaryAccount
*/
@ -49,15 +50,15 @@ class LabelMonetaryAccount extends BunqObject
{
$this->iban = $data['iban'];
$this->isLight = $data['is_light'];
$this->avatar = new Avatar($data['avatar']);
$this->avatar = isset($data['avatar']) ? new Avatar($data['avatar']) : null;
$this->labelUser = new LabelUser($data['label_user']);
$this->country = $data['country'];
}
/**
* @return string
* @return string|null
*/
public function getIban(): string
public function getIban(): ?string
{
return $this->iban;
}

2
app/Services/Bunq/Object/LabelUser.php
View File

@ -51,7 +51,7 @@ class LabelUser extends BunqObject
$this->displayName = $data['display_name'];
$this->country = $data['country'];
$this->publicNickName = $data['public_nick_name'];
$this->avatar = new Avatar($data['avatar']);
$this->avatar = isset($data['avatar']) ? new Avatar($data['avatar']) : null;
}
/**

4
app/Services/Bunq/Object/MonetaryAccountBank.php
View File

@ -93,7 +93,7 @@ class MonetaryAccountBank extends BunqObject
$this->monetaryAccountProfile = new MonetaryAccountProfile($data['monetary_account_profile']);
$this->setting = new MonetaryAccountSetting($data['setting']);
$this->overdraftLimit = new Amount($data['overdraft_limit']);
$this->avatar = new Avatar($data['avatar']);
$this->avatar = isset($data['avatar']) ? new Avatar($data['avatar']) : null;
$this->reason = $data['reason'] ?? '';
$this->reasonDescription = $data['reason_description'] ?? '';
@ -176,7 +176,7 @@ class MonetaryAccountBank extends BunqObject
'monetary_account_profile' => $this->monetaryAccountProfile->toArray(),
'setting' => $this->setting->toArray(),
'overdraft_limit' => $this->overdraftLimit->toArray(),
'avatar' => $this->avatar->toArray(),
'avatar' => null === $this->avatar ? null : $this->avatar->toArray()->toArray(),
'reason' => $this->reason,
'reason_description' => $this->reasonDescription,
'alias' => [],