Merge pull request #88 from andrewdwallo/development

fix company invitations configuration
andrewdwallo · Sep 9, 2023 · 6708ffb · 6708ffb
2 parents 3ba56dd + 22d8232
commit 6708ffb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Features.php b/src/Features.php
@@ -184,10 +184,10 @@ public function api(bool|Closure|null $condition = true): static
     /**
      * Determine if the company is supporting company features.
      */
-    public function companies(bool|Closure|null $condition = true, bool|Closure|null $invitations = null): static
+    public function companies(bool|Closure|null $condition = true, bool $invitations = false): static
     {
         static::$hasCompanyFeatures = $condition instanceof Closure ? $condition() : $condition;
-        static::$sendsCompanyInvitations = $invitations instanceof Closure ? $invitations() : $invitations ?? false;
+        static::$sendsCompanyInvitations = $invitations;
 
         return $this;
     }
@@ -297,7 +297,7 @@ public static function hasCompanyFeatures(): bool
      */
     public static function sendsCompanyInvitations(): bool
     {
-        return static::$sendsCompanyInvitations;
+        return static::hasCompanyFeatures() && static::$sendsCompanyInvitations;
     }
 
     /**

diff --git a/src/FilamentCompanies.php b/src/FilamentCompanies.php
@@ -265,7 +265,7 @@ public function api(bool|Closure|null $condition = true): static
     /**
      * Determine if the application supports the companies features.
      */
-    public function companies(bool|Closure|null $condition = true, bool|Closure|null $invitations = null): static
+    public function companies(bool|Closure|null $condition = true, bool $invitations = false): static
     {
         $this->features->companies($condition, $invitations);