From d90ab5bb53e8d8fc2cc426a1c890a115ec413ed8 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 16 May 2017 11:02:40 +0300 Subject: [PATCH] Fix delete company code --- app/Http/Controllers/AccountController.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 62d9d8ff62be..95ca91336c52 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -1355,20 +1355,18 @@ class AccountController extends BaseController $account = Auth::user()->account; \Log::info("Canceled Account: {$account->name} - {$user->email}"); - $company = $account->company; - $refunded = $company->processRefund(Auth::user()); + $refunded = false; + if (! $account->hasMultipleAccounts()) { + $company = $account->company; + $refunded = $company->processRefund(Auth::user()); + } Document::scope()->each(function ($item, $key) { $item->delete(); }); $this->accountRepo->unlinkAccount($account); - - if ($account->hasMultipleAccounts()) { - $account->forceDelete(); - } else { - $account->company->forceDelete(); - } + $account->forceDelete(); Auth::logout(); Session::flush();