Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for import

Browse Source
This commit is contained in:
David Bomba 2023-01-20 10:58:24 +11:00
parent 24aa73c359
commit c62456b319
5 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Account/CreateAccount.php
View File

@ -86,7 +86,7 @@ class CreateAccount
$sp794f3f->hosted_company_count = config('ninja.quotas.free.max_companies');
$sp794f3f->account_sms_verified = true;
if(in_array($this->getDomain($this->request['email']), ['givmail.com','yopmail.com','gmail.com', 'hotmail.com', 'outlook.com', 'yahoo.com', 'aol.com', 'mail.ru'])){
if(in_array($this->getDomain($this->request['email']), ['givmail.com','yopmail.com','gmail.com', 'hotmail.com', 'outlook.com', 'yahoo.com', 'aol.com', 'mail.ru','brand-app.biz','proton.me','ema-sofia.eu'])){
$sp794f3f->account_sms_verified = false;
}

6
app/Jobs/Company/CompanyImport.php
View File

@ -506,6 +506,12 @@ class CompanyImport implements ShouldQueue
}
if(Ninja::isHosted())
{
$this->company->portal_mode = 'sub_domain';
$this->company->portal_domain = '';
}
$this->company->save();
return $this;

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

@ -516,6 +516,12 @@ class Import implements ShouldQueue
}
if(Ninja::isHosted())
{
$data['portal_mode'] = 'subdomain';
$data['portal_domain'] = '';
}
$data['settings'] = $company_settings;
}
@ -564,6 +570,11 @@ class Import implements ShouldQueue
TaxRate::reguard();
if(TaxRate::count() > 0){
$this->company->enabled_tax_rates = 2;
$this->company->save();
}
/*Improve memory handling by setting everything to null when we have finished*/
$data = null;
$rules = null;

5
app/Models/Document.php
View File

@ -101,6 +101,11 @@ class Document extends BaseModel
return $this->morphTo();
}
public function user()
{
return $this->belongsTo(User::class)->withTrashed();
}
public function generateUrl($absolute = false)
{
$url = Storage::disk($this->disk)->url($this->url);

9
app/Policies/DocumentPolicy.php
View File

@ -1,4 +1,13 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\Policies;