diff --git a/app/Factory/GroupSettingFactory.php b/app/Factory/GroupSettingFactory.php index 20a6c56f398d..ff5ca7b454f1 100644 --- a/app/Factory/GroupSettingFactory.php +++ b/app/Factory/GroupSettingFactory.php @@ -21,7 +21,7 @@ class GroupSettingFactory $gs = new GroupSetting; $gs->name = ''; - $gs->account_id = $company_id; + $gs->company_id = $company_id; $gs->user_id = $user_id; $gs->settings = json_encode([]); diff --git a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php index 5400e4a5cffb..c94580d38e85 100644 --- a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php @@ -36,7 +36,7 @@ class StoreGroupSettingRequest extends Request return [ 'name' => 'required', 'settings' => 'json', - ] + ]; } diff --git a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php index 75a6b02d7a80..e788ca9fa4de 100644 --- a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php @@ -32,8 +32,8 @@ class UpdateGroupSettingRequest extends Request { return [ - 'settings' => 'json' - ] + 'settings' => 'json', + ]; } diff --git a/app/Models/GroupSetting.php b/app/Models/GroupSetting.php index ff4ead4a24a1..0e19afb188b0 100644 --- a/app/Models/GroupSetting.php +++ b/app/Models/GroupSetting.php @@ -33,6 +33,7 @@ class GroupSetting extends StaticModel ]; protected $fillable = [ + 'name', 'settings' ]; diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index d16540fe4f43..c001879d24d2 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -126,7 +126,7 @@ class RouteServiceProvider extends ServiceProvider return \App\Models\Proposal::where('id', $this->decodePrimaryKey($value))->firstOrFail(); }); - Route::bind('groupo_setting', function ($value) { + Route::bind('group_setting', function ($value) { return \App\Models\GroupSetting::where('id', $this->decodePrimaryKey($value))->firstOrFail(); });