Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Debugging company delete issues

Browse Source
This commit is contained in:
David Bomba 2020-06-09 19:29:41 +10:00
parent 32fde9c082
commit e35b1b6871
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();

1
app/Http/Requests/Company/DestroyCompanyRequest.php
View File

@ -12,7 +12,6 @@
namespace App\Http\Requests\Company;
use App\Http\Requests\Request;
use App\Models\Company;
class DestroyCompanyRequest extends Request
{