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

Fixes for blank client settings and force strings for custom_fields (#3096)

Browse Source 
* fix for blank client settings

* Force all custom fields to strings
This commit is contained in:
David Bomba 2019-11-26 20:11:22 +11:00 committed by GitHub
parent 0606973035
commit 4b4921703a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DataMapper/ClientSettings.php
View File

@ -84,6 +84,8 @@ class ClientSettings extends BaseSettings
public static function buildClientSettings($company_settings, $client_settings) public static function buildClientSettings($company_settings, $client_settings)
{ {
if(!$client_settings)
return $company_settings;
foreach($company_settings as $key => $value) foreach($company_settings as $key => $value)
{ {

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

@ -34,7 +34,7 @@ class UpdateCompanyRequest extends Request
public function rules() public function rules()
{ {
$rules = []; $rules = [];
$rules['company_logo'] = 'mimes:jpeg,jpg,png,gif|max:10000'; // max 10000kb $rules['company_logo'] = 'mimes:jpeg,jpg,png,gif|max:10000'; // max 10000kb

13
app/Repositories/CompanyRepository.php
View File

@ -48,6 +48,9 @@ class CompanyRepository extends BaseRepository
public function save(array $data, Company $company) : ?Company public function save(array $data, Company $company) : ?Company
{ {
if(isset($data['custom_fields']))
$data['custom_fields'] = $this->parseCustomFields($data['custom_fields']);
$company->fill($data); $company->fill($data);
$company->save(); $company->save();
@ -56,4 +59,14 @@ class CompanyRepository extends BaseRepository
} }
private function parseCustomFields($fields) :array
{
foreach($fields as &$value)
{
$value = (string)$value;
}
return $fields;
}
} }

8
app/Transformers/CompanyUserTransformer.php
View File

@ -46,10 +46,10 @@ class CompanyUserTransformer extends EntityTransformer
public function transform(CompanyUser $company_user) public function transform(CompanyUser $company_user)
{ {
return [ return [
'id' => $company_user->id, // 'id' => $company_user->id,
'account_id' => $company_user->account_id, // 'account_id' => $company_user->account_id,
'user_id' => $company_user->user_id, // 'user_id' => $company_user->user_id,
'company_id' => $company_user->company_id, // 'company_id' => $company_user->company_id,
'permissions' => $company_user->permissions ?: '', 'permissions' => $company_user->permissions ?: '',
'settings' => $company_user->settings ?: '', 'settings' => $company_user->settings ?: '',
'is_owner' => (bool) $company_user->is_owner, 'is_owner' => (bool) $company_user->is_owner,