Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

change logo_url to company_logo_url

Browse Source
This commit is contained in:
David Bomba 2019-10-07 22:06:23 +11:00
parent b8515e26b0
commit d35a90cb94
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -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',

8
app/Http/Controllers/CompanyController.php
View File

@ -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){

2
app/Http/Requests/Company/StoreCompanyRequest.php
View File

@ -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',
];

2
app/Http/Requests/Company/UpdateCompanyRequest.php
View File

@ -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',