Fix of multiple tenants

Fix of multiple tenants hipsterjazzbo#85
devhotsales · Nov 21, 2017 · be84d0b · be84d0b
1 parent 8c2a15a
commit be84d0b
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/TenantManager.php b/src/TenantManager.php
@@ -142,10 +142,7 @@ public function applyTenantScopes(Model $model)
 
         $this->modelTenants($model)->each(function ($id, $tenant) use ($model) {
             $model->addGlobalScope($tenant, function (Builder $builder) use ($tenant, $id, $model) {
-                if($this->getTenants()->first() && $this->getTenants()->first() != $id){
-                    $id = $this->getTenants()->first();
-                }
-
+                $id = $this->getTenantId($tenant);
                 $builder->where($model->getQualifiedTenant($tenant), '=', $id);
             });
         });
@@ -164,9 +161,7 @@ public function applyTenantScopesToDeferredModels()
                 }
 
                 $model->addGlobalScope($tenant, function (Builder $builder) use ($tenant, $id, $model) {
-                    if($this->getTenants()->first() && $this->getTenants()->first() != $id){
-                        $id = $this->getTenants()->first();
-                    }
+                    $id = $this->getTenantId($tenant);
 
                     $builder->where($model->getQualifiedTenant($tenant), '=', $id);
                 });