mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-21 08:51:34 +02:00
fixes
This commit is contained in:
parent
16378d551d
commit
d5a9a1c839
@ -53,22 +53,6 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
|
|||||||
$this->bank_integration = $bank_integration;
|
$this->bank_integration = $bank_integration;
|
||||||
$this->from_date = $bank_integration->from_date;
|
$this->from_date = $bank_integration->from_date;
|
||||||
$this->company = $this->bank_integration->company;
|
$this->company = $this->bank_integration->company;
|
||||||
|
|
||||||
if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_NORDIGEN)
|
|
||||||
throw new \Exception("Invalid BankIntegration Type");
|
|
||||||
|
|
||||||
if (!(($this->account->bank_integration_secret_id && $this->account->integration_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key'))))
|
|
||||||
throw new \Exception("Missing credentials for bank_integration service nortigen");
|
|
||||||
|
|
||||||
if ($this->account->bank_integration_secret_id && $this->account->bank_integration_secret_key) {
|
|
||||||
$this->secret_id = $this->account->bank_integration_secret_id;
|
|
||||||
$this->secret_key = $this->account->bank_integration_secret_key;
|
|
||||||
} else {
|
|
||||||
$this->secret_id = config('ninja.nordigen.secret_id');
|
|
||||||
$this->secret_key = config('ninja.nordigen.secret_key');
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->nordigen = new Nordigen($this->secret_id, $this->secret_key);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -80,6 +64,22 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
|
|||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_NORDIGEN)
|
||||||
|
throw new \Exception("Invalid BankIntegration Type");
|
||||||
|
|
||||||
|
if (!(($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key'))))
|
||||||
|
throw new \Exception("Missing credentials for bank_integration service nortigen");
|
||||||
|
|
||||||
|
if ($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) {
|
||||||
|
$this->secret_id = $this->account->bank_integration_nordigen_secret_id;
|
||||||
|
$this->secret_key = $this->account->bank_integration_nordigen_secret_key;
|
||||||
|
} else {
|
||||||
|
$this->secret_id = config('ninja.nordigen.secret_id');
|
||||||
|
$this->secret_key = config('ninja.nordigen.secret_key');
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->nordigen = new Nordigen($this->secret_id, $this->secret_key);
|
||||||
|
|
||||||
set_time_limit(0);
|
set_time_limit(0);
|
||||||
|
|
||||||
//Loop through everything until we are up to date
|
//Loop through everything until we are up to date
|
||||||
|
@ -52,10 +52,6 @@ class ProcessBankTransactionsYodlee implements ShouldQueue
|
|||||||
$this->bank_integration = $bank_integration;
|
$this->bank_integration = $bank_integration;
|
||||||
$this->from_date = $bank_integration->from_date;
|
$this->from_date = $bank_integration->from_date;
|
||||||
$this->company = $this->bank_integration->company;
|
$this->company = $this->bank_integration->company;
|
||||||
|
|
||||||
if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_YODLEE)
|
|
||||||
throw new \Exception("Invalid BankIntegration Type");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -66,6 +62,10 @@ class ProcessBankTransactionsYodlee implements ShouldQueue
|
|||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_YODLEE)
|
||||||
|
throw new \Exception("Invalid BankIntegration Type");
|
||||||
|
|
||||||
set_time_limit(0);
|
set_time_limit(0);
|
||||||
|
|
||||||
//Loop through everything until we are up to date
|
//Loop through everything until we are up to date
|
||||||
|
Loading…
Reference in New Issue
Block a user