From e35b1b6871b99620669c965c0c706e934418d53f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 9 Jun 2020 19:29:41 +1000 Subject: [PATCH] Debugging company delete issues --- app/Http/Controllers/CompanyController.php | 5 ++++- app/Http/Requests/Company/DestroyCompanyRequest.php | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index f34980d6f431..19c68657414b 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -466,11 +466,12 @@ class CompanyController extends BaseController */ public function destroy(DestroyCompanyRequest $request, Company $company) { + $company_count = $company->account->companies->count(); $account = $company->account; if ($company_count == 1) { - + $company->company_users->each(function ($company_user) { $company_user->user->forceDelete(); }); @@ -482,11 +483,13 @@ class CompanyController extends BaseController } else { + $company_id = $company->id; $company->delete(); //If we are deleting the default companies, we'll need to make a new company the default. if ($account->default_company_id == $company_id) { + $new_default_company = Company::whereAccountId($account->id)->first(); $account->default_company_id = $new_default_company->id; $account->save(); diff --git a/app/Http/Requests/Company/DestroyCompanyRequest.php b/app/Http/Requests/Company/DestroyCompanyRequest.php index 6613b6ca9bb0..879810928e4b 100644 --- a/app/Http/Requests/Company/DestroyCompanyRequest.php +++ b/app/Http/Requests/Company/DestroyCompanyRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Company; use App\Http\Requests\Request; -use App\Models\Company; class DestroyCompanyRequest extends Request {