tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5625 from turbo124/v5-develop

Browse source 
Add default include for mini_load
This commit is contained in:
David Bomba 2021-05-06 13:34:16 +10:00 • committed by GitHub
commit e9b21af5b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/BaseController.php
View file

@ -107,11 +107,11 @@ class BaseController extends Controller
'token',
'company.activities',
'company.documents',
//'company.users.company_user',
'company.users.company_user',
'company.tax_rates',
'company.groups',
'company.payment_terms',
'company.designs.company'
'company.designs.company',
];
public function __construct()

2
app/Jobs/Util/VersionCheck.php
View file

@ -49,7 +49,7 @@ class VersionCheck implements ShouldQueue
if(!$account)
return;
if($account->plan == 'white_label' && $account->plan_expires->lt(now())){
if($account->plan == 'white_label' && $account->plan_expires && $account->plan_expires->lt(now())){
$account->plan = null;
$account->plan_expires = null;
$account->save();