|
@@ -33,7 +33,6 @@ class Plan extends Model
|
|
public function scopeAllowed(Builder $query) : void
|
|
public function scopeAllowed(Builder $query) : void
|
|
{
|
|
{
|
|
$planIds = Plan::query()->leftJoin("assets", "plans.asset_id", "=", "assets.id")
|
|
$planIds = Plan::query()->leftJoin("assets", "plans.asset_id", "=", "assets.id")
|
|
- ->where('assets.company_id',Auth::user()->company_id)
|
|
|
|
->where(function ($query){
|
|
->where(function ($query){
|
|
$query->where('assets.acl', AssetACL::PRIVATE->value)
|
|
$query->where('assets.acl', AssetACL::PRIVATE->value)
|
|
->where('assets.owner', Auth::id());
|
|
->where('assets.owner', Auth::id());
|
|
@@ -48,7 +47,7 @@ class Plan extends Model
|
|
})
|
|
})
|
|
->pluck("plans.id")->unique();
|
|
->pluck("plans.id")->unique();
|
|
|
|
|
|
- $query->whereIn("id", $planIds->toArray());
|
|
|
|
|
|
+ $query->whereIn("id", $planIds->toArray())->where('company_id',Auth::user()->company_id);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|