mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-24 02:14:21 -04:00
Fixes for deleting users / company_users and companies
This commit is contained in:
parent
07fa50c04e
commit
e46bf71334
@ -480,12 +480,9 @@ class CompanyController extends BaseController
|
||||
if ($company_count == 1) {
|
||||
$company->company_users->each(function ($company_user) {
|
||||
$company_user->user->forceDelete();
|
||||
$company_user->forceDelete();
|
||||
});
|
||||
|
||||
// if (Ninja::isHosted()) {
|
||||
// RefundCancelledAccount::dispatchNow($account);
|
||||
// }
|
||||
|
||||
$account->delete();
|
||||
|
||||
LightLogs::create(new AccountDeleted())
|
||||
@ -493,6 +490,11 @@ class CompanyController extends BaseController
|
||||
->batch();
|
||||
} else {
|
||||
$company_id = $company->id;
|
||||
|
||||
$company->company_users->each(function ($company_user){
|
||||
$company_user->forceDelete();
|
||||
});
|
||||
|
||||
$company->delete();
|
||||
|
||||
//If we are deleting the default companies, we'll need to make a new company the default.
|
||||
|
Loading…
x
Reference in New Issue
Block a user