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

Fixes for deleting users / company_users and companies

Browse Source
This commit is contained in:
David Bomba 2021-05-11 17:25:34 +10:00
parent 07fa50c04e
commit e46bf71334
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/CompanyController.php
View File

@ -480,12 +480,9 @@ class CompanyController extends BaseController
if ($company_count == 1) { if ($company_count == 1) {
$company->company_users->each(function ($company_user) { $company->company_users->each(function ($company_user) {
$company_user->user->forceDelete(); $company_user->user->forceDelete();
$company_user->forceDelete();
}); });
// if (Ninja::isHosted()) {
// RefundCancelledAccount::dispatchNow($account);
// }
$account->delete(); $account->delete();
LightLogs::create(new AccountDeleted()) LightLogs::create(new AccountDeleted())
@ -493,6 +490,11 @@ class CompanyController extends BaseController
->batch(); ->batch();
} else { } else {
$company_id = $company->id; $company_id = $company->id;
$company->company_users->each(function ($company_user){
$company_user->forceDelete();
});
$company->delete(); $company->delete();
//If we are deleting the default companies, we'll need to make a new company the default. //If we are deleting the default companies, we'll need to make a new company the default.