From 9afcc28549e8b6ee4b99dc6baeeab86409efc69f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 3 Oct 2019 15:17:57 +1000
Subject: [PATCH] Fixes for company logo output

---
 app/Http/Requests/Company/UpdateCompanyRequest.php | 2 ++
 app/Models/Company.php                             | 5 +++++
 app/Transformers/CompanyTransformer.php            | 2 +-
 tests/Integration/UploadLogoTest.php               | 4 +++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php
index cdee26e6b6e9..93ef499bc2a0 100644
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@@ -33,6 +33,8 @@ class UpdateCompanyRequest extends Request
 
     public function rules()
     {
+        \Log::error($this->all());
+        
         return [
             'logo' => 'mimes:jpeg,jpg,png,gif|max:10000', // max 10000kb
             'industry_id' => 'integer|nullable',
diff --git a/app/Models/Company.php b/app/Models/Company.php
index eea4e8e18b6a..9767210a4edb 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -186,6 +186,11 @@ class Company extends BaseModel
         return isset($this->settings->language_id) && $this->language() ? $this->language()->locale : config('ninja.i18n.locale');
     }
 
+    public function getLogo()
+    {
+        return $this->logo ? config('ninja.site_url').$this->logo : '';
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 3d89b581fa96..e57ec1cb5d54 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -66,7 +66,7 @@ class CompanyTransformer extends EntityTransformer
         return [
             'id' => $this->encodePrimaryKey($company->id),
             'name' => $company->name ?: '',
-            'logo' => $company->logo ?: '',
+            'logo' => $company->getLogo(),
             'company_key' => $company->company_key ?: '',
             'address1' => $company->address1 ?: '',
             'address2' => $company->address2 ?: '',
diff --git a/tests/Integration/UploadLogoTest.php b/tests/Integration/UploadLogoTest.php
index bb3347849ddb..9d39bf0fea37 100644
--- a/tests/Integration/UploadLogoTest.php
+++ b/tests/Integration/UploadLogoTest.php
@@ -83,8 +83,10 @@ class UploadLogoTest extends TestCase
             ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $data);
         
         $response->assertStatus(302);
+        
+        //$acc = $response->json();
 
-        //Log::error(print_r($response->json(),1));
+        //\Log::error(print_r($acc,1));
     }