From daa4e78a27be7c4047b968dee1b30077f29552cf Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Wed, 23 Aug 2023 08:39:27 +0100
Subject: [PATCH] Fixed check for has_organisation

---
 src/ServicesProvider/ServicesProvider.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ServicesProvider/ServicesProvider.php b/src/ServicesProvider/ServicesProvider.php
index 9cce2f1..a3fe98b 100644
--- a/src/ServicesProvider/ServicesProvider.php
+++ b/src/ServicesProvider/ServicesProvider.php
@@ -67,8 +67,10 @@ class ServicesProvider
              */
             $authorizer->addCallback('has_organisation', function ($user_id) {
                 $query = Capsule::table('organisation_members')
+                    ->join('organisations', 'organisation_members.organisation_id', 'organisations.id')
                     ->where('user_id', $user_id)
-                    ->where('flag_approved', true);
+                    ->where('organisation_members.flag_approved', true)
+                    ->where('organisations.flag_approved', true);
 
                 return $query->count() > 0;
             });
@@ -104,8 +106,9 @@ class ServicesProvider
                 return Capsule::table('organisation_members')
                     ->where('user_id', $user_id)
                     ->where('organisation_id', $organisation_id)
-                    ->where('flag_admin', true)
-                    ->count() > 0;
+                    ->where('flag_admin', true);
+
+                return $query->count() > 0;
             });
 
             /*