Fixed organisation permission seeds & added an organisations admin role

src/Database/Seeds/OrganisationPermissions.php

@@ -28,6 +28,7 @@ class OrganisationPermissions extends BaseSeed
     {
         // We require the default roles
         Seeder::execute('DefaultRoles');
+        Seeder::execute('OrganisationRoles');
 
         // Get and save permissions
         $permissions = $this->getPermissions();
@@ -119,12 +120,28 @@ class OrganisationPermissions extends BaseSeed
     {
         $roleSiteAdmin = Role::where('slug', 'site-admin')->first();
         if ($roleSiteAdmin) {
-            $roleSiteAdmin->permissions()->sync([
+            $roleSiteAdmin->permissions()->syncWithoutDetaching([
-                $permissions['create_organisation'],
+                $permissions['create_organisation']->id,
-                $permissions['update_organisation_field'],
+                $permissions['view_organisation_field']->id,
-                $permissions['delete_organisation'],
+                $permissions['update_organisation_field']->id,
-                $permissions['uri_organisations'],
+                $permissions['merge_organisations']->id,
-            ], false);
+                $permissions['delete_organisation']->id,
+                $permissions['uri_organisations']->id,
+            ]);
+            
+        }
+
+        $roleOrgAdmin = Role::where('slug', 'organisations-admin')->first();
+        if ($roleOrgAdmin) {
+            $roleOrgAdmin->permissions()->syncWithoutDetaching([
+                $permissions['create_organisation']->id,
+                $permissions['view_organisation_field']->id,
+                $permissions['update_organisation_field']->id,
+                $permissions['merge_organisations']->id,
+                $permissions['delete_organisation']->id,
+                $permissions['uri_organisations']->id,
+            ]);
+        }
         }
     }
 }

src/Database/Seeds/OrganisationRoles.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * AVSDev UF Organisations (https://avsdev.uk)
+ *
+ * @link      https://git.avsdev.uk/avsdev/sprinkle-organisations
+ * @license   https://git.avsdev.uk/avsdev/sprinkle-organisations/blob/master/LICENSE.md (LGPL-3.0 License)
+ */
+
+namespace UserFrosting\Sprinkle\Organisations\Database\Seeds;
+
+use UserFrosting\Sprinkle\Account\Database\Models\Role;
+use UserFrosting\Sprinkle\Core\Database\Seeder\BaseSeed;
+
+/**
+ * Seeder for the organisation based roles.
+ */
+class OrganisationRoles extends BaseSeed
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function run()
+    {
+        $roles = $this->getRoles();
+
+        foreach ($roles as $role) {
+            // Don't save if already exist
+            if (Role::where('slug', $role->slug)->first() == null) {
+                $role->save();
+            }
+        }
+    }
+
+    /**
+     * @return array Roles to seed
+     */
+    protected function getRoles()
+    {
+        return [
+            new Role([
+                'slug'        => 'organisations-admin',
+                'name'        => 'Organisations Administrator',
+                'description' => 'This role is meant for "organisation administrators", who can basically do anything related to organisations and their members.',
+            ]),
+        ];
+    }
+}