Merge pull request #113 from andrewdwallo/development

update: SwitchCurrentCompany.php
andrewdwallo · Jan 3, 2024 · 31bbf1f · 31bbf1f
2 parents 1fcfdda + 152c4ea
commit 31bbf1f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Listeners/SwitchCurrentCompany.php b/src/Listeners/SwitchCurrentCompany.php
@@ -22,14 +22,16 @@ public function __construct()
     public function handle(TenantSet $event): void
     {
         $tenant = $event->getTenant();
+
+        /** @var HasCompanies $user */
         $user = $event->getUser();
 
         if (Features::switchesCurrentCompany() === false || !in_array(HasCompanies::class, class_uses_recursive($user), true)) {
             return;
         }
 
-        if (! $user->isCurrentCompany($tenant)) {
-            $user->switchCompany($tenant);
+        if (! $user->switchCompany($tenant)) {
+            $user->switchCompany($user->personalCompany());
         }
     }
 }