From 83a3a4a2c71eb1ef8fd069125d9b0c59f63c9d0f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 25 Jun 2020 07:36:39 +1000 Subject: [PATCH 1/2] Fix for weird output array after deleting company --- app/Http/Controllers/CompanyController.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 0877a2769736..b3d8fa87e9e6 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -57,7 +57,7 @@ class CompanyController extends BaseController protected $company_repo; - public $forced_includes = []; + public $forced_includes = []; /** * CompanyController constructor. @@ -466,14 +466,9 @@ class CompanyController extends BaseController */ public function destroy(DestroyCompanyRequest $request, Company $company) { - info(print_r($request->all())); - info("destroying {$company->present()->name()} - {$company->hashed_id}"); - $company_count = $company->account->companies->count(); $account = $company->account; - info("company count = {$company_count}"); - if ($company_count == 1) { $company->company_users->each(function ($company_user) { @@ -499,7 +494,9 @@ class CompanyController extends BaseController $account->save(); } } - + + ob_flush(); + return response()->json(['message' => 'success'], 200); } } From 43618e40a0f92f5c65d3f3aed511db5ebc49fee0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 25 Jun 2020 07:44:25 +1000 Subject: [PATCH 2/2] Fixes for delete company --- app/Http/Controllers/CompanyController.php | 5 +++-- app/Http/Middleware/Cors.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index b3d8fa87e9e6..19abc337cb65 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -466,6 +466,7 @@ class CompanyController extends BaseController */ public function destroy(DestroyCompanyRequest $request, Company $company) { + $company_count = $company->account->companies->count(); $account = $company->account; @@ -494,8 +495,8 @@ class CompanyController extends BaseController $account->save(); } } - - ob_flush(); + +// ob_flush(); return response()->json(['message' => 'success'], 200); } diff --git a/app/Http/Middleware/Cors.php b/app/Http/Middleware/Cors.php index 210a45855106..137532e8d8d7 100644 --- a/app/Http/Middleware/Cors.php +++ b/app/Http/Middleware/Cors.php @@ -37,7 +37,7 @@ class Cors $response->headers->set('Access-Control-Allow-Origin', '*'); $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); $response->headers->set('Access-Control-Allow-Headers', 'X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'); - $response->headers->set('Access-Control-Expose-Headers', 'X-APP-VERSION'); + $response->headers->set('Access-Control-Expose-Headers', 'X-APP-VERSION,X-MINIMUM-CLIENT-VERSION'); $response->headers->set('X-APP-VERSION', config('ninja.app_version')); $response->headers->set('X-MINIMUM-CLIENT-VERSION', config('ninja.minimum_client_version'));