Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Fixes for overriding ninja mailer

Browse Source
This commit is contained in:
David Bomba 2021-05-22 16:03:34 +10:00
parent 51999bd8a3
commit 9ddfe1ac6f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -63,6 +63,7 @@ class NinjaMailerJob implements ShouldQueue
{ {
$this->nmo = $nmo; $this->nmo = $nmo;
$this->override = $override;
} }

2
app/Jobs/Util/Import.php
View File

@ -210,7 +210,7 @@ class Import implements ShouldQueue
$this->{$method}($data[$import]); $this->{$method}($data[$import]);
} }
if(Ninja::isHosted()) if(Ninja::isHosted() && array_key_exists('ninja_tokens', $data))
$this->processNinjaTokens($data['ninja_tokens']); $this->processNinjaTokens($data['ninja_tokens']);
$this->setInitialCompanyLedgerBalances(); $this->setInitialCompanyLedgerBalances();