diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index 01a8426ee77b..373706326519 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -157,7 +157,7 @@ class CompanySettings extends BaseSettings /* Company Meta data that we can use to build sub companies*/ public $name = ''; - public $logo_url = ''; + public $company_logo_url = ''; public $website = ''; public $address1 = ''; public $address2 = ''; @@ -172,7 +172,7 @@ class CompanySettings extends BaseSettings public static $casts = [ 'name' => 'string', - 'logo_url' => 'string', + 'company_logo_url' => 'string', 'website' => 'string', 'address1' => 'string', 'address2' => 'string', diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 66e5e43489cf..bb8c8ec48385 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -205,10 +205,10 @@ class CompanyController extends BaseController $company = CreateCompany::dispatchNow($request->all(), auth()->user()->company()->account); - if($request->file('logo')) + if($request->file('company_logo')) { - $path = UploadAvatar::dispatchNow($request->file('logo'), $company->company_key); + $path = UploadAvatar::dispatchNow($request->file('company_logo'), $company->company_key); if($path){ @@ -420,10 +420,10 @@ class CompanyController extends BaseController { $company = $this->company_repo->save($request->all(), $company); - if($request->file('logo')) + if($request->file('company_logo')) { \Log::error('logo present'); - $path = UploadAvatar::dispatchNow($request->file('logo'), $company->company_key); + $path = UploadAvatar::dispatchNow($request->file('company_logo'), $company->company_key); if($path){ diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php index e52f28a9e66f..56d0d31cd779 100644 --- a/app/Http/Requests/Company/StoreCompanyRequest.php +++ b/app/Http/Requests/Company/StoreCompanyRequest.php @@ -34,7 +34,7 @@ class StoreCompanyRequest extends Request return [ 'name' => 'required', - 'logo' => 'mimes:jpeg,jpg,png,gif|max:10000', // max 10000kb + 'company_logo' => 'mimes:jpeg,jpg,png,gif|max:10000', // max 10000kb // 'settings' => 'json', // 'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx', ]; diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index c783f8adb370..22b3eda8bf97 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -35,7 +35,7 @@ class UpdateCompanyRequest extends Request { return [ - 'logo' => 'mimes:jpeg,jpg,png,gif|max:10000', // max 10000kb + 'company_logo' => 'mimes:jpeg,jpg,png,gif|max:10000', // max 10000kb 'industry_id' => 'integer|nullable', 'size_id' => 'integer|nullable', 'country_id' => 'integer|nullable',