diff --git a/Database/Seeders/PermissionGroupSeeder.php b/Database/Seeders/PermissionGroupSeeder.php index 82f987b..42a7789 100644 --- a/Database/Seeders/PermissionGroupSeeder.php +++ b/Database/Seeders/PermissionGroupSeeder.php @@ -28,7 +28,12 @@ return [ ['name' => 'User'], ['name' => 'Role'], - ['name' => 'Permission'] + ['name' => 'Permission'], + ['name' => 'Master'], + ['name' => 'System'], + ['name' => 'Company'], + ['name' => 'Supplier'], + ['name' => 'Buyer'] ]; } } diff --git a/Database/Seeders/PermissionsSeeder.php b/Database/Seeders/PermissionsSeeder.php index 1cd463b..7fefde6 100644 --- a/Database/Seeders/PermissionsSeeder.php +++ b/Database/Seeders/PermissionsSeeder.php @@ -28,15 +28,10 @@ $roles = Role::all(); foreach ($roles as $role) { - if ($role->name == 'administrator') { + if ($role->name == 'super-administrator') { $role->givePermissionTo($permission); - } else { - if ($permission->name == 'user.read' || $permission->name == 'role.read' || $permission->name == 'permission.read') { - $role->givePermissionTo($permission); - } } } - } } @@ -44,7 +39,7 @@ { $data = []; // list of model permission - $model = ['user', 'role', 'permission']; + $model = ['user', 'role', 'permission', 'master', 'system', 'company', 'supplier', 'buyer']; $i = 1; foreach ($model as $value) { @@ -61,7 +56,7 @@ { $actions = []; // list of permission actions - $crud = ['create', 'read', 'update', 'delete', 'authorize', 'report']; + $crud = ['create', 'read', 'update', 'delete']; foreach ($crud as $value) { $actions[] = $name . '.' . $value; diff --git a/Database/Seeders/UsersSeeder.php b/Database/Seeders/UsersSeeder.php index d25b7fb..35ddea1 100644 --- a/Database/Seeders/UsersSeeder.php +++ b/Database/Seeders/UsersSeeder.php @@ -17,24 +17,17 @@ */ public function run(Generator $faker) { - $roleAdmin = Role::find(1); - $roleUser = Role::find(2); + $roles = Role::all(); - $user = User::create([ - 'name' => $faker->name, - 'email' => 'demo@demo.com', - 'password' => Hash::make('demo'), - 'email_verified_at' => now(), - ]); + foreach ($roles as $role) { + $user = User::create([ + 'name' => $faker->name, + 'email' => $role->name.'@demo.com', + 'password' => Hash::make('demo'), + 'email_verified_at' => now(), + ]); - $admin = User::create([ - 'name' => $faker->name, - 'email' => 'admin@demo.com', - 'password' => Hash::make('demo'), - 'email_verified_at' => now(), - ]); - - $admin->assignRole($roleAdmin,); - $user->assignRole($roleUser); + $user->assignRole($role); + } } }