From 5e553b36e971f1fd5073f5476d42ac2ce52f8b1b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 5 Oct 2019 13:18:52 +1000
Subject: [PATCH] logo uploads

---
 app/DataMapper/CompanySettings.php         | 26 +++++++++++-----------
 app/Http/Controllers/CompanyController.php |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 7bce5b18aee2..bd04ea69067a 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -155,19 +155,19 @@ class CompanySettings extends BaseSettings
 
 	/* Company Meta data that we can use to build sub companies*/
 
-	public $name;
-	public $logo_url;
-	public $website;
-	public $address1;
-	public $address2;
-	public $city;
-	public $state;
-	public $postal_code;
-	public $phone;
-	public $email;
+	public $name = '';
+	public $logo_url = '';
+	public $website = '';
+	public $address1 = '';
+	public $address2 = '';
+	public $city = '';
+	public $state = '';
+	public $postal_code = '';
+	public $phone = '';
+	public $email = '';
 	public $country_id;
-	public $vat_number;
-	public $id_number;
+	public $vat_number = '';
+	public $id_number = '';
 
 	public static $casts = [
 		'name' => 'string',
@@ -298,7 +298,7 @@ class CompanySettings extends BaseSettings
 		$data->date_format_id = (string)config('ninja.i18n.date_format_id');
 		$data->start_of_week = (int) config('ninja.i18n.start_of_week');
 		$data->financial_year_start = (int)config('ninja.i18n.financial_year_start');
-		$data->country_id = (int)config('ninja.i18n.country_id');
+		$data->country_id = (string)config('ninja.i18n.country_id');
 		$data->translations = (object) [];
 		
 		return self::setCasts($data, self::$casts);
diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index 5118952b75b9..7800056f186f 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -186,10 +186,10 @@ class CompanyController extends BaseController
     public function update(UpdateCompanyRequest $request, Company $company)
     {
         $company = $this->company_repo->save($request->all(), $company);
-
+\Log::error($request->all());
         if($request->file('logo')) 
         {
-
+            \Log::error('logo present');
             $path = UploadAvatar::dispatchNow($request->file('logo'), $company->company_key);
 
             if($path){