Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 02:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2023-04-22 15:25:54 +10:00
parent cceadda985
commit e463613a4c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/BackupUpdate.php
View File

@ -11,11 +11,12 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Libraries\MultiDB; use App\Utils\Ninja;
use App\Models\Backup; use App\Models\Backup;
use App\Models\Client; use App\Models\Client;
use App\Models\Company; use App\Models\Company;
use App\Models\Document; use App\Models\Document;
use App\Libraries\MultiDB;
use App\Models\GroupSetting; use App\Models\GroupSetting;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@ -55,6 +56,9 @@ class BackupUpdate extends Command
{ {
//always return state to first DB //always return state to first DB
if(Ninja::isSelfHost())
return;
$current_db = config('database.default'); $current_db = config('database.default');
if (! config('ninja.db.multi_db_enabled')) { if (! config('ninja.db.multi_db_enabled')) {

7
app/Services/Email/Email.php
View File

@ -329,8 +329,13 @@ class Email implements ShouldQueue
*/ */
public function preFlightChecksFail(): bool public function preFlightChecksFail(): bool
{ {
/* Always send if disabled */
if($this->override) {
return false;
}
/* If we are migrating data we don't want to fire any emails */ /* If we are migrating data we don't want to fire any emails */
if ($this->company->is_disabled && !$this->override) { if ($this->company->is_disabled) {
return true; return true;
} }