From d39d837895e0e90b7a80b43d87c0b203f049636f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 5 Oct 2019 11:58:33 +1000 Subject: [PATCH] Fixes for tests --- app/Http/Controllers/CompanyController.php | 3 +-- app/Models/Company.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 03593d9367e7..5118952b75b9 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -193,8 +193,7 @@ class CompanyController extends BaseController $path = UploadAvatar::dispatchNow($request->file('logo'), $company->company_key); if($path){ - // $company->logo = $path; - // + $settings = $company->settings; $settings->logo_url = config('ninja.site_url').$path; $company->settings = $settings; diff --git a/app/Models/Company.php b/app/Models/Company.php index c0d5881b5dcb..acbc7069eaa2 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -189,7 +189,7 @@ class Company extends BaseModel public function getLogo() { - return $this->settings->logo ? config('ninja.site_url').$this->settings->logo : null; + return $this->settings->logo_url ?: null; } /**