Revamped the organisation approvals process & refactored some files

src/Database/Models/User.php

@@ -37,7 +37,11 @@ class User extends UFUser
         /** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
-        return $this->belongsToMany($classMapper->getClassMapping('organisation'), 'organisation_members', 'user_id', 'organisation_id')->orderBy('organisations.name', 'asc')->withPivot('flag_admin');
+        return $this->belongsToMany(
+                $classMapper->getClassMapping('organisation'), 'organisation_members', 'user_id', 'organisation_id'
+            )
+            ->orderBy('organisations.name', 'asc')
+            ->withPivot('flag_admin');
     }
 
     /**
@@ -53,7 +57,16 @@ class User extends UFUser
         $classMapper = static::$ci->classMapper;
 
         if ($hardDelete) {
-            // TODO: remove user from organisations?
+            $classMapper->getClassMapping('organisation')::query()
+                ->where('registrant_id', $this->id)
+                ->update(['registrant_id' => null]);
+
+            $classMapper->getClassMapping('organisation_approval')::query()
+                ->where('approver_id', $this->id)
+                ->update(['approver_id' => null]);
+
+            $this->organisations()->detach();
+            $this->refresh();
         }
 
         return parent::delete();