diff --git a/app/Http/Controllers/Admin/AccountCrudController.php b/app/Http/Controllers/Admin/AccountCrudController.php index c43bc0bf..53175955 100644 --- a/app/Http/Controllers/Admin/AccountCrudController.php +++ b/app/Http/Controllers/Admin/AccountCrudController.php @@ -77,12 +77,12 @@ class AccountCrudController extends CrudController [ 'name' => 'is_active', 'label' => 'Is Active', - 'type' => 'boolean' + 'type' => 'check' ], [ 'name' => 'is_banned', 'label' => 'Is Banned', - 'type' => 'boolean' + 'type' => 'check' ] ]); $this->crud->setRequiredFields(StoreRequest::class, 'create'); diff --git a/app/Http/Controllers/Admin/OrganiserCrudController.php b/app/Http/Controllers/Admin/OrganiserCrudController.php index 44119478..1dcff551 100644 --- a/app/Http/Controllers/Admin/OrganiserCrudController.php +++ b/app/Http/Controllers/Admin/OrganiserCrudController.php @@ -25,7 +25,60 @@ class OrganiserCrudController extends CrudController | CrudPanel Configuration |-------------------------------------------------------------------------- */ - $this->crud->setFromDb(); +// $this->crud->setFromDb(); + $this->crud->setColumns([ + [ + 'name' => 'account_id', + 'label' => 'Account', + 'type' => 'select', + 'entity'=> 'account', + 'attribute'=>'email' + ], + [ + 'name' => 'name', + 'label' => 'Name', + 'type' => 'text' + ], + [ + 'name' => 'about', + 'label' => 'About', + 'type' => 'text' + ], + [ + 'name' => 'email', + 'label' => trans('backpack::permissionmanager.email'), + 'type' => 'email', + ] + ]); + $this->crud->addFields([ + [ + 'name' => 'account_id', + 'label' => 'Account', + 'type' => 'select', + 'entity'=> 'account', + 'attribute'=>'email' + ], + [ + 'name' => 'name', + 'label' => 'Name', + 'type' => 'text' + ], + [ + 'name' => 'about', + 'label' => 'About', + 'type' => 'textarea' + ], + [ + 'name' => 'phone', + 'label' => 'Phone', + 'type' => 'text' + ], + [ + 'name' => 'email', + 'label' => trans('backpack::permissionmanager.email'), + 'type' => 'email', + ] + ]); $this->crud->setRequiredFields(StoreRequest::class, 'create'); $this->crud->setRequiredFields(UpdateRequest::class, 'edit'); } diff --git a/app/Http/Controllers/Admin/UserCrudController.php b/app/Http/Controllers/Admin/UserCrudController.php index 9de27df5..63c982bf 100644 --- a/app/Http/Controllers/Admin/UserCrudController.php +++ b/app/Http/Controllers/Admin/UserCrudController.php @@ -33,6 +33,13 @@ class UserCrudController extends CrudController 'label' => trans('backpack::permissionmanager.email'), 'type' => 'email', ], + [ + 'name' => 'account_id', + 'label' => 'Account', + 'type' => 'select', + 'entity'=> 'account', + 'attribute'=>'email' + ] // [ // n-n relationship (with pivot table) // 'label' => trans('backpack::permissionmanager.roles'), // Table column heading // 'type' => 'select_multiple', diff --git a/app/Models/Organiser.php b/app/Models/Organiser.php index 27412c35..afce3c60 100644 --- a/app/Models/Organiser.php +++ b/app/Models/Organiser.php @@ -52,6 +52,13 @@ class Organiser extends MyBaseModel implements AuthenticatableContract 'organiser_logo.mimes' => 'Please select a valid image type (jpeg, jpg, png)', ]; + protected $fillable = [ + 'account_id', + 'email', + 'phone', + 'name' + ]; + /** * The account associated with the organiser *