mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge pull request #5625 from turbo124/v5-develop
Add default include for mini_load
This commit is contained in:
commit
e9b21af5b0
@ -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()
|
||||
|
@ -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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user